Merge remote-tracking branch 'ESCOMP/cam_development' into aqueous_chemistry_fixes

Author: fvitt

.gitmodules

@@ -29,7 +29,7 @@
 [submodule "atmos_phys"]
 	path = src/atmos_phys
 	url = https://github.com/ESCOMP/atmospheric_physics
-	fxtag = atmos_phys0_21_000
+	fxtag = atmos_phys0_21_002
         fxrequired = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
@@ -72,7 +72,7 @@
 [submodule "hemco"]
 	path = src/hemco
 	url = https://github.com/ESCOMP/HEMCO_CESM.git
-        fxtag = hemco-cesm2_2_0_hemco3_10_3
+        fxtag = hemco-cesm2_3_0_hemco3_10_3
         fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/HEMCO_CESM.git
 

bld/build-namelist

@@ -798,6 +798,18 @@ if ($docosp) {
     add_default($nl, 'docosp', 'val'=>'.true.');
 }
 
+# TEM diags
+if ($phys =~ /cam7/) {
+  add_default($nl, 'ctem_diags_numlats');
+}
+# check for conflicting TEM diagnostics settings
+if ((defined  $nl->get_value('ctem_diags_numlats')) and (defined $nl->get_value('phys_grid_ctem_za_nlat'))) {
+  my $esmf_nlats = $nl->get_value('ctem_diags_numlats');
+  my $sphr_nlats = $nl->get_value('phys_grid_ctem_za_nlat');
+  if ($esmf_nlats>0 and $sphr_nlats>0) {
+    die "Cannot set both Spherical Harmonics and ESMF regrid methods of TEM zonal mean diagnostics.\n";
+  }
+}
 
 # Constituents
 # ============
@@ -3123,7 +3135,6 @@ else {
 # present in the namelist.
 add_default($nl, 'use_hemco');
 if ($nl->get_value('use_hemco') =~ m/$TRUE/io) {
-    add_default($nl, 'cam_physics_mesh');
     add_default($nl, 'hemco_data_root');
     add_default($nl, 'hemco_config_file');
     add_default($nl, 'hemco_diagn_file');
@@ -3211,7 +3222,6 @@ if ($waccmx) {
     add_default($nl, 'fv_high_altitude', 'val'=>'.true.');
   }
   if ($ionos ne 'none') {
-    add_default($nl, 'cam_physics_mesh');
     add_default($nl, 'oplus_grid');
     add_default($nl, 'edyn_grid');
   }
@@ -3783,7 +3793,7 @@ if (!$simple_phys) {
     add_default($nl, 'zmconv_ke_lnd');
     add_default($nl, 'zmconv_num_cin');
     add_default($nl, 'zmconv_dmpdz');
-    add_default($nl, 'zmconv_tiedke_add');
+    add_default($nl, 'zmconv_tiedtke_add');
     add_default($nl, 'zmconv_capelmt');
     add_default($nl, 'zmconv_tau');
     add_default($nl, 'zmconv_parcel_hscale');

bld/configure

@@ -989,13 +989,6 @@ if ($rad_pkg eq 'camrt') {
             "                 with aerosol package $chem_pkg\n";
     }
 }
-elsif ($rad_pkg =~ m/rrtmg/) {
-
-    # RRTMGP not currently working with CARMA
-    if ($rad_pkg eq 'rrtmgp' and $carma_pkg ne 'none') {
-        die "configure ERROR: The CARMA microphysics package does not currently work with RRTMGP\n";
-    }
-}
 
 $cfg_ref->set('rad', $rad_pkg);
 

bld/namelist_files/namelist_defaults_cam.xml

@@ -959,18 +959,10 @@
 <edyn_grid hgrid="0.47x0.63">320x385</edyn_grid>
 <edyn_grid hgrid="ne120np4" >320x385</edyn_grid>
 
-<!-- ESMF mesh files for physics decomposition -->
-<cam_physics_mesh hgrid="0.47x0.63">atm/cam/coords/fv0.47x0.63_esmf_c210305.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="0.9x1.25">atm/cam/coords/fv0.9x1.25_esmf_c210305.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="1.9x2.5">atm/cam/coords/fv1.9x2.5_esmf_200428.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="4x5">atm/cam/coords/fv4x5_esmf_c210305.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="ne5np4">atm/cam/coords/ne5np4_esmf_20191204.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="ne5np4" npg="3">atm/cam/coords/ne5np4.pg3_esmf_mesh_c210121.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="ne16np4">atm/cam/coords/ne16np4_esmf_c210305.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="ne16np4" npg="3">share/meshes/ne16pg3_ESMFmesh_cdf5_c20211018.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="ne30np4">atm/cam/coords/ne30np4_esmf_c210305.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="ne30np4" npg="3">atm/cam/coords/ne30pg3_esmf_20200428.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="ne120np4" npg="3">share/meshes/ne120pg3_ESMFmesh_cdf5_c20211018.nc</cam_physics_mesh>
+<!-- For ESMF regrid zonal-mean TEM diagnostics -->
+<ctem_diags_numlats>0</ctem_diags_numlats>
+<ctem_diags_numlats hgrid="ne16np4">90</ctem_diags_numlats>
+<ctem_diags_numlats hgrid="ne30np4">180</ctem_diags_numlats>
 
 <!-- For scaling lightning sources of NOx -->
 <lght_no_prd_factor                                              >1.00D0</lght_no_prd_factor>
@@ -2092,6 +2084,8 @@
 <xs_coef_file>atm/waccm/phot/effxstex.txt</xs_coef_file>
 <xs_short_file>atm/waccm/phot/xs_short_c221005mm_slh_c250930.nc</xs_short_file>
 <xs_long_file >atm/waccm/phot/temp_prs_GT200nm_c221005mm_slh_c250930.nc</xs_long_file>
+<xs_short_file phys="cam7">atm/waccm/phot/xs_short_c250124mm.nc</xs_short_file>
+<xs_long_file  phys="cam7">atm/waccm/phot/temp_prs_GT200nm_c250124mm.nc</xs_long_file>
 <rsf_file     >atm/waccm/phot/RSF_GT200nm_v3.0_c080811.nc</rsf_file>
 <exo_coldens_file>atm/cam/chem/trop_mozart/phot/exo_coldens.nc</exo_coldens_file>
 
@@ -2919,7 +2913,7 @@
 <zmconv_num_cin                                       phys="cam7"     > 1       </zmconv_num_cin>
 
 <zmconv_dmpdz                                                         > -1.0E-3 </zmconv_dmpdz>
-<zmconv_tiedke_add                                                    > 0.5     </zmconv_tiedke_add>
+<zmconv_tiedtke_add                                                    > 0.5     </zmconv_tiedtke_add>
 <zmconv_capelmt                                                       > 70.0    </zmconv_capelmt>
 <zmconv_tau                                                           > 3600.0    </zmconv_tau>
 

bld/namelist_files/namelist_definition.xml

@@ -3206,7 +3206,7 @@ Tunable entrainment rate in ZM deep convection scheme in units of (m-1).
 Default: -1.0e-3 m-1
 </entry>
 
-<entry id="zmconv_tiedke_add" type="real" category="conv"
+<entry id="zmconv_tiedtke_add" type="real" category="conv"
        group="zmconv_nl" valid_values="" >
 Tunable parcel temperature perturbation in ZM deep convection scheme in units of (K).
 Default: 0.5K perturbation

bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml

@@ -114,13 +114,6 @@
  'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'CH2BR2', 'CHBR3', 'H2402', 'OCS', 'SF6', 'CFC11eq'
 </flbc_list>
 
-<!-- TEM -- REMOVE (will be default namelist parms) -->
-<!-- cam_physics_mesh = '$ATM_DOMAIN_MESH' -->
-<cam_physics_mesh hgrid="ne16np4" npg="3">share/meshes/ne16pg3_ESMFmesh_cdf5_c20211018.nc</cam_physics_mesh>
-<cam_physics_mesh hgrid="ne30np4" npg="3">share/meshes/ne30pg3_ESMFmesh_cdf5_c20211018.nc</cam_physics_mesh>
-<ctem_diags_numlats hgrid="ne16np4"> 90</ctem_diags_numlats>
-<ctem_diags_numlats hgrid="ne30np4">180</ctem_diags_numlats>
-
 <!-- history output -->
 
 <mfilt                           >      0,       5,     20,      40,      12,      120,       73</mfilt>

cime_config/buildnml

@@ -49,6 +49,7 @@ def buildnml(case, caseroot, compname):
     COMP_INTERFACE      = case.get_value("COMP_INTERFACE")
     CALENDAR            = case.get_value("CALENDAR")
     COMPSET             = case.get_value("COMPSET")
+    mesh_file           = case.get_value("ATM_DOMAIN_MESH")
 
 # The Gregorian calendar currently can't be used with spinup compsets
 # because CAM's stream-handling code can't handle a request for data
@@ -153,6 +154,9 @@ def buildnml(case, caseroot, compname):
             if ninst > 1:
                 logger.info("%s is being used for cam_branch_file", cam_branch_file)
 
+        # ESMF mesh file
+        infile_lines.append(" cam_physics_mesh = '" + mesh_file + "'")
+
         # In python3 integer division returns a float value.
         # Adjust argument of int() to get nearest integer.
         dtime = int( (3600*24)/int(atm_ncpl) + .5)

cime_config/testdefs/testlist_cam.xml

@@ -324,6 +324,16 @@
     </options>
   </test>
 
+  <test compset="QPC7" grid="ne3pg3_ne3pg3_mt232" name="SMS_D_Ln9" testmods="cam/carma_test_tracers">
+    <machines>
+      <machine name="izumi" compiler="nag" category="aux_cam"/>
+    </machines>
+    <options>
+      <option name="comment" >CAM7, CARMA test tracers</option>
+      <option name="wallclock">00:30:00</option>
+    </options>
+  </test>
+
   <test compset="FCARMA2000climo" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s" supported="false">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cam"/>
@@ -334,6 +344,15 @@
       <option name="comment">CARMA trop_strat model test</option>
     </options>
   </test>
+  <test compset="FWmaCARMAHIST" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s" supported="false">
+    <machines>
+      <machine name="derecho" compiler="intel" category="carma"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">CARMA WACCM trop_strat model test</option>
+    </options>
+  </test>
 
   <test compset="FHIST_C5" grid="f10_f10_mt232" name="TMC_D_Ln9" testmods="cam/mc_ttrac">
     <machines>

cime_config/testdefs/testmods_dirs/cam/outfrq3s_physgrid_tem/user_nl_cam

@@ -6,3 +6,4 @@ phys_grid_ctem_nfreq=3
 phys_grid_ctem_zm_nbas=16
 phys_grid_ctem_za_nlat=15
 fincl3 = 'Uzm','Vzm','Wzm','THzm', 'VTHzm','WTHzm','UVzm','UWzm'
+ctem_diags_numlats=0

cime_config/testdefs/testmods_dirs/cam/outfrq9s_ctem/user_nl_cam

@@ -4,7 +4,6 @@ nhtfrq=9,9,9,9,9,9,9,9,9,9
 write_nstep0=.true.
 inithist='ENDOFRUN'
 
-cam_physics_mesh = '$ATM_DOMAIN_MESH'
 ctem_diags_numlats = 90
 
 fincl2 = 'THtem','Utem','Vtem','Wtem','VTHtem','WTHtem','UVtem', 'UWtem', 'MSKtem', 'PStem'