Merge branch 'jgfouca/eamxx_levs_back_to_72' into master (PR #7794)

Set eamxx standalone default levels back to 72

We were not prepared to go to 128 in standalone.

[BFB]

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

cime_config/tests.py

@@ -718,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/eamxx/CMakeLists.txt

@@ -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)