Merge pull request #29 from GEOS-ESM/develop

GEOS-ESM · Feb 4, 2025 · 13c31f4 · 13c31f4
2 parents 0796d0b + 76d8b19
commit 13c31f4
Show file tree

Hide file tree

Showing 25 changed files with 11,587 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 
 
+## [1.4.0] - 2025-02-03 
+
+### Added
+
+- StratTrop_JPL19 mechanism
+
+### Removed
+
+- got rid of do_wetchem switch
+
+
 ## [1.3.1] - 2025-01-21
 
 ### Added

diff --git a/GMI_GridComp/GmiChemistry/GmiChemistryMethod_mod.F90 b/GMI_GridComp/GmiChemistry/GmiChemistryMethod_mod.F90
@@ -97,7 +97,6 @@ module GmiChemistryMethod_mod
 !
     logical             :: do_chem_grp
     logical             :: do_smv_reord
-    logical             :: do_wetchem
 !
 !
     integer             :: sad_opt
@@ -275,9 +274,6 @@ subroutine readChemistryResourceFile (self, config, loc_proc,   &
       call ESMF_ConfigGetAttribute(config, value=self%do_smv_reord, label="do_smv_reord:", &
                              default=.false., __RC__ )
 
-      call ESMF_ConfigGetAttribute(config, value=self%do_wetchem,   label="do_wetchem:",   &
-                             default=.false., __RC__ )
-
 !     ---------------------------
 !     Surface Area Density (SAD):
 !     ---------------------------
@@ -747,7 +743,7 @@ subroutine runChemistry (self, SpeciesConcentration, gmiClock, gmiGrid,   &
                  gmiQJ, gmiQK, kel, humidity, pctm2, gmiQQJ, gmiQQK,           &
                  self%yda, self%qqkda, self%qqjda,                             &
                  self%do_smv_reord, self%do_synoz,                             &
-                 do_semiss_inchem, self%do_wetchem, nymd, nhms,                &
+                 do_semiss_inchem, nymd, nhms,                                 &
                  gmi_sec, tdt8, pr_diag, loc_proc, self%synoz_threshold,       &
                  self%chem_cycle, self%chem_mask_klo, self%chem_mask_khi,      &
                  self%imgas_num, self%initrogen_num, self%ioxygen_num,         &

diff --git a/GMI_GridComp/GmiChemistry/GmiThermalRateConstants_mod.F90 b/GMI_GridComp/GmiChemistry/GmiThermalRateConstants_mod.F90
@@ -38,9 +38,6 @@ module GmiThermalRateConstants_mod
 !     "if ((phot_opt == 3) .or. (phot_opt == 8))" before
 !     "if (do_AerDust_Calc)". This was done to make sure that "sadcol2"
 !     and "radA" are initialized only if fastJ or fastJX is employed.
-!   10January 2011 - Jules Kouatchou
-!     Used the provided cloud liquid water content instead of 
-!     calculating it internally. THis is done when do_wetchem is set to true.
 !   22October2022 - Stephen Steenrod
 !     Took out chem_mecha and obsolete phot_opts 4-8
 !     
@@ -55,7 +52,7 @@ module GmiThermalRateConstants_mod
 ! !INTERFACE:
 !
 
-      subroutine calcThermalRateConstants (do_wetchem, rootProc,                &
+      subroutine calcThermalRateConstants (rootProc,                            &
                      num_time_steps, ih2o_num, imgas_num, nymd, rxnr_adjust_map,&
                      pres3c, tropp, temp3, clwc, fcld, cmf, sadgmi, qkgmi,      &
                      concentration, rxnr_adjust, Eradius, Tarea, so4v_saexist,  &
@@ -73,8 +70,7 @@ subroutine calcThermalRateConstants (do_wetchem, rootProc,                &
 ! !INPUT PARAMETERS:
       logical, intent(in) :: pr_diag
       logical, intent(in) :: do_AerDust_Calc, do_LBSplusBCOC_SAD, rootProc
-           ! do wet chemistry?
-      logical, intent(in) :: do_wetchem
+
       integer, intent(in) :: loc_proc
       integer, intent(in) :: num_species
       integer, intent(in) :: num_sad, num_qks, num_molefrac
@@ -151,7 +147,7 @@ subroutine calcThermalRateConstants (do_wetchem, rootProc,                &
       end if
 
       lwccol (:) = 0.0d0
-
+      fcldcol(:) = 0.0d0
       qkcol(:,:) = 0.0d0
 
       do ij = ju1, j2
@@ -161,12 +157,8 @@ subroutine calcThermalRateConstants (do_wetchem, rootProc,                &
 
           tempcol(:) = temp3 (il,ij,:)
 
-          if (do_wetchem) then
-
-              lwccol(:)  = clwc(il,ij,:)
-              fcldcol(:) = fcld(il,ij,:)
-
-          end if
+          lwccol(:)  = clwc(il,ij,:)
+          fcldcol(:) = fcld(il,ij,:)
 
           !==================================================='
           ! Variables needed for gas/heterogeneous chemistry.'

diff --git a/GMI_GridComp/GmiChemistry/GmiUpdateChemistry_mod.F90 b/GMI_GridComp/GmiChemistry/GmiUpdateChemistry_mod.F90
@@ -46,7 +46,7 @@ subroutine updateChemistry ( savedVars, rootProc, do_ftiming,            &
                        press3e, pr_smv2, pr_nc_period, mass, concentration,    &
                        qjgmi, qkgmi, kel, humidity, pctm2, qqjgmi, qqkgmi, yda,&
                        qqkda, qqjda, do_smv_reord, do_synoz,                   &
-                       do_semiss_inchem, do_wetchem, nymd, nhms, gmi_sec, tdt, &
+                       do_semiss_inchem, nymd, nhms, gmi_sec, tdt,             &
                        pr_diag, loc_proc, synoz_threshold, chem_cycle,         &
                        chem_mask_klo, chem_mask_khi, imgas_num, initrogen_num, &
                        ioxygen_num, isynoz_num, num_species, num_qks, num_qjs, &
@@ -63,7 +63,6 @@ subroutine updateChemistry ( savedVars, rootProc, do_ftiming,            &
       character (len=*) ,intent(in) :: metdata_name_model ! second part of metdata_name, e.g., "MATCH"
       logical, intent(in) :: pr_diag
       logical, intent(in) :: do_smv_reord, do_synoz, do_semiss_inchem
-      logical, intent(in) :: do_wetchem
       logical, intent(in) :: rootProc, do_ftiming
       logical, intent(in) :: do_qqjk_inchem
       logical, intent(in) :: pr_qqjk

diff --git a/GMI_GridComp/GmiChemistry/StratTrop_HFC_S/GMI_GridComp.rc b/GMI_GridComp/GmiChemistry/StratTrop_HFC_S/GMI_GridComp.rc
@@ -273,7 +273,6 @@ do_chem_grp: T
 synoz_threshold: 150.0d-9
 chem_cycle: 1.0d0
 do_smv_reord: F
-do_wetchem: F
 loss_opt: 0
 do_AerDust_Calc: T
 AerDust_Effect_opt: 0