Upgrade CMAQ from 5.2 to 5.4, Use correct variable for LUFRAC_ and DLUSE #106

BrianCurtis-NOAA · 2025-02-27T20:06:54Z

PR Checklist

This PR has been tested on an RDHPCS machine and/or WCOSS2. Please select below:
- RDHPCS.
- WCOSS2.
This PR has been tested with the ufs-srweather-app workflow online-cmaq branch.
New or updated input data is required by this PR.
Baselines are expected to change.

Description

This PR brings in the CMAQ version 5.4 replacing 5.2.1

includes Use correct variable for LUFRAC_ and DLUSE #103
includes Updating AQM to CMAQv5.4 #101

Issue(s) addressed

Dependencies

will merge into UFSWM with Feature/vegtype export fv3atm#888

Feature/rrfs cmaq canopy

Fixed Makefile.in typo.

comment a 'end do', after that, code compiled successfully

turn on according changed codes in local src/ folder

Add files via upload

point to CMAQ 5.4+

Forget to turn on AOD

Feature/cmaq54 li

Need to comment out two lines for writing to OUTDEV and LOGDEV in aqm_dev branch

…urce file and therefore need to put it here

Feature/camq54 ros3

Better handle of the emission unit. This will not impact the simulation results.

Resolve a bug in point source emission. Only the first layer emission is included with his bug, which leads to much lower SO2 simulations.

Fix a bug in point source emission

BrianCurtis-NOAA · 2025-03-07T14:58:32Z

src/aqm_comp_mod.F90

+    !tstep( 1 ) = config % ctm_tstep         ! TSTEP(1) = local output step
+    !tstep( 2 ) = tstep( 1 )                 ! TSTEP(2) = sciproc sync. step (chem)
+    !test different tstep(1) and tstep(2)


If we're not using this, can this be removed?

BrianCurtis-NOAA · 2025-03-07T14:59:34Z

src/drv/cmaq_mod.F90

@@ -107,7 +119,8 @@ subroutine cmaq_init(rc)
    ! -- Set up horizontal domain and calculate processor-to-subdomain maps for
    ! -- process analysis, if required
    IF ( LIPR .OR. LIRR ) THEN
-      IF (aqm_rc_test( .NOT. PAGRD_INIT( NPROCS, MYPE ), &
+!      IF (aqm_rc_test( .NOT. PAGRD_INIT( NPROCS, MYPE ), & 


can we remove this?

BrianCurtis-NOAA · 2025-03-07T15:01:06Z

src/aqm_cap.F90

@@ -13,7 +13,8 @@ module AQM
  implicit none

  ! -- import fields
-  integer, parameter :: importFieldCount = 36
+  integer, parameter :: importFieldCount = 37
+!  integer, parameter :: importFieldCount = 45  !with canopy


double checking that we're saving this for later canopy changes?

BrianCurtis-NOAA · 2025-03-07T15:03:08Z

aqm_files.cmake

+	#${localCCTM}/AERO_EMIS.F
+        #${localCCTM}/PTMAP.F
+	#${localCCTM}/PT3D_DATA_MOD.F


Can we remove these, since we are no longer editing these files locally?

BrianCurtis-NOAA · 2025-03-07T15:05:51Z

src/drv/cmaq_model_mod.F90

+    write( logdev,* ) ' NT number of tracer is: ', nt
+    write( logdev,* ) ' p_aqm_beg/ndiag is:', config % species %p_aqm_beg,'/',config % species % ndiag


I'm typically wary of adding verbosity to logs (because they can get overly verbose quickly). Is there any method to supress these unless we specifically want to see these? It doesn't seem to add more than 2 lines, so I wanted to double check if this is indeed something to be kept?

BrianCurtis-NOAA · 2025-03-07T15:06:52Z

src/drv/cmaq_model_mod.F90

+       if (aqm_rc_check(localrc, msg="Failed to initialize concentrations", &
+         file=__FILE__, line=__LINE__, rc=rc)) return
+       first_step = .false.
+       if (config % verbose) call cmaq_conc_log(trim(config % name) // ": init")


The indent looks off, should fix.

BrianCurtis-NOAA · 2025-03-07T15:15:46Z

src/model/src/vdiffacmx.F


      REAL, ALLOCATABLE, SAVE :: DD_FAC     ( : )   ! combined subexpression
      REAL, ALLOCATABLE, SAVE :: DDBF       ( : )   ! secondary DDEP
-      REAL, ALLOCATABLE, SAVE :: CMPF       ( : )   ! intermediate CMP
+      REAl, ALLOCATABLE, SAVE :: CMPF       ( : )   ! intermediate CMP


BrianCurtis-NOAA · 2025-03-07T15:35:38Z

@bbakernoaa If you get some time to address these, i can take some time to implement anything that we think should be updated.

AnnaSmoot-NOAA · 2025-03-07T14:57:00Z

src/aqm_comp_mod.F90

+    !tstep( 1 ) = config % ctm_tstep         ! TSTEP(1) = local output step
+    !tstep( 2 ) = tstep( 1 )                 ! TSTEP(2) = sciproc sync. step (chem)
+    !test different tstep(1) and tstep(2)
+    tstep( 1 ) = 1 * 10000                  ! TSTEP(1) = local output step 


@bbakernoaa Just curious if there is a reason why this was written as = 1 * 10000 instead of = 10000

AnnaSmoot-NOAA · 2025-03-07T19:23:04Z

src/model/src/PT3D_STKS_DEFN.F

+C               IF ( AQM_RC_CHECK( LOCALRC,
+C     &            MSG="Failure while reading PNCOM emissions from" //
+C     &            TRIM( ETYPE ) // " emissions",
+C     &         FILE=__FILE__, LINE=__LINE__ ) ) RETURN


Is this code commented out? Is there a reason to keep it?

Patrick.C.Campbell@noaa.gov and others added 30 commits February 10, 2022 21:27

Initial commit of rrfs_cmaq_canopy branch.

89e9a4f

Initial copy of canopy photolysis routines.

e38abcd

Initial modifications to canopy photolysis CMAQ5.2.1 codes.

539e975

Updated CMAQ makefiles for modified canopy codes.

941e235

Added new canopy variables to AQM shared components.

f1d72d1

Added placeholder new canopy variables to aqm cap for fv3.

c8a294c

Added conditional CANOPY_SHADE environment variable/logical.

5d73df1

Updated conditional canopy_yn environment and logicals.

4a5f99e

Fixed bugs.

8d6af39

Fixed more bugs.

d906997

Removed "RETURN" bug and added diagnostic prints.

bb85b5e

Removed RETURN bug.

07e3800

Added debug statements

685de08

Removed debug prints and added canopy variables in DESC3.

b00f1c8

Added some debug prints.

846e1dc

Updated debug statemetns

a816991

Fixed bug in declaration.

8c54358

Checking CANOPY_SHADE condition..

830986e

Updated Canopy debugs

cffa402

Fixed CANOPY_SHADE logic bug and added debug prints.

7d49ad1

Removed extraneous debug prints.

c3bc815

Removed debug prints.

2a26402

Fixed allocation/save bug.

2ee012f

Merge pull request #1 from noaa-oar-arl/feature/rrfs_cmaq_canopy

d13f545

Feature/rrfs cmaq canopy

Update Makefile.in

6cc3005

Fixed Makefile.in typo.

Update Makefile.in

43c9948

Added new canopy file to read for AQM.

0bef3be

Updated aqm.rc example file.

9b09397

Updated example aqm.rc for canopy settings and file.

3daa4b6

Initial changes for reading canopy data in AQM.

cc0d3e2

btang1 and others added 23 commits August 27, 2023 19:24

Update o3totcol.f

2f507f3

Update vdiffacmx.F

d8f049a

comment a 'end do', after that, code compiled successfully

Update aqm_files.cmake

9aa4bff

turn on according changed codes in local src/ folder

Merge pull request NOAA-EMC#17 from btang1/feature/cmaq54_beiming

8067154

Add files via upload

add localized files

18916a2

Add other modified files

a419a75

Add other modified files

2306c94

Update .gitmodules

6351dd4

point to CMAQ 5.4+

Update aqm_methods.F90

5e768a6

Forget to turn on AOD

Merge pull request NOAA-EMC#20 from lwcugb/feature/cmaq54_li

5803ed7

Feature/cmaq54 li

Update RUNTIME_VARS.F

4492f16

Need to comment out two lines for writing to OUTDEV and LOGDEV in aqm_dev branch

Change aqm_files.cmake to use ROS3 solver

b33ded4

Add rbdriver.F file to localCCTM folder. There is a typo in CMAQ's so…

ff0892f

…urce file and therefore need to put it here

Merge pull request NOAA-EMC#23 from lwcugb/feature/camq54_ros3

c30fe95

Feature/camq54 ros3

Add files via upload

1de518e

Better handle of the emission unit. This will not impact the simulation results.

Update PT3D_STKS_DEFN.F

05a32c1

Resolve a bug in point source emission. Only the first layer emission is included with his bug, which leads to much lower SO2 simulations.

Delete some comments for testing purpose

feff981

Merge pull request NOAA-EMC#24 from lwcugb/feature/cmaq54

7bfe2e2

Fix a bug in point source emission

Update CMakeLists.txt

584637b

Bugfixes for debug build try 1

7b147a0

Fix issue with array trying to set data where water is

fd35bf0

Current testing status updates prior to bringing in FV3 changes

4f65bf6

Bring in changes from NOAA-EMC#103

1ab49f5

This was referenced Feb 28, 2025

Upgrade AQM to v8 (CMAQ 5.4) ufs-community/ufs-weather-model#2629

Open

Feature/vegtype export NOAA-EMC/fv3atm#888

Open

BrianCurtis-NOAA requested review from bbakernoaa and AnnaSmoot-NOAA March 7, 2025 12:15

BrianCurtis-NOAA commented Mar 7, 2025

View reviewed changes

AnnaSmoot-NOAA reviewed Mar 7, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade CMAQ from 5.2 to 5.4, Use correct variable for LUFRAC_ and DLUSE #106

Upgrade CMAQ from 5.2 to 5.4, Use correct variable for LUFRAC_ and DLUSE #106

BrianCurtis-NOAA commented Feb 27, 2025 •

edited

Loading

BrianCurtis-NOAA Mar 7, 2025

BrianCurtis-NOAA Mar 7, 2025

BrianCurtis-NOAA Mar 7, 2025

BrianCurtis-NOAA Mar 7, 2025

BrianCurtis-NOAA Mar 7, 2025

BrianCurtis-NOAA Mar 7, 2025

BrianCurtis-NOAA Mar 7, 2025

BrianCurtis-NOAA commented Mar 7, 2025

AnnaSmoot-NOAA Mar 7, 2025

AnnaSmoot-NOAA Mar 7, 2025

		write( logdev,* ) ' NT number of tracer is: ', nt
		write( logdev,* ) ' p_aqm_beg/ndiag is:', config % species %p_aqm_beg,'/',config % species % ndiag

Upgrade CMAQ from 5.2 to 5.4, Use correct variable for LUFRAC_ and DLUSE #106

Are you sure you want to change the base?

Upgrade CMAQ from 5.2 to 5.4, Use correct variable for LUFRAC_ and DLUSE #106

Conversation

BrianCurtis-NOAA commented Feb 27, 2025 • edited Loading

PR Checklist

Description

Issue(s) addressed

Dependencies

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BrianCurtis-NOAA commented Mar 7, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BrianCurtis-NOAA commented Feb 27, 2025 •

edited

Loading