Sync with code in Chem GC as of 2024-05-16

CARMA_GridComp.F90

@@ -977,7 +977,7 @@ SUBROUTINE CARMA_GridCompRun ( gcCARMA, qa, impChem, expChem, nymd, nhms, &
 !  Fill the internal state with direct gas species from GMI
 !  Expectation is species are in VMR and needed in MMR for CARMA
 !  -----------
-   if(trim(reg%sulfuric_acid_source) == 'full_field' .and. reg%NGAS > 0) then
+   if(reg%sulfuric_acid_source(1:10) == 'full_field' .and. reg%NGAS > 0) then
     do igas = 1, reg%NGAS
      n  = nCARMAbegin + reg%NBIN*reg%NELEM - 1 + igas
      gasname = ESMF_UtilStringUpperCase(reg%gasname(igas))
@@ -1399,7 +1399,7 @@ SUBROUTINE CARMA_GridCompRun ( gcCARMA, qa, impChem, expChem, nymd, nhms, &
 !  Return the updated gas species to GMI from the internal state
 !  Expectation is species are in MMR and needed in VMR for GMI
 !  -----------
-   if(trim(reg%sulfuric_acid_source) == 'full_field' .and. reg%NGAS > 0) then
+   if(reg%sulfuric_acid_source(1:10) == 'full_field' .and. reg%NGAS > 0) then
     do igas = 1, reg%NGAS
      n  = nCARMAbegin + reg%NBIN*reg%NELEM - 1 + igas
      gasname = ESMF_UtilStringUpperCase(reg%gasname(igas))

CARMA_UtilMod.F90

@@ -685,7 +685,7 @@ SUBROUTINE CARMA_Emissions ( gcCARMA, qa, impChem, expChem, nymd, nhms, cdt, &
      do igas = 1, reg%NGAS
       n = n1 + reg%NELEM*reg%NBIN - 1 + igas
       gasname = ESMF_UtilStringUpperCase(trim(reg%gasname(igas)))
-      if(trim(reg%sulfuric_acid_source) == 'tendency' .and. gasname == 'H2SO4') then
+      if(reg%sulfuric_acid_source(1:8) == 'tendency' .and. gasname == 'H2SO4') then
              qa(n)%data3d = qa(n)%data3d + pso4 * dtime
       endif
       if( gasname == 'HNO3') then  ! go to MMR

CARMAchem_GridCompMod.F90

@@ -748,7 +748,7 @@ SUBROUTINE Initialize_ ( gc, import, export, clock, rc )
         end if
 
         ! attach the aerosol optics method
-        call ESMF_MethodAdd(aero, label='aerosol_optics', userRoutine=aerosol_optics, __RC__)
+        call ESMF_MethodAdd(aero, label='run_aerosol_optics', userRoutine=run_aerosol_optics, __RC__)
 
     end if
 
@@ -1730,7 +1730,7 @@ SUBROUTINE final_(ierr)
    END SUBROUTINE final_
 
 
-subroutine aerosol_optics(state, rc)
+subroutine run_aerosol_optics(state, rc)
 
   implicit none
 
@@ -1774,7 +1774,7 @@ subroutine aerosol_optics(state, rc)
   real    :: x
   integer :: i, j, k
 
-  Iam = 'CARMA::aerosol_optics()'
+  Iam = 'CARMA::run_aerosol_optics()'
 
 
 ! Mie Table instance/index
@@ -1930,7 +1930,7 @@ subroutine mie_(mie_table, aerosol, nb, offset, q, rh, ext, ssa, asy, rc)
 
     end subroutine mie_
 
- end subroutine aerosol_optics
+ end subroutine run_aerosol_optics
 
 
 

CHANGELOG.md

@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [1.1.0] - 2024-05-16
+
+### Changed
+
+- Synced with code in GEOS_ChemGridComp `develop` as of 2024-05-16
+
 ## [1.0.0] - 2023-08-25
 
 ### Added