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

Second merge of test update. Add a missing map, change some test lengths.
E3SM-Project · Feb 24, 2024 · 467a982 · 467a982
2 parents 95ad36f + a550212
commit 467a982
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
@@ -4477,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/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -153,7 +153,7 @@
     <PROJECT>e3sm</PROJECT>
     <SAVE_TIMING_DIR>/global/cfs/cdirs/e3sm</SAVE_TIMING_DIR>
     <SAVE_TIMING_DIR_PROJECTS>e3sm,m3411,m3412</SAVE_TIMING_DIR_PROJECTS>
-    <CIME_OUTPUT_ROOT>$ENV{PSCRATCH}/e3sm_scratch/pm-cpu/rtest</CIME_OUTPUT_ROOT>
+    <CIME_OUTPUT_ROOT>$ENV{PSCRATCH}/e3sm_scratch/pm-cpu</CIME_OUTPUT_ROOT>
     <CIME_HTML_ROOT>/global/cfs/cdirs/e3sm/www/$ENV{USER}</CIME_HTML_ROOT>
     <CIME_URL_ROOT>http://portal.nersc.gov/project/e3sm/$ENV{USER}</CIME_URL_ROOT>
     <DIN_LOC_ROOT>/global/cfs/cdirs/e3sm/inputdata</DIN_LOC_ROOT>

diff --git a/cime_config/tests.py b/cime_config/tests.py
@@ -65,7 +65,7 @@
         "tests" : (
             "ERS_D.f19_f19.IELM.elm-ic_f19_f19_ielm",
             "ERS_D.f09_g16.I1850ELMCN",
-            "ERS_D.ne4pg2_oQU480.I20TRELM",
+            "ERS_D.ne4pg2_oQU480.I20TRELM.elm-disableDynpftCheck",
             "SMS_Ly2_P1x1_D.1x1_smallvilleIA.IELMCNCROP.elm-lulcc_sville",
             "ERS_D.f19_g16.I1850GSWCNPRDCTCBC.elm-ctc_f19_g16_I1850GSWCNPRDCTCBC",
             "ERS_D.f09_f09.IELM.elm-solar_rad",
@@ -100,7 +100,7 @@
     "e3sm_atm_developer" : {
         "inherit" : ("eam_theta_pg2"),
         "tests"   : (
-            "ERP_Ln3.ne4pg2_oQU480.F2010",
+            "ERP_Ld3.ne4pg2_oQU480.F2010",
             "SMS_Ln9.ne4pg2_oQU480.F2010.eam-outfrq9s",
             "SMS.ne4pg2_oQU480.F2010.eam-cosplite",
             "SMS_R_Ld5.ne4_ne4.FSCM-ARM97.eam-scm",
@@ -180,8 +180,8 @@
             "ERS_Ld5.ne4pg2_oQU480.F2010.eam-rrtmgp",
             "ERS_Ld5.ne4pg2_oQU480.F2010.eam-rrtmgpxx",
             "REP_Ln5.ne4pg2_oQU480.F2010",
-            "SMS_Ld9.ne4pg2_oQU480.F2010.eam-thetahy_sl_pg2_mass",
-            "ERP_Ld9.ne4pg2_ne4pg2.FIDEAL.allactive-pioroot1",
+            "SMS_Ld3.ne4pg2_oQU480.F2010.eam-thetahy_sl_pg2_mass",
+            "ERP_Ld3.ne4pg2_ne4pg2.FIDEAL.allactive-pioroot1",
             )
         },
 

diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/disableDynpftCheck/user_nl_elm b/components/elm/cime_config/testdefs/testmods_dirs/elm/disableDynpftCheck/user_nl_elm
@@ -0,0 +1 @@
+check_dynpft_consistency = .false.