merge to head of cam_development; update to latest atmos phys hash

Author: peverwhee

.gitmodules

@@ -12,13 +12,6 @@
         fxtag = carma4_09
         fxDONOTUSEurl = https://github.com/ESCOMP/CARMA_base.git
 
-[submodule "pumas"]
-	path = src/physics/pumas
-	url = https://github.com/ESCOMP/PUMAS
-        fxrequired = AlwaysRequired
-        fxtag = pumas_cam-release_v1.39
-        fxDONOTUSEurl = https://github.com/ESCOMP/PUMAS
-
 [submodule "pumas-frozen"]
 	path = src/physics/pumas-frozen
 	url = https://github.com/ESCOMP/PUMAS
@@ -36,10 +29,18 @@
 [submodule "atmos_phys"]
 	path = src/atmos_phys
 	url = https://github.com/peverwhee/atmospheric_physics
-        fxtag = 9aac55720342a3b1ca438fe012531140b696a587
+        fxtag = 621f46c1378141bc2d403af693b6c04d2f862dcf
         fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
+[submodule "cam-sima"]
+        path = src/utils/cam-sima
+        url = https://github.com/ESCOMP/CAM-SIMA.git
+        fxrequired = AlwaysRequired
+        fxsparse = ../.sima_phys_utils_sparse_checkout
+        fxtag = sima0_07_000
+        fxDONOTUSEurl = https://github.com/ESCOMP/CAM-SIMA.git
+
 [submodule "fv3"]
 	path = src/dynamics/fv3
 	url = https://github.com/ESCOMP/CAM_FV3_interface.git

bld/build-namelist

@@ -739,7 +739,7 @@ elsif ($rad_pkg =~ m/rrtmgp/) {
     my $abs_path = quote_string(set_abs_filepath($rel_path, $cam_dir));
     $nl->set_variable_value('radiation_nl', 'rrtmgp_coefs_sw_file', $abs_path);
 
-    add_default($nl, 'p_top_for_rrtmgp');
+    add_default($nl, 'p_top_for_equil_rad');
 
 }
 
@@ -786,7 +786,8 @@ elsif (!$simple_phys) {
 
 
 # COSP simulator
-if ($cfg->get('cosp')) {
+my $docosp = $cfg->get('cosp');
+if ($docosp) {
     add_default($nl, 'docosp', 'val'=>'.true.');
 }
 
@@ -3338,7 +3339,7 @@ if ($cfg->get('microphys') =~ /^mg/) {
 	add_default($nl, 'micro_mg_accre_sees_auto');
 	add_default($nl, 'micro_mg_vtrms_factor');
 	add_default($nl, 'micro_mg_implicit_fall');
-        add_default($nl, 'pumas_stochastic_tau_kernel_filename', 'val'=>"$cfgdir/../src/physics/pumas/KBARF_tau_kernel.dat");
+        add_default($nl, 'pumas_stochastic_tau_kernel_filename', 'val'=>"$cfgdir/../src/atmos_phys/schemes/pumas/pumas/KBARF_tau_kernel.dat");
 
         #set path for stochastic_tau_kernel_filename
         my $cam_dir = $cfg->get('cam_dir');
@@ -4422,18 +4423,32 @@ my $interpolate_output = $nl->get_value('interpolate_output');
 my @interp_output = split /,/, $interpolate_output;
 for my $i (0 .. $#interp_output) {
   if ($interp_output[$i] =~ /$TRUE/io) {
+
     # Currently, interpolated output is only supported for the SE dycore
     if ( ! ($dyn =~ /se/) ) {
       die "$ProgName - ERROR: interpolate_output is not supported for $dyn dycore";
     }
+
     # Currently, interpolated output is incompatible with regional output
     my $region = $nl->get_value('fincl${i}lonlat');
     if (defined $region) {
       die "$ProgName - ERROR: interpolate_output is currently incompatible with regional output (e.g., fincl${i}lonlat)";
     }
+
   }
 }
 
+# Currently, interpolated output does not work with the COSP fields that use
+# more than 1 mdims.
+my $cosp_histfile_num = $nl->get_value('cosp_histfile_num');
+if (!defined $cosp_histfile_num) {$cosp_histfile_num = 1;}
+if ($interp_output[$cosp_histfile_num-1] =~ /$TRUE/io) {
+    die "$ProgName - ERROR: interpolate_output does not work with COSP.  Use cosp_histfile_num\n" .
+        " to direct COSP output to a history file that is not interpolated.  COSP output is\n" .
+        " currently on cosp_histfile_num=$cosp_histfile_num which contains interpolated output.";
+}
+
+
 my $offline_drv = $cfg->get('offline_drv');
 if ($offline_drv ne 'stub') {
 

bld/configure

@@ -2161,7 +2161,7 @@ sub write_filepath
     }
 
     if ($phys_pkg eq 'cam7') {
-	print $fh "$camsrcdir/src/physics/pumas\n";
+	print $fh "$camsrcdir/src/atmos_phys/schemes/pumas/pumas\n";
     } else {
 	print $fh "$camsrcdir/src/physics/pumas-frozen\n";
     }
@@ -2172,6 +2172,7 @@ sub write_filepath
     # in the list of filepaths.
     print $fh "$camsrcdir/src/physics/cam\n";
     print $fh "$camsrcdir/src/atmos_phys/to_be_ccppized\n";
+    print $fh "$camsrcdir/src/atmos_phys/to_be_ccppized/radiation_utils\n";
     print $fh "$camsrcdir/src/atmos_phys/phys_utils\n";
 
     # Add the CCPP'ized subdirectories
@@ -2208,6 +2209,9 @@ sub write_filepath
     print $fh "$camsrcdir/src/utils\n";
     print $fh "$camsrcdir/src/utils/cam_ccpp\n";
 
+    # Routines from CAM-SIMA
+    print $fh "$camsrcdir/src/utils/cam-sima/src/physics/utils\n";
+
     $fh->close;
 }
 

bld/namelist_files/namelist_defaults_cam.xml

@@ -575,9 +575,11 @@
 <rrtmgp_coefs_lw_file>src/physics/rrtmgp/data/rrtmgp-gas-lw-g128.nc</rrtmgp_coefs_lw_file>
 <rrtmgp_coefs_sw_file>src/physics/rrtmgp/data/rrtmgp-gas-sw-g112.nc</rrtmgp_coefs_sw_file>
 
-<p_top_for_rrtmgp>                 10.D0 </p_top_for_rrtmgp>
-<p_top_for_rrtmgp  waccmx="1" >     1.D0 </p_top_for_rrtmgp>
-<p_top_for_rrtmgp  waccm_phys="1" > 1.D0 </p_top_for_rrtmgp>
+<!-- Pressure top for blending region for radiation heating -->
+<p_top_for_equil_rad>                  0.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  waccmx="1" >     1.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  waccm_phys="1" > 1.D0 </p_top_for_equil_rad>
+<p_top_for_equil_rad  rad="rrtmgp">    2.D0 </p_top_for_equil_rad>
 
 <!-- CAM-RT absorptivity/emissivity lookup table -->
 <absems_data rad="camrt">atm/cam/rad/abs_ems_factors_fastvx.c030508.nc</absems_data>

bld/namelist_files/namelist_definition.xml

@@ -5771,11 +5771,12 @@ Calculate radiative effect of graupel/hail (using snow optics)
 Default: FALSE
 </entry>
 
-<entry id="p_top_for_rrtmgp" type="real"  category="radiation"
-       group="radiation_nl" valid_values="" >
-Top pressure level for RRTMGP
+<entry id="p_top_for_equil_rad" type="real"  category="radiation"
+       group="radheat_nl" valid_values="" >
+Top pressure level for non-LTE blending region
 Default: 1.0 for WACCM/WACCMX
-         10. for all other CAM runs
+         2. for all other RRTMGP runs
+         0.0 for all other runs
 </entry>
 
 <entry id="use_rad_dt_cosz" type="logical"  category="radiation"

cime_config/config_component.xml

@@ -9,10 +9,10 @@
     ===============
    -->
     <desc atm="CAM70[%LT][%MT][%WA][%WX][%CSO][%CT1S][%CT4S][%CT0MA][%CT1MA][%CT4MA][%PORT]"                                                                                                                                                                                                                                                                                             >CAM cam7 physics:</desc>
-    <desc atm="CAM60[%1PCT][%4xCO2][%CARMATS][%CARMAWM][%CT1S][%CT2S][%CFIRE][%CVBSX][%NUDG][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE][%WXIED][%HEMCO][%GEOSCHEM][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam6 physics:</desc>
-    <desc atm="CAM50[%CT1S][%CLB][%PORT][%RCO2][%MAM7][%SCAM][%SDYN][%WCSC][%WCTS][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]"                                                                                 >CAM cam5 physics:</desc>
-    <desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WX][%WXIE][%WXIED][%WCCM][%WCMD][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]"                                                                          >CAM cam4 physics:</desc>
-    <desc atm="CAM[%ADIAB][%TJ16][%GRAYRAD][%HS94][%KESSLER][%RCO2]"  >CAM simplified and non-versioned physics :</desc>
+    <desc atm="CAM60[%1PCT][%4xCO2][%CARMATS][%CARMAWM][%CT1S][%CT2S][%CFIRE][%CVBSX][%NUDG][%PORT][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE][%WXIED][%HEMCO][%GEOSCHEM][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam6 physics:</desc>
+    <desc atm="CAM50[%CT1S][%PORT][%SCAM][%SDYN][%WCSC][%WCTS][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]"                                                                                 >CAM cam5 physics:</desc>
+    <desc atm="CAM40[%PORT][%SCAM][%SDYN][%TMOZ][%WX][%WXIE][%WXIED][%WCCM][%WCMD][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]"                                                                          >CAM cam4 physics:</desc>
+    <desc atm="CAM[%ADIAB][%TJ16][%GRAYRAD][%HS94][%KESSLER]"  >CAM simplified and non-versioned physics :</desc>
 
   <!--
     ===============
@@ -44,14 +44,11 @@
     <desc option="CSO"          >Specified oxidants chemistiry </desc>
     <desc option="GEOSCHEM"     >GEOS-Chem troposphere/stratosphere chemistry :</desc>
     <desc option="CFIRE"        >CAM-Chem troposphere/stratosphere chem with simplified volatility basis set SOA scheme and fire emissons :</desc>
-    <desc option="CLB"          >CAM CLUBB - turned on by default in CAM60:</desc>
     <desc option="CVBSX"        >CAM-Chem troposphere/stratosphere chem with extended volatility basis set SOA scheme and modal aersols :</desc>
     <desc option="LT"           >CAM low top model </desc>
     <desc option="WA"           >WACCM model </desc>
     <desc option="WX"           >WACCMX extended model </desc>
-    <desc option="MAM7"         >Modal Aerosol Model composed of 7 modes: </desc>
     <desc option="MT"           >CAM mid top model </desc>
-    <desc option="RCO2"         >CAM CO2 ramp: </desc>
     <desc option="TMOZ"         >CAM tropospheric chemistry with bulk aerosols:</desc>
 
   <!--
@@ -138,7 +135,6 @@
       <value compset="_CAM.*(%CT1S|%CFIRE)">-chem trop_strat_mam5_vbs</value>
       <value compset="_CAM60.*%(GEOSCHEM)">-chem geoschem_mam4</value>
 
-      <value compset="%MAM7">-chem trop_mam7</value>
       <value compset="CAM60%CARMATS">-chem trop_strat_noaero -carma trop_strat_soa5</value>
       <value compset="CAM60%CARMAWM">-chem waccm_ma_noaero -carma trop_strat_soa1</value>
       <value compset="CAM60%CVBSX">-chem trop_strat_mam5_vbsext</value>
@@ -149,7 +145,6 @@
       <value compset="CAM.*%CT0MA">-chem waccm_ma_mam5</value>
       <value compset="CAM.*%CT1MA">-chem waccm_tsmlt_mam5</value>
       <value compset="CAM.*%CT4MA">-chem waccm_t4ma_mam5</value>
-      <value compset="_CAM50%CLB">-clubb_sgs</value>
       <value compset="_CAM40%TMOZ">-chem trop_mozart</value>
 
       <value compset="_CAM.*_BGC%B">-co2_cycle</value>
@@ -353,7 +348,6 @@
     <valid_values></valid_values>
     <default_value></default_value>
     <values match="last" modifier="additive">
-      <value compset="_CAM.*%RCO2"> scenario_ghg=&apos;RAMP_CO2_ONLY&apos;ramp_co2_annual_rate=1 </value>
       <value compset="_CAM60%4xCO2"> co2vmr=1138.8e-6  </value>
       <value compset="_CAM60%WCTS%4xCO2"> flbc_cycle_yr=1  </value>
       <value compset="_CAM60%WCTS%4xCO2"> flbc_file='$DIN_LOC_ROOT/atm/waccm/lb/LBC_CMIP6abrupt4xCO2_cyclicalYear1_0p5degLat_c180929.nc'  </value>

cime_config/config_compsets.xml

@@ -222,16 +222,6 @@
     <lname>2000_CAM50_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
   </compset>
 
-  <compset>
-    <alias>QPC5HIST</alias>
-    <lname>HIST_CAM50_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>QPC5M7</alias>
-    <lname>2000_CAM50%MAM7_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
-  </compset>
-
   <compset>
     <alias>QPC6HIST</alias>
     <lname>HIST_CAM60_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
@@ -298,6 +288,11 @@
   <!-- CAM tested compsets -->
   <!-- ****************************** -->
 
+  <compset>
+    <alias>FHIST_C5</alias>
+    <lname>HIST_CAM50_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>FHIST_C4</alias>
     <lname>HIST_CAM40_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>