Minor edits and additions in response to PR review by M. Hoffman.

E3SM-Project · Mar 14, 2024 · 7d8afb5 · 7d8afb5
1 parent 6a39312
commit 7d8afb5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
@@ -2918,7 +2918,7 @@
     <domain name="mpas.gis1to10kmR2">
       <nx>427386</nx>
       <ny>1</ny>
-      <desc>mpas.gis1to10km is a variable-resolution, from 1- to 10-km, MALI grid of the Greenland Ice Sheet.</desc>
+      <desc>mpas.gis1to10kmR2 is an updated (fewer grid cells; improved optimization) variable-resolution, from 1- to 10-km, MALI grid of the Greenland Ice Sheet.</desc>
     </domain>
 
     <domain name="mpas.ais20km">

diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -292,7 +292,8 @@
       <env name="ADIOS2_ROOT">$SHELL{if [ -z "$ADIOS2_ROOT" ]; then echo /global/cfs/cdirs/e3sm/3rdparty/adios2/2.9.1/cray-mpich-8.1.25/aocc-4.0.0; else echo "$ADIOS2_ROOT"; fi}</env>
     </environment_variables>
     <resource_limits>
-      <resource name="RLIMIT_STACK">-1</resource> </resource_limits>
+      <resource name="RLIMIT_STACK">-1</resource>
+    </resource_limits>
   </machine>
 
   <machine MACH="pm-gpu">

diff --git a/components/mpas-albany-landice/bld/namelist_files/albany_input.yaml b/components/mpas-albany-landice/bld/namelist_files/albany_input.yaml
@@ -15,7 +15,7 @@ ANONYMOUS:
         Cubature Degree: 4
         Basal Friction Coefficient:
           Type: Power Law
-          Power Exponent: 1.0 #left blank to cause an error if not filled
+          Power Exponent: 1.0
           Mu Type: Field 
           Effective Pressure Type: Hydrostatic Computed At Nodes
           Zero Effective Pressure On Floating Ice At Nodes: true

diff --git a/components/mpas-albany-landice/driver/glc_comp_mct.F b/components/mpas-albany-landice/driver/glc_comp_mct.F
@@ -886,12 +886,10 @@ subroutine glc_run_mct( EClock, cdata_g, x2g_g, g2x_g)!{{{
          ! will allow that.
          ! Finally, set whence to latest_before so we have piecewise-constant forcing.
          ! Could add, e.g., linear interpolation later.
-! In coupled mode, we don't want to use forcing from a file - that should come from the coupler!
-!         call mpas_stream_mgr_read(stream_manager, whence=MPAS_STREAM_LATEST_BEFORE, ierr=err_tmp)
-!         err = ior(err, err_tmp)
-!         call mpas_stream_mgr_reset_alarms(stream_manager, direction=MPAS_STREAM_INPUT, ierr=err_tmp)
-!         err = ior(err, err_tmp)
 
+         ! NOTE: If any input ("forcing") files here contain fields that the coupler also passes, 
+         ! the input file versions here will clobber the fields passed from the coupler. 
+
          call mpas_stream_mgr_read(domain % streamManager, whence=MPAS_STREAM_LATEST_BEFORE, saveActualWhen = .true., ierr=err_tmp)
          err = ior(err, err_tmp)
          call mpas_stream_mgr_reset_alarms(domain % streamManager, direction=MPAS_STREAM_INPUT, ierr=err_tmp)

diff --git a/driver-mct/cime_config/config_component.xml b/driver-mct/cime_config/config_component.xml
@@ -1085,7 +1085,7 @@
 
   <entry id="GLC_GRID">
     <type>char</type>
-    <valid_values>gland20,gland10,gland5,gland5UM,gland4,mpas.aisgis20km,mpas.gis20km,mpas.ais20km,mpas.gis1to10km,mpas.gis1to10kmR2,null</valid_values>
+    <valid_values>mpas.aisgis20km,mpas.gis20km,mpas.ais20km,mpas.gis1to10km,mpas.gis1to10kmR2,null</valid_values>
     <default_value>gland5UM</default_value>
     <group>build_grid</group>
     <file>env_build.xml</file>