Merge remote-tracking branch 'origin/master' into jgfouca/port_more_convect

* origin/master:
  Fix typo in CI
  Fix more tests by setting them back to 72
  Set eamxx standalone default levels back to 72
  for pm-gpu (and related machines), change the maxwalltime for debug qos to be 30min
  additional things to remove PAM submodule
  remove PAM submodule
  Remove MMF2 test from integration

Author: jgfouca

.github/workflows/eamxx-v1-testing.yml

@@ -69,14 +69,14 @@ jobs:
     strategy:
       matrix:
         test:
-          - full_name: ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.ghci-snl-cpu_gnu.eamxx-output-preset-2
+          - full_name: ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.ghci-snl-cpu_gnu.eamxx-output-preset-2--eamxx-L72
             short_name: ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.eamxx-output-preset-2
           - full_name: ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.ghci-snl-cpu_gnu.eamxx-dpxx-arm97
             short_name: ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.eamxx-dpxx-arm97
           - full_name: ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.ghci-snl-cpu_gnu.eamxx-small_kernels--eamxx-output-preset-5
             short_name: ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels--eamxx-output-preset-5
-          - full_name: REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.ghci-snl-cpu_gnu
-            short_name: REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx
+          - full_name: REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.ghci-snl-cpu_gnu.eamxx-L72
+            short_name: REP_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-L72
           - full_name: ERS.ne4pg2_ne4pg2.F2010-SCREAMv1.ghci-snl-cpu_gnu.eamxx-prod
             short_name: ERS.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-prod
       fail-fast: false

.gitmodules

@@ -70,9 +70,6 @@
 	path = components/ww3/src/WW3
 	url = [email protected]:E3SM-Project/WW3.git
 	branch = e3sm
-[submodule "components/eam/src/physics/crm/pam/external"]
-	path = components/eam/src/physics/crm/pam/external
-	url = [email protected]:E3SM-Project/PAM.git
 [submodule "components/mpas-seaice/src/icepack"]
 	path = components/mpas-seaice/src/icepack
 	url = [email protected]:E3SM-Project/Icepack.git

cime_config/machines/config_batch.xml

@@ -435,7 +435,7 @@
       <queue walltimemax="00:45:00" nodemax="1792" strict="true">preempt</queue>
       <queue walltimemax="00:45:00" nodemax="1792" strict="true">shared</queue>
       <queue walltimemax="00:45:00" nodemax="1792" strict="true">overrun</queue>
-      <queue walltimemax="00:15:00" nodemax="8" strict="true">debug</queue>
+      <queue walltimemax="00:30:00" nodemax="8" strict="true">debug</queue>
     </queues>
   </batch_system>
 
@@ -480,7 +480,7 @@
       <queue walltimemax="00:45:00" nodemax="150" strict="true">preempt</queue>
       <queue walltimemax="00:30:00" nodemax="150" strict="true">shared</queue>
       <queue walltimemax="00:30:00" nodemax="150" strict="true">overrun</queue>
-      <queue walltimemax="00:15:00" nodemax="8" strict="true">debug</queue>
+      <queue walltimemax="00:30:00" nodemax="8" strict="true">debug</queue>
     </queues>
   </batch_system>
 
@@ -525,7 +525,7 @@
       <queue walltimemax="00:45:00" nodemax="150" strict="true">preempt</queue>
       <queue walltimemax="00:30:00" nodemax="150" strict="true">shared</queue>
       <queue walltimemax="00:30:00" nodemax="150" strict="true">overrun</queue>
-      <queue walltimemax="00:15:00" nodemax="8" strict="true">debug</queue>
+      <queue walltimemax="00:30:00" nodemax="8" strict="true">debug</queue>
     </queues>
   </batch_system>
 

cime_config/tests.py

@@ -419,7 +419,6 @@
             "ERP_Ln9.ne4pg2_oQU480.WCYCL20TRNS-MMF1.allactive-mmf_fixed_subcycle",
             "ERS_Ln9.ne4pg2_ne4pg2.FRCE-MMF1.eam-cosp_nhtfrq9",
             "SMS_Ln5.ne4_ne4.FSCM-ARM97-MMF1",
-            "SMS_Ln3.ne4pg2_oQU480.F2010-MMF2",
             )
         },
 
@@ -719,7 +718,7 @@
             "e3sm_eamxx_mam4xx_lowres",
         ),
         "tests" : (
-            "ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.eamxx-L72",
+            "ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.eamxx-output-preset-2--eamxx-L72",
             "ERP_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-output-preset-4",
             "ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels--eamxx-output-preset-5",
             "ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels_p3--eamxx-output-preset-5",

components/eam/src/physics/crm/pam/external

@@ -150,7 +150,7 @@ set(DEFAULT_LIB_ONLY FALSE)
 if (SCREAM_CIME_BUILD)
   set(DEFAULT_LIB_ONLY TRUE)
 endif()
-set(DEFAULT_NUM_VERTICAL_LEV 128)
+set(DEFAULT_NUM_VERTICAL_LEV 72)
 
 find_path(NF_CONFIG_SEARCH nf-config)
 if (NF_CONFIG_SEARCH)