Merge remote-tracking branch 'fvitt/shr_drydep_mod' into shr_drydep_mod

ESCOMP · Sep 6, 2022 · 1355650 · 1355650
2 parents 37b9246 + 45c0c1f
commit 1355650
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -3669,6 +3669,7 @@ sub setup_logic_dry_deposition {
                      "   Use the '--no-drydep' option when '-bgc fates' is activated");
     }
     add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'drydep_list');
+    add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'dep_data_file');
   } else {
     if ( defined($nl->get_value('drydep_list')) ) {
       $log->fatal_error("drydep_list defined, but drydep option NOT set");

diff --git a/bld/namelist_files/namelist_defaults_drydep.xml b/bld/namelist_files/namelist_defaults_drydep.xml
@@ -18,6 +18,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <drydep_list>'O3','NO2','HNO3','NO','HO2NO2','CH3OOH','CH2O','CO','H2O2','CH3COOOH','PAN','MPAN','C2H5OOH','ONIT','POOH','C3H7OOH','ROOH','CH3COCHO','CH3COCH3','Pb','ONITR','MACROOH','XOOH','ISOPOOH','CH3OH','C2H5OH','CH3CHO','GLYALD','HYAC','HYDRALD','ALKOOH','MEKOOH','TOLOOH','TERPOOH','CH3COOH','CB1','CB2','OC1','OC2','SOA','SO2','SO4','NH3','NH4NO3'
 </drydep_list>
 
+<!-- effective Henry's coef data for wet and dry deposition -->
+<dep_data_file>atm/cam/chem/trop_mozart/dvel/dep_data_c201019.nc</dep_data_file>
+
 <!-- Defaults for megan_emis_nl -->
 
 <megan_specifier>'ISOP = isoprene', 'C10H16 = pinene_a + carene_3 + thujene_a', 'CH3OH = methanol', 'C2H5OH = ethanol', 'CH2O = formaldehyde', 'CH3CHO = acetaldehyde', 'CH3COOH = acetic_acid', 'CH3COCH3 = acetone'</megan_specifier>

diff --git a/bld/namelist_files/namelist_definition_drv_flds.xml b/bld/namelist_files/namelist_definition_drv_flds.xml
@@ -71,6 +71,15 @@
     List of species that undergo dry deposition.
   </entry>
 
+  <entry id="dep_data_file"
+         type="char*500"
+         input_pathname="abs"
+         category="dry_deposition"
+         group="drydep_inparm"
+         valid_values="" >
+    Full pathname of file containing gas phase deposition data including effective
+    Henry's law coefficients.
+  </entry>
 
   <!-- ========================================================================================  -->
   <!-- Fire emissions fluxes                                                                     -->

diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90
@@ -448,10 +448,11 @@ subroutine control_init(dtime)
                    errMsg(sourcefile, __LINE__))
           end if
 
-          if ( n_drydep > 0 ) then
-             call endrun(msg=' ERROR: dry deposition via ML Welsey is not compatible with FATES.'//&
-                   errMsg(sourcefile, __LINE__))
-          end if
+! Remove this check ??? the conditional will alway be false when n_drydep>0
+!          if ( n_drydep > 0 .and. drydep_method /= DD_XLND ) then
+!             call endrun(msg=' ERROR: dry deposition via ML Welsey is not compatible with FATES.'//&
+!                   errMsg(sourcefile, __LINE__))
+!          end if
 
           if( use_luna ) then
              call endrun(msg=' ERROR: luna is not compatible with FATES.'//&