Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bring in production/AQM.v7 relevant changes into develop branch. #98

Closed
wants to merge 3 commits into from
Closed

Bring in production/AQM.v7 relevant changes into develop branch. #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d291c5
Add restart capability for input emissions (#70)
rmontuoro Mar 30, 2023
2bc762a
Remove compiler warnings and remarks for AQMv7 implementation (#94)
rmontuoro Nov 11, 2023
b79f95f
[production/AQM.v7] EE2 updates, and fixes for issues seen during EE2…
BrianCurtis-NOAA Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-ffree-line-length-none -ffixed-line-length-none")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-extend-source 132")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -check bounds -check uninit -fpe0 -fno-alias -ftrapuv -traceback")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -g -check all -check noarg_temp_created -fpe0 -fno-alias -ftrapuv -traceback")
else()
message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
endif()
Expand Down Expand Up @@ -84,6 +84,7 @@ target_include_directories(CCTM PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/model/CMAQ/CCTM/src/ICL/fixed/const>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/model/CMAQ/CCTM/src/ICL/fixed/emctrl>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/model/CMAQ/CCTM/src/ICL/fixed/mpi>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/model/CMAQ/CCTM/src/aero/aero6>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src/shr>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src/io/ioapi>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src/io/aqmio>)
Expand Down
16 changes: 4 additions & 12 deletions aqm_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,9 @@ list(APPEND aqm_CCTM_files
${AERO}/AEROMET_DATA.F
${AERO}/AEROSOL_CHEMISTRY.F
${AERO}/aero_subs.F
${AERO}/aero_depv.F
${AERO}/AOD_DEFN.F
${AERO}/coags.f
${AERO}/getpar.f
${AERO}/isocom.f
${AERO}/isofwd.f
${AERO}/isorev.f
${AERO}/isrpia.inc
Expand Down Expand Up @@ -184,7 +182,6 @@ list(APPEND aqm_CCTM_files
${PA}/pa_update.F
${PHOT}/CLOUD_OPTICS.F
${PHOT}/complex_number_module.F90
${PHOT}/CSQY_DATA.F
${PHOT}/OMI_1979_to_2015.dat
${PHOT}/opphot.F
${PHOT}/phot.F
Expand All @@ -205,15 +202,6 @@ list(APPEND aqm_CCTM_files
${PLRISE}/write3_distr.f
${SPCS}/CGRID_SPCS.F
${STENEX}/noop_comm_module.f
${STENEX}/noop_data_copy_module.f
${STENEX}/noop_gather_module.f
${STENEX}/noop_global_max_module.f
${STENEX}/noop_global_min_module.f
${STENEX}/noop_global_sum_module.f
${STENEX}/noop_init_module.f
${STENEX}/noop_modules.f
${STENEX}/noop_slice_module.f
${STENEX}/noop_term_module.f
${STENEX}/noop_util_module.f
${UTIL}/bmatvec.F
${UTIL}/findex.f
Expand Down Expand Up @@ -243,4 +231,8 @@ list(APPEND aqm_CCTM_files
${localCCTM}/ASX_DATA_MOD.F
${localCCTM}/DUST_EMIS.F
${localCCTM}/AERO_PHOTDATA.F
${localCCTM}/noop_modules.f
${localCCTM}/CSQY_DATA.F
${localCCTM}/isocom.f
${localCCTM}/aero_depv.F
)
4 changes: 2 additions & 2 deletions src/io/ioapi/m3utilio.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ LOGICAL FUNCTION READ3_INTEGER( FNAME, VNAME, LAYER, JDATE,JTIME, BUFFER)
INTEGER , INTENT(IN ) :: LAYER ! layer number, or 0
INTEGER , INTENT(IN ) :: JDATE ! date, formatted YYYYDDD
INTEGER , INTENT(IN ) :: JTIME ! time, formatted HHMMSS
INTEGER , INTENT( OUT) :: BUFFER(*) ! input buffer array
INTEGER , INTENT(INOUT) :: BUFFER(*) ! input buffer array

READ3_INTEGER = .TRUE.

Expand All @@ -204,7 +204,7 @@ LOGICAL FUNCTION READ3_REAL( FNAME, VNAME, LAYER, JDATE,JTIME, BUFFER)
INTEGER , INTENT(IN ) :: LAYER ! layer number, or 0
INTEGER , INTENT(IN ) :: JDATE ! date, formatted YYYYDDD
INTEGER , INTENT(IN ) :: JTIME ! time, formatted HHMMSS
REAL , INTENT( OUT) :: BUFFER(*) ! input buffer array
REAL , INTENT(INOUT) :: BUFFER(*) ! input buffer array

READ3_REAL = .TRUE.

Expand Down
Loading