Skip to content

Bring in additional changes from production/AQM.v7 and reversed the Rsnow value #121

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

Merged
KaiWang-NOAA merged 9 commits into from
Oct 21, 2025
Merged

Bring in additional changes from production/AQM.v7 and reversed the Rsnow value #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bad9554
bring in production/AQM.v7 commit 9d0f39e
KaiWang-NOAA Jul 23, 2025
32d9cf6
bring in production/AQM.v7 commit 3ce5e40
KaiWang-NOAA Jul 23, 2025
b34cc55
bring in production/AQM.v7 commit 8d30ad9
KaiWang-NOAA Jul 23, 2025
05adc4d
bring in most of production/AQM.v7 commit 1a87ede (without AERO_EMIS.F)
KaiWang-NOAA Aug 7, 2025
436884b
add AERO_EMIS.F for placeholder
KaiWang-NOAA Aug 7, 2025
5cdde33
Merge branch 'NOAA-EMC:develop' into Updated_to_production
KaiWang-NOAA Sep 15, 2025
b6da7d6
Reversed the Rsnow from 10000 to 1000 as consistent with AQMv7
KaiWang-NOAA Sep 15, 2025
9eca2e1
Revert "add AERO_EMIS.F for placeholder"
KaiWang-NOAA Oct 17, 2025
ad7c22f
Revert "bring in most of production/AQM.v7 commit 1a87ede (without AE…
KaiWang-NOAA Oct 17, 2025
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,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/aero7>
$<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 @@ -102,7 +102,6 @@ list(APPEND aqm_CCTM_files
${AERO}/aero_subs.F
${AERO}/coags.f
${AERO}/getpar.f
${AERO}/isocom.f
${AERO}/isofwd.f
${AERO}/isorev.f
${AERO}/isrpia.inc
Expand Down Expand Up @@ -198,7 +197,6 @@ list(APPEND aqm_CCTM_files
${PA}/PA_IRR_CTL.F
${PHOT}/CLOUD_OPTICS.F
${PHOT}/complex_number_module.F90
${PHOT}/CSQY_DATA.F
${PHOT}/OMI_1979_to_2019.dat
${PHOT}/opphot.F
${PHOT}/PHOT_MET_DATA.F
Expand All @@ -221,15 +219,6 @@ list(APPEND aqm_CCTM_files
${STM}/STM_VARS.F
${STM}/STM_MODULE.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}/findex.f
${UTIL}/log_header.F
Expand All @@ -243,7 +232,6 @@ list(APPEND aqm_CCTM_files
${DRIV}/ELMO_PROC.F
${DRIV}/ELMO_DATA.F
${VDIFF}/aero_sedv.F
${VDIFF}/aero_depv.F
${VDIFF}/conv_cgrid.F
${VDIFF}/matrix1.F
${VDIFF}/opddep.F
Expand All @@ -263,6 +251,10 @@ 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
#IVAI Sub-canopy effects----
${localCCTM}/phot.F
${localCCTM}/PHOT_MOD.F
Expand Down
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 @@ -234,7 +234,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 @@ -249,7 +249,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
3 changes: 2 additions & 1 deletion src/model/src/ASX_DATA_MOD.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@ Module ASX_DATA_MOD
Real, Parameter :: rg0 = 1000.0 ! [s/m]
Real, Parameter :: rgwet0 = 25000.0 ! [s/m]
Real, Parameter :: rsndiff = 10.0 ! snow diffusivity fac
Real, Parameter :: rsnow0 = 10000.0 ! Changed from 1000 to 10000 - Helmig et al 2012
! Real, Parameter :: rsnow0 = 10000.0 ! Changed from 1000 to 10000 - Helmig et al 2012
Comment thread
KaiWang-NOAA marked this conversation as resolved.
Real, Parameter :: rsnow0 = 1000.0 ! Changed back to 1000 (CMAQv5.2.1) by EMC and ARL
Real, Parameter :: svp2 = 17.67 ! from MM5 and WRF
Real, Parameter :: svp3 = 29.65 ! from MM5 and WRF
Real, Parameter :: rt25inK = 1.0/(stdtemp + 25.0) ! 298.15K = 25C
Expand Down
Loading