Merge branch 'azamat/tests/v3res-update' (PR #6271)

Update performance tests with v3 low res mesh

Update performance tests with v3 low res mesh:
- run `e3sm_prod_bench` with v3 meshes in F- and B-cases
- disable slow archiving of old tests on all ANL LCRC machines
- add 3x32x2 PEs for ne4 I-cases on Chrysalis to match test-cases
- shorten run-times of `e3sm_prod` RRM- and F-cases from Ld5 to Ld1
- remove two redundant tests

[NML] -- for e3sm_prod_bench tests
[non-BFB] -- for 2 e3sm_prod tests due to test-name change

cime_config/testmods_dirs/bench/noio/user_nl_mpaso

@@ -6,3 +6,4 @@ config_am_timeseriesstatsmonthlymin_enable=false
 config_am_timeseriesstatsmonthlymax_enable=false
 config_am_eddyproductvariables_enable=false
 config_am_oceanheatcontent_enable=false
+config_am_conservationcheck_enable=false

cime_config/tests.py

@@ -213,7 +213,7 @@
     "e3sm_atm_prod" : {
         "tests" : (
             "SMS_Ln5.ne30pg2_r05_IcoswISC30E3r5.F2010.eam-wcprod_F2010",
-            "SMS.ne30pg2_r05_IcoswISC30E3r5.F20TR.eam-wcprod_F20TR",
+            "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.F20TR.eam-wcprod_F20TR",
             )
         },
 
@@ -292,7 +292,6 @@
             "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod",
             "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP370.allactive-wcprodssp",
             "ERS_Ld3.ne4pg2_oQU480.F2010",
-            #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset
             "NCK.ne4pg2_oQU480.WCYCL1850NS",
             "PET.f19_g16.X.allactive-mach-pet",
             "PET.f45_g37_rx1.A.allactive-mach-pet",
@@ -302,7 +301,6 @@
             "SMS_Ld2.ne30pg2_r05_IcoswISC30E3r5.BGCEXP_CNTL_CNPECACNT_1850.elm-bgcexp",
             "SMS_Ld2.ne30pg2_r05_IcoswISC30E3r5.BGCEXP_CNTL_CNPRDCTC_1850.elm-bgcexp",
             "SMS_D_Ld3.T62_oQU120.CMPASO-IAF",
-            "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850",
             "SMS_Ln5.ne30pg2_ne30pg2.F2010-SCREAM-LR-DYAMOND2",
             "ERS_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-nlmaps",
             "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850-DISMF",
@@ -347,13 +345,12 @@
     "e3sm_prod" : {
         "inherit" : "e3sm_atm_prod",
         "tests"   : (
-            "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod_1850_r05",
             "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850-1pctCO2.allactive-wcprod_1850_1pctCO2",
             "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850-4xCO2.allactive-wcprod_1850_4xCO2",
             "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod_1850",
             "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP370.allactive-wcprodssp",
             "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCLSSP585.allactive-wcprodssp",
-            "SMS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm_1850",
+            "SMS_Ld1_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm_1850",
             "SMS_D_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850",
             )
         },
@@ -371,11 +368,8 @@
     #e3sm performance-benching of production-like runs
     "e3sm_prod_bench" : {
         "tests"   : (
-            "PFS.ne30pg2_r05_oECv3.F2010.bench-noio",
-            "PFS.ne30pg2_r05_oECv3.F20TR.bench-noio",
-            "PFS.ne30pg2_r05_EC30to60E2r2.WCYCL1850.bench-noio",
-            "PFS.ne30pg2_EC30to60E2r2.WCYCL1850.bench-noio",
-            "PFS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.bench-noio",
+            "PFS.ne30pg2_r05_IcoswISC30E3r5.F2010.bench-noio",
+            "PFS.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.bench-noio",
             )
         },
 

components/elm/cime_config/config_pes.xml

@@ -523,4 +523,33 @@
       </pes>
     </mach>
   </grid>
+  <grid name="l%ne4np4.*">
+    <mach name="chrysalis">
+      <pes compset="any" pesize="any">
+        <comment>elm on chrysalis: any compset on ne4 grid, 3x32x2 NODESxMPIxOMP</comment>
+        <MAX_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
+        <MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
+        <ntasks>
+          <ntasks_atm>96</ntasks_atm>
+          <ntasks_ice>96</ntasks_ice>
+          <ntasks_cpl>96</ntasks_cpl>
+          <ntasks_lnd>96</ntasks_lnd>
+          <ntasks_rof>96</ntasks_rof>
+          <ntasks_ocn>96</ntasks_ocn>
+          <ntasks_glc>96</ntasks_glc>
+          <ntasks_wav>96</ntasks_wav>
+        </ntasks>
+        <nthrds>
+          <nthrds_atm>2</nthrds_atm>
+          <nthrds_ice>2</nthrds_ice>
+          <nthrds_cpl>2</nthrds_cpl>
+          <nthrds_lnd>2</nthrds_lnd>
+          <nthrds_rof>2</nthrds_rof>
+          <nthrds_ocn>2</nthrds_ocn>
+          <nthrds_glc>2</nthrds_glc>
+          <nthrds_wav>2</nthrds_wav>
+        </nthrds>
+      </pes>
+    </mach>
+  </grid>
 </config_pes>