Merge pull request #968 from bhutzell/sulfurTracking_v5.4_fixes

Fix Sulfur Tracking Model (STM)
USEPA · Jul 7, 2023 · 1959200 · 1959200
2 parents 8d67a79 + 96a52f3
commit 1959200
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CCTM/src/aero/aero6/AERO_DATA.F b/CCTM/src/aero/aero6/AERO_DATA.F
@@ -1201,7 +1201,10 @@ Subroutine map_aero()
          aso4emis_idx   = findAero( req_so4emis,   .True. )
          aso4icbc_idx   = findAero( req_so4icbc,   .True. )
          If ( ( ae6isoa ) .OR.
+     &        ( Index( mechname, 'CRACMM1_'        ) .Gt. 0 ) .OR.
+     &        ( Index( mechname, 'CRACMM1AMORE_'   ) .Gt. 0 ) .OR.
      &        ( Index( mechname, 'CB6R3_AE7'       ) .Gt. 0 ) .OR.
+     &        ( Index( mechname, 'CB6R5_AE7'       ) .Gt. 0 ) .OR.
      &        ( Index( mechname, 'CB6R5M_AE7'      ) .Gt. 0 ) ) Then
             oso4_idx       = findAero( req_oso4,       .True. )
             oso4aqh2o2_idx = findAero( req_oso4aqh2o2, .True. )

diff --git a/CCTM/src/driver/sciproc.F b/CCTM/src/driver/sciproc.F
@@ -304,8 +304,8 @@ END SUBROUTINE SA_WRAP_AE
       CALL SA_WRAP_AE( CGRID0, CGRID, JDATE, JTIME, TSTEP )
 #endif
       IF ( CKSUM ) CALL CKSUMMER ( 'AERO', CGRID, JDATE, JTIME )
-      IF ( BUDGET_DIAG .OR. LIPR ) CALL PA_UPDATE_AERO ( CGRID, SDATE, STIME )
       IF ( STM ) CALL STM_WRAP_AE ( CGRID, JDATE, JTIME )
+      IF ( BUDGET_DIAG .OR. LIPR ) CALL PA_UPDATE_AERO ( CGRID, SDATE, STIME )
       IF ( PRINT_PROC_TIME ) CALL TIMING_SPLIT ( CPU_TIME_START, 1, 'AERO' )
 
       CALL NEXTIME ( JDATE, JTIME, TSTEP( 2 ) )

diff --git a/CCTM/src/spcs/cgrid_spcs_nml/CGRID_SPCS.F b/CCTM/src/spcs/cgrid_spcs_nml/CGRID_SPCS.F
@@ -421,7 +421,10 @@ function cgrid_spcs_init() result ( success )
 
                If ( ( Index( mechname, 'SAPRC07TIC_AE6I' ) .Gt. 0 ) .OR.
      &              ( Index( mechname, 'SAPRC07TIC_AE7I' ) .Gt. 0 ) .OR.
+     &              ( Index( mechname, 'CRACMM1_'        ) .Gt. 0 ) .OR.
+     &              ( Index( mechname, 'CRACMM1AMORE_'   ) .Gt. 0 ) .OR.
      &              ( Index( mechname, 'CB6R3_AE7'       ) .Gt. 0 ) .OR.
+     &              ( Index( mechname, 'CB6R5_AE7'       ) .Gt. 0 ) .OR.
      &              ( Index( mechname, 'CB6R5M_AE7'      ) .Gt. 0 ) ) Then
 
                   ORGANOSULF = .TRUE.