ctsm5.4.025: Merge b4bdev to master

.config_files.xml

@@ -21,7 +21,7 @@
       <value component="slim"                        >$SRCROOT/components/slim/</value>
       <value component="dlnd" comp_interface="nuopc" >$SRCROOT/components/cdeps/dlnd</value>
       <value component="slnd" comp_interface="nuopc" >$CIMEROOT/CIME/non_py/src/components/stub_comps_$COMP_INTERFACE/slnd</value>
-      <value component="xlnd" comp_interface="nuopc" >$CIMEROOT/CIME/non_py/src/components/xcpl_comps_$COMP_INTERFACE/xlnd</value>
+      <value component="xlnd" comp_interface="nuopc" >$SRCROOT/components/cmeps/med_test_comps/xlnd</value>
     </values>
     <group>case_comps</group>
     <file>env_case.xml</file>

.gitmodules

@@ -58,8 +58,8 @@ fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
 
 [submodule "mizuRoute"]
-	path = components/mizuroute
-	url = https://github.com/ESCOMP/mizuRoute
+path = components/mizuRoute
+url = https://github.com/ESCOMP/mizuRoute
 fxtag = v3.0.1
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed

bld/CLMBuildNamelist.pm

@@ -1893,11 +1893,6 @@ sub process_namelist_inline_logic {
   #####################################
   setup_logic_canopy($opts,  $nl_flags, $definition, $defaults, $nl);
 
-  ########################################
-  # namelist group: soilhydrology_inparm #
-  ########################################
-  setup_logic_hydrology_params($opts,  $nl_flags, $definition, $defaults, $nl);
-
   #####################################
   # namelist group: irrigation_inparm #
   #####################################
@@ -3354,28 +3349,6 @@ sub setup_logic_supplemental_nitrogen {
 
 #-------------------------------------------------------------------------------
 
-sub setup_logic_hydrology_params {
-  #
-  # Logic for hydrology parameters
-  #
-  my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
-
-  my $lower = $nl->get_value( 'lower_boundary_condition'  );
-  my $var   = "baseflow_scalar";
-  if ( $lower == 1 || $lower == 2 ) {
-     add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
-                 $var, 'lower_boundary_condition' => $lower );
-  }
-  my $val   = $nl->get_value( $var );
-  if ( defined($val) ) {
-     if ( $lower != 1 && $lower != 2 ) {
-        $log->fatal_error("baseflow_scalar is only used for lower_boundary_condition of flux or zero-flux");
-     }
-  }
-}
-
-#-------------------------------------------------------------------------------
-
 sub setup_logic_irrigation_parameters {
   my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
 
@@ -4866,18 +4839,6 @@ sub setup_logic_atm_forcing {
       }
    }
 
-   foreach $var ("precip_repartition_glc_all_snow_t",
-                 "precip_repartition_glc_all_rain_t",
-                 "precip_repartition_nonglc_all_snow_t",
-                 "precip_repartition_nonglc_all_rain_t") {
-      if ( &value_is_true($nl->get_value("repartition_rain_snow")) ) {
-         add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var);
-      } else {
-         if (defined($nl->get_value($var))) {
-            $log->fatal_error("$var can only be set if repartition_rain_snow is true");
-         }
-      }
-   }
 }
 
 #-------------------------------------------------------------------------------
@@ -5431,7 +5392,7 @@ sub write_output_files {
                clm_soilhydrology_inparm dynamic_subgrid cnvegcarbonstate
                finidat_consistency_checks dynpft_consistency_checks
                clm_initinterp_inparm century_soilbgcdecompcascade
-               soilhydrology_inparm luna friction_velocity mineral_nitrogen_dynamics
+               luna friction_velocity mineral_nitrogen_dynamics
                soilwater_movement_inparm rooting_profile_inparm
                soil_resis_inparm  bgc_shared canopyfluxes_inparm aerosol
                clmu_inparm clm_soilstate_inparm clm_nitrogen clm_snowhydrology_inparm hillslope_hydrology_inparm hillslope_properties_inparm

bld/namelist_files/namelist_defaults_ctsm.xml

@@ -273,11 +273,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <soil_resis_method               >1</soil_resis_method>
 <soil_resis_method phys="clm4_5" >0</soil_resis_method>
 
-<!-- Soil hydrology -->
-<baseflow_scalar                lower_boundary_condition="2">0.001d00</baseflow_scalar>
-<baseflow_scalar                lower_boundary_condition="1">1.d-2</baseflow_scalar>
-<baseflow_scalar phys="clm4_5"  lower_boundary_condition="2">1.d-2</baseflow_scalar>
-
 <!-- Friction velocity -->
 <zetamaxstable               use_biomass_heat_storage=".true." >2.0d00</zetamaxstable>
 <zetamaxstable phys="clm4_5"                                   >2.0d00</zetamaxstable>
@@ -306,20 +301,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 <longwave_downscaling_limit>0.5</longwave_downscaling_limit>
 
-<precip_repartition_nonglc_all_snow_t>0.</precip_repartition_nonglc_all_snow_t>
-<precip_repartition_nonglc_all_rain_t>2.</precip_repartition_nonglc_all_rain_t>
-<!-- For CLM5 and following, we assume rain at somewhat cooler temperatures. The main
-     motivation is to increase glacier melt, which otherwise is too low in
-     CESM2. The physical justification is that the 0 - 2 C ramp used elsewhere
-     makes sense for typical atmospheric profiles; but over glaciers, inversions
-     are more common, so it is more reasonable to expect rain despite
-     below-freezing near-surface temperatures. -->
-<precip_repartition_glc_all_snow_t               >-2.</precip_repartition_glc_all_snow_t>
-<precip_repartition_glc_all_rain_t               >0.</precip_repartition_glc_all_rain_t>
-<!-- For CLM45, we used the same rain-snow partitioning for glaciers as for other landunits -->
-<precip_repartition_glc_all_snow_t phys="clm4_5" >0.</precip_repartition_glc_all_snow_t>
-<precip_repartition_glc_all_rain_t phys="clm4_5" >2.</precip_repartition_glc_all_rain_t>
-
 <!-- lnd2atm defaults -->
 <melt_non_icesheet_ice_runoff               >.true.</melt_non_icesheet_ice_runoff>
 <melt_non_icesheet_ice_runoff phys="clm4_5" >.false.</melt_non_icesheet_ice_runoff>

bld/namelist_files/namelist_definition_ctsm.xml

@@ -415,12 +415,6 @@ Max number of iterations used in subr. CanopyFluxes. For many years, 40 was the
 If TRUE use clm5 equation for fraction of intercepted precipitation
 </entry>
 
-<entry id="baseflow_scalar" type="real" category="clm_physics"
-       group="soilhydrology_inparm" valid_values="" >
-Scalar multiplier for base flow rate
-(ONLY used if lower_boundary_condition is not aquifer or table)
-</entry>
-
 <entry id="soilwater_movement_method" type="integer" category="clm_physics"
        group="soilwater_movement_inparm" valid_values="0,1" >
 Index of solution method of Richards equation.
@@ -1728,30 +1722,6 @@ This parameter must be in the range [0,1]
 Only relevant if glcmec_downscale_longwave is .true.
 </entry>
 
-<entry id="precip_repartition_glc_all_snow_t" type="real" category="clm_physics"
-       group="atm2lnd_inparm" valid_values="" >
-Temperature below which all precipitation falls as snow, for glacier columns (deg C)
-Only relevant if repartition_rain_snow is .true.
-</entry>
-
-<entry id="precip_repartition_glc_all_rain_t" type="real" category="clm_physics"
-       group="atm2lnd_inparm" valid_values="" >
-Temperature above which all precipitation falls as rain, for glacier columns (deg C)
-Only relevant if repartition_rain_snow is .true.
-</entry>
-
-<entry id="precip_repartition_nonglc_all_snow_t" type="real" category="clm_physics"
-       group="atm2lnd_inparm" valid_values="" >
-Temperature below which all precipitation falls as snow, for non-glacier columns (deg C)
-Only relevant if repartition_rain_snow is .true.
-</entry>
-
-<entry id="precip_repartition_nonglc_all_rain_t" type="real" category="clm_physics"
-       group="atm2lnd_inparm" valid_values="" >
-Temperature above which all precipitation falls as rain, for non-glacier columns (deg C)
-Only relevant if repartition_rain_snow is .true.
-</entry>
-
 <!-- ========================================================================================  -->
 <!-- Namelist items controlling fields sent to atmosphere                                      -->
 <!-- ========================================================================================  -->

cime_config/config_compsets.xml

@@ -111,9 +111,15 @@
     <lname>2000_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_RTM_SGLC_SWAV</lname>
   </compset>
 
+  <!-- compsets for mizuRoute -->
   <compset>
-    <alias>I2000Clm50SpMizGs</alias>
-    <lname>2000_DATM%GSWP3v1_CLM50%SP_SICE_SOCN_MIZUROUTE_SGLC_SWAV</lname>
+    <alias>I2000Clm60SpMizGs</alias>
+    <lname>2000_DATM%GSWP3v1_CLM60%SP_SICE_SOCN_MIZUROUTE_SGLC_SWAV</lname>
+  </compset>
+
+  <compset>
+    <alias>I2000Clm60SpMizGsNldas</alias>
+    <lname>2000_DATM%NLDAS2_CLM60%SP_SICE_SOCN_MIZUROUTE_SGLC_SWAV</lname>
   </compset>
 
   <compset>

cime_config/config_pes.xml

@@ -446,6 +446,43 @@
       </pes>
     </mach>
   </grid>
+  <grid name="l%0.9x1.25">
+    <mach name="izumi">
+      <pes pesize="S" compset="any">
+	<comment>Single node on izumi for small PE layout</comment>
+	<ntasks>
+	  <ntasks_atm>-1</ntasks_atm>
+	  <ntasks_lnd>-1</ntasks_lnd>
+	  <ntasks_rof>-1</ntasks_rof>
+	  <ntasks_ice>-1</ntasks_ice>
+	  <ntasks_ocn>-1</ntasks_ocn>
+	  <ntasks_glc>-1</ntasks_glc>
+	  <ntasks_wav>-1</ntasks_wav>
+	  <ntasks_cpl>-1</ntasks_cpl>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_glc>1</nthrds_glc>
+	  <nthrds_wav>1</nthrds_wav>
+	  <nthrds_cpl>1</nthrds_cpl>
+	</nthrds>
+	<rootpe>
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>0</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
+    </mach>
+  </grid>
   <grid name="l%0.9x1.25">
     <mach name="cheyenne">
       <pes pesize="any" compset="any">
@@ -557,19 +594,19 @@
       </pes>
     </mach>
   </grid>
-  <grid name="l%0.9x1.25">
-    <mach name="cheyenne">
+  <grid name="l%360x720">
+    <mach name="derecho">
       <pes pesize="S" compset="any">
-	<comment>Much lower core count f09 layout, mainly for testing</comment>
+	<comment>Much lower core count hcru layout, mainly for testing</comment>
 	<ntasks>
 	  <ntasks_atm>-1</ntasks_atm>
-	  <ntasks_lnd>-4</ntasks_lnd>
-	  <ntasks_rof>-4</ntasks_rof>
-	  <ntasks_ice>-4</ntasks_ice>
-	  <ntasks_ocn>-4</ntasks_ocn>
-	  <ntasks_glc>-4</ntasks_glc>
-	  <ntasks_wav>-4</ntasks_wav>
-	  <ntasks_cpl>-4</ntasks_cpl>
+	  <ntasks_lnd>-5</ntasks_lnd>
+	  <ntasks_rof>-5</ntasks_rof>
+	  <ntasks_ice>-5</ntasks_ice>
+	  <ntasks_ocn>-5</ntasks_ocn>
+	  <ntasks_glc>-5</ntasks_glc>
+	  <ntasks_wav>-5</ntasks_wav>
+	  <ntasks_cpl>-5</ntasks_cpl>
 	</ntasks>
 	<nthrds>
 	  <nthrds_atm>1</nthrds_atm>
@@ -1672,6 +1709,81 @@
       </pes>
     </mach>
   </grid>
+  <!-- The 5x5 aaazon grid for CTSM is only 5x5 gridcells, the HDMAmz_amazon grid has over 4k -->
+  <grid name="l%5x5_amazon_oi%null_r%HDMAmz_amazon">
+    <mach name="derecho">
+      <pes pesize="any" compset="any">
+      <comment>HDMA grid over amazon for Derecho/Izumi with a full two nodes going to mizuRoute</comment>
+	<ntasks>
+	  <ntasks_atm>25</ntasks_atm>
+	  <ntasks_lnd>25</ntasks_lnd>
+	  <ntasks_rof>-2</ntasks_rof>
+	  <ntasks_ice>25</ntasks_ice>
+	  <ntasks_ocn>25</ntasks_ocn>
+	  <ntasks_glc>25</ntasks_glc>
+	  <ntasks_wav>25</ntasks_wav>
+	  <ntasks_cpl>25</ntasks_cpl>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_glc>1</nthrds_glc>
+	  <nthrds_wav>1</nthrds_wav>
+	  <nthrds_cpl>1</nthrds_cpl>
+	</nthrds>
+	<rootpe>
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>0</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
+    </mach>
+  </grid>
+  <grid name="l%5x5_amazon_oi%null_r%HDMAmz_amazon">
+    <mach name="izumi">
+      <pes pesize="any" compset="any">
+      <comment>HDMA grid over amazon for Izumi with a full node going to mizuRoute</comment>
+	<ntasks>
+	  <ntasks_atm>25</ntasks_atm>
+	  <ntasks_lnd>25</ntasks_lnd>
+	  <ntasks_rof>-1</ntasks_rof>
+	  <ntasks_ice>25</ntasks_ice>
+	  <ntasks_ocn>25</ntasks_ocn>
+	  <ntasks_glc>25</ntasks_glc>
+	  <ntasks_wav>25</ntasks_wav>
+	  <ntasks_cpl>25</ntasks_cpl>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_glc>1</nthrds_glc>
+	  <nthrds_wav>1</nthrds_wav>
+	  <nthrds_cpl>1</nthrds_cpl>
+	</nthrds>
+	<rootpe>
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>0</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
+    </mach>
+  </grid>
   <grid name="l%T31">
     <mach name="any">
       <pes pesize="any" compset="any">
@@ -2323,6 +2435,43 @@
       </pes>
     </mach>
   </grid>
+  <grid name="l%0.125nldas2">
+    <mach name="izumi">
+      <pes pesize="S" compset="any">
+	<comment>Single node nldas2 layout, mainly for testing</comment>
+	<ntasks>
+	  <ntasks_atm>-1</ntasks_atm>
+	  <ntasks_lnd>-1</ntasks_lnd>
+	  <ntasks_rof>-1</ntasks_rof>
+	  <ntasks_ice>-1</ntasks_ice>
+	  <ntasks_ocn>-1</ntasks_ocn>
+	  <ntasks_glc>-1</ntasks_glc>
+	  <ntasks_wav>-1</ntasks_wav>
+	  <ntasks_cpl>-1</ntasks_cpl>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_glc>1</nthrds_glc>
+	  <nthrds_wav>1</nthrds_wav>
+	  <nthrds_cpl>1</nthrds_cpl>
+	</nthrds>
+	<rootpe>
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>0</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
+    </mach>
+  </grid>
   <grid name="l%0.125nldas2">
     <mach name="derecho">
       <pes pesize="any" compset="any">