Merge branch 'rljacob/update-test-v3res' (PR #6202)

Update resolutions in test cases to replace ne4 and ne11 with ne4pg2, replace oQU240 with oQU480 and update v2 mpas mesh with v3 IcoswISC30E3r5 in tests of the production config. Also change those from bigrid to trigrid. Update test length for some 2-case tests to work with new coupling frequencies. Make non-linear maps default for the v3 low res mesh ne30pg2_r05_IcoswISC30E3r5 since v3 uses those in production. [BFB] for tests not removed/added.
E3SM-Project · Feb 26, 2024 · dcc0ffb · dcc0ffb
2 parents c041b65 + a550212
commit dcc0ffb
Show file tree

Hide file tree

Showing 22 changed files with 233 additions and 109 deletions.
diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml
@@ -1531,6 +1531,32 @@
         </rootpe>
       </pes>
     </mach>
+    <mach name="gcp12">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="any">
+	<comment> gcp12 --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes </comment>
+	<ntasks>
+	  <ntasks_atm>-4</ntasks_atm>
+	  <ntasks_cpl>-4</ntasks_cpl>
+	  <ntasks_ocn>-4</ntasks_ocn>
+	  <ntasks_ice>-4</ntasks_ice>
+	  <ntasks_rof>-4</ntasks_rof>
+	  <ntasks_lnd>-4</ntasks_lnd>
+	</ntasks>
+      </pes>
+    </mach>
+    <mach name="pm-cpu|muller-cpu">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="any">
+	<comment> pm-cpu --compset WCYCL* --res ne30pg2_r05_IcoswISC30E3r5 on 4 nodes</comment>
+	<ntasks>
+	  <ntasks_atm>-4</ntasks_atm>
+	  <ntasks_cpl>-4</ntasks_cpl>
+	  <ntasks_ocn>-4</ntasks_ocn>
+	  <ntasks_ice>-4</ntasks_ice>
+	  <ntasks_rof>-4</ntasks_rof>
+	  <ntasks_lnd>-4</ntasks_lnd>
+	</ntasks>
+      </pes>
+    </mach>
   </grid>
   <grid name="a%ne30np4.pg.+_oi%EC30to60E2r2">
     <mach name="chrysalis">
@@ -2450,5 +2476,26 @@
         </nthrds>
       </pes>
     </mach>
+    <mach name="pm-cpu|muller-cpu">
+      <pes compset="any" pesize="any">
+        <comment>pm-cpu, conus 2 nodes</comment>
+        <ntasks>
+          <ntasks_atm>-2</ntasks_atm>
+          <ntasks_lnd>-2</ntasks_lnd>
+          <ntasks_rof>-2</ntasks_rof>
+          <ntasks_ice>-2</ntasks_ice>
+          <ntasks_ocn>-2</ntasks_ocn>
+          <ntasks_cpl>-2</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_cpl>1</nthrds_cpl>
+        </nthrds>
+      </pes>
+    </mach>
   </grid>
 </config_pes>
diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
@@ -963,6 +963,16 @@
       <mask>oEC60to30v3</mask>
     </model_grid>
 
+    <model_grid alias="conusx4v1pg2_r05_IcoswISC30E3r5">
+      <grid name="atm">ne0np4_conus_x4v1_lowcon.pg2</grid>
+      <grid name="lnd">r05</grid>
+      <grid name="ocnice">IcoswISC30E3r5</grid>
+      <grid name="rof">r05</grid>
+      <grid name="glc">null</grid>
+      <grid name="wav">null</grid>
+      <mask>IcoswISC30E3r5</mask>
+    </model_grid>
+
     <model_grid alias="northamericax4v1_r0125_oRRS15to5">
       <grid name="atm">ne0np4_northamericax4v1</grid>
       <grid name="lnd">r0125</grid>
@@ -2950,6 +2960,8 @@
       <ny>1</ny>
       <file grid="atm|lnd" mask="oEC60to30v3">$DIN_LOC_ROOT/share/domains/domain.lnd.conusx4v1pg2_oEC60to30v3.200518.nc</file>
       <file grid="ice|ocn" mask="oEC60to30v3">$DIN_LOC_ROOT/share/domains/domain.ocn.conusx4v1pg2_oEC60to30v3.200518.nc</file>
+      <file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.conusx4v1pg2_IcoswISC30E3r5.240205.nc</file>
+      <file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.conusx4v1pg2_IcoswISC30E3r5.240205.nc</file>
       <desc>1-deg with 1/4-deg over CONUS (version 1):</desc>
     </domain>
 
@@ -3283,6 +3295,8 @@
       <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5-nomask_trbilin.20231121.nc</map>
       <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ne30pg2_traave.20231121.nc</map>
       <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ne30pg2_traave.20231121.nc</map>
+      <map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc</map>
+      <map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc</map>
     </gridmap>
 
     <gridmap atm_grid="ne30np4.pg3" ocn_grid="oEC60to30v3">
@@ -3340,6 +3354,7 @@
 
     <gridmap atm_grid="ne30np4.pg2" lnd_grid="r05">
       <map name="ATM2LND_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_traave.20231130.nc</map>
+      <map name="ATM2LND_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trfvnp2.230516.nc</map>
       <map name="ATM2LND_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trbilin.20231130.nc</map>
       <map name="LND2ATM_FMAPNAME">cpl/gridmaps/ne30pg2/map_r05_to_ne30pg2_traave.20231130.nc</map>
       <map name="LND2ATM_SMAPNAME">cpl/gridmaps/ne30pg2/map_r05_to_ne30pg2_traave.20231130.nc</map>
@@ -3674,15 +3689,22 @@
       <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_conusx4v1pg2_mono.200514.nc</map>
       <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_conusx4v1pg2_mono.200514.nc</map>
     </gridmap>
+    <gridmap atm_grid="ne0np4_conus_x4v1_lowcon.pg2" ocn_grid="IcoswISC30E3r5">
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_IcoswISC30E3r5_traave.20240205.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_IcoswISC30E3r5_trbilin.20240205.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_IcoswISC30E3r5-nomask_trbilin.20240205.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_conusx4v1pg2_traave.20240205.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_conusx4v1pg2_traave.20240205.nc</map>
+    </gridmap>
     <gridmap atm_grid="ne0np4_conus_x4v1_lowcon.pg2" lnd_grid="r05">
-      <map name="ATM2LND_FMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_mono.200514.nc</map>
-      <map name="ATM2LND_SMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_bilin.200514.nc</map>
-      <map name="LND2ATM_FMAPNAME">cpl/gridmaps/conusx4v1pg2/map_r05_to_conusx4v1pg2_mono.200514.nc</map>
-      <map name="LND2ATM_SMAPNAME">cpl/gridmaps/conusx4v1pg2/map_r05_to_conusx4v1pg2_mono.200514.nc</map>
+      <map name="ATM2LND_FMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_traave.20240205.nc</map>
+      <map name="ATM2LND_SMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_trbilin.20240205.nc</map>
+      <map name="LND2ATM_FMAPNAME">cpl/gridmaps/conusx4v1pg2/map_r05_to_conusx4v1pg2_traave.20240205.nc</map>
+      <map name="LND2ATM_SMAPNAME">cpl/gridmaps/conusx4v1pg2/map_r05_to_conusx4v1pg2_traave.20240205.nc</map>
     </gridmap>
     <gridmap atm_grid="ne0np4_conus_x4v1_lowcon.pg2" rof_grid="r05">
-      <map name="ATM2ROF_FMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_mono.200514.nc</map>
-      <map name="ATM2ROF_SMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_bilin.200514.nc</map>
+      <map name="ATM2ROF_FMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_traave.20240205.nc</map>
+      <map name="ATM2ROF_SMAPNAME">cpl/gridmaps/conusx4v1pg2/map_conusx4v1pg2_to_r05_trbilin.20240205.nc</map>
     </gridmap>
 
 
@@ -4184,7 +4206,8 @@
 
     <gridmap atm_grid="ne30np4.pg2" rof_grid="r05">
       <map name="ATM2ROF_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_traave.20231130.nc</map>
-      <map name="ATM2ROF_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_traave.20231130.nc</map>
+      <map name="ATM2ROF_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trfvnp2.230516.nc</map>
+      <map name="ATM2ROF_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trbilin.20231130.nc</map>
     </gridmap>
 
     <gridmap atm_grid="ne30np4.pg3" rof_grid="r05">
@@ -4454,6 +4477,10 @@
     </gridmap>
 
     <!--- ocean to river mapping files -->
+    <gridmap rof_grid="r05" ocn_grid="IcoswISC30E3r5">
+      <map name="OCN2ROF_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_r05_traave.20231121.nc</map>
+    </gridmap>
+
     <gridmap rof_grid="r05" ocn_grid="EC30to60E2r2">
       <map name="OCN2ROF_SMAPNAME">cpl/cpl6/map_EC30to60E2r2_to_r05_neareststod.220728.nc</map>
     </gridmap>

diff --git a/cime_config/testmods_dirs/allactive/nlmaps/shell_commands b/cime_config/testmods_dirs/allactive/nlmaps/shell_commands
@@ -1,19 +1,15 @@
 alg=trfvnp2
 
-# This line is separate from the nonlinear maps. It corrects an oversight in the
-# existing default trigrid grid configuration.
-./xmlchange ATM2ROF_SMAPNAME=cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_bilin.200220.nc
-
 # We want these in v3.
 a2l=cpl/gridmaps/ne30pg2/map_ne30pg2_to_r05_trfvnp2.230516.nc
-a2o=cpl/gridmaps/ne30pg2/map_ne30pg2_to_EC30to60E2r2_trfvnp2.230516.nc
+a2o=cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc
 ./xmlchange ATM2LND_FMAPNAME_NONLINEAR=$a2l
 ./xmlchange ATM2ROF_FMAPNAME_NONLINEAR=$a2l
 ./xmlchange ATM2OCN_FMAPNAME_NONLINEAR=$a2o
 
-# These surface->atm maps are not needed, but we want to test the capability.
+# These surface->atm maps are not needed in v3, but we want to test the capability.
 l2a=cpl/gridmaps/ne30pg2/map_r05_to_ne30pg2_${alg}.230516.nc
-o2a=cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_ne30pg2_trfvnp2.230516.nc
+o2a=cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ne30pg2_trfv2.20240222.nc
 ./xmlchange LND2ATM_FMAPNAME_NONLINEAR=$l2a
 ./xmlchange LND2ATM_SMAPNAME_NONLINEAR=$l2a
 ./xmlchange OCN2ATM_FMAPNAME_NONLINEAR=$o2a

diff --git a/cime_config/testmods_dirs/allactive/wcprodssp/shell_commands b/cime_config/testmods_dirs/allactive/wcprodssp/shell_commands
@@ -6,9 +6,9 @@
 
  ./xmlchange RUN_TYPE="hybrid"
  ./xmlchange GET_REFCASE="TRUE"
- ./xmlchange RUN_REFCASE="v2.LR.historical_0101"
- ./xmlchange RUN_REFDATE="2015-01-01"
- ./xmlchange RUN_REFDIR=${INPUTDATA_ROOT}"/e3sm_init/V2.SSP370_SSP585.ne30pg2_EC30to60E2r2/v2.LR.historical_0101/2015-01-01-00000"
+ ./xmlchange RUN_REFCASE="20231209.v3.LR.piControl-spinup.chrysalis"
+ ./xmlchange RUN_REFDATE="1801-01-01"
+ ./xmlchange RUN_REFDIR=${INPUTDATA_ROOT}"/e3sm_init/V3.SSP370_SSP585.ne30pg2_r05_IcoswISC30E3r5/v3.LR.piControl-spinup/1801-01-01-00000"
 
  exit
 
diff --git a/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm
@@ -1,8 +1,11 @@
-! fsurdat used is not the same file for the reference historical run (as recorded in elm.r's global attribute)
+! fsurdat might be set to be not the same file for the reference historical run (as recorded in elm.r's global attribute)
 
  CHECK_FINIDAT_FSURDAT_CONSISTENCY       = .false.
-! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid)
-! finidat = "$DIN_LOC_ROOT/e3sm_init/V2.SSP370_SSP585.ne30pg2_EC30to60E2r2/v2.LR.historical_0101/2015-01-01-00000/v2.LR.historical_0101.elm.r.noNaN.2015-01-01-00000.nc"
+
+! flanduse_timeseries not ready for v3.LR.SSP production grid, set not to do transient_pft tentatively until SSP compset fully ready
+
+ do_transient_pfts = .false.
+
  hist_dov2xy = .true.,.true.
  hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA'
  hist_mfilt = 1,365

diff --git a/cime_config/testmods_dirs/config_pes_tests.xml b/cime_config/testmods_dirs/config_pes_tests.xml
@@ -115,10 +115,10 @@
     </mach>
   </grid>
   <!-- allactive -->
-  <grid name="a%ne30np4.pg.+_oi%EC30to60E2r2">
+  <grid name="a%ne30np4.pg.+_oi%IcoswISC30E3r5">
     <mach name="chrysalis">
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+_SESP$" pesize="any">
-        <comment>tests+chrysalis: -compset WCYCL* -res ne30pg*EC30to60E2r2 on 4 nodes pure-MPI, ~2.38 sypd </comment>
+        <comment>tests+chrysalis: -compset WCYCL* -res ne30pg*IcoswISC30E3r5 on 4 nodes pure-MPI </comment>
         <ntasks>
           <ntasks_atm>192</ntasks_atm>
           <ntasks_lnd>192</ntasks_lnd>
@@ -132,7 +132,7 @@
         </rootpe>
       </pes>
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+SGLC_SWAV_SIAC_SESP_BGC.*" pesize="any">
-        <comment>tests+chrysalis: --compset BGC* --res ne30pg2_r05_EC30to60E2r2 on 5 nodes pure-MPI, ~0.9 sypd </comment>
+        <comment>tests+chrysalis: --compset BGC* --res ne30pg2_r05_IcoswISC30E3r5 on 5 nodes pure-MPI </comment>
         <ntasks>
           <ntasks_atm>256</ntasks_atm>
           <ntasks_lnd>256</ntasks_lnd>
@@ -159,7 +159,7 @@
         </ntasks>
       </pes>
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+_SESP$" pesize="any">
-        <comment>tests+anvil: --compset WCYCL* --res ne30pg2_EC30to60E2r2 on 16 nodes pure-MPI, ~2.7 sypd </comment>
+        <comment>tests+anvil: --compset WCYCL* --res ne30pg2_IcoswISC30E3r5 on 16 nodes pure-MPI </comment>
         <ntasks>
           <ntasks_atm>396</ntasks_atm>
           <ntasks_lnd>396</ntasks_lnd>
@@ -173,7 +173,7 @@
         </rootpe>
       </pes>
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+SGLC_SWAV_SIAC_SESP_BGC.*" pesize="any">
-        <comment>tests+anvil: --compset BGC* --res ne30pg2_r05_EC30to60E2r2 on 30 nodes pure-MPI, ~3 sypd </comment>
+        <comment>tests+anvil: --compset BGC* --res ne30pg2_r05_IcoswISC30E3r5 on 30 nodes pure-MPI </comment>
         <ntasks>
           <ntasks_atm>675</ntasks_atm>
           <ntasks_lnd>684</ntasks_lnd>