Skip to content

Commit 7a99457

Browse files
ndkeenndkeen
authored
Merge branch E3SM-Project/ndk/eamxx/default-vertical-levels-128b (PR #7777)
For eamxx, change default number of vertical levels to 128 for ne4/ne30/ne128
2 parents d787db7 + 8cea8c9 commit 7a99457

File tree

3 files changed

+32
-35
lines changed

3 files changed

+32
-35
lines changed

‎cime_config/tests.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@
719719
"e3sm_eamxx_mam4xx_lowres",
720720
),
721721
"tests" : (
722-
"ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.eamxx-output-preset-2",
722+
"ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.eamxx-L72",
723723
"ERP_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-output-preset-4",
724724
"ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels--eamxx-output-preset-5",
725725
"ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels_p3--eamxx-output-preset-5",
@@ -761,7 +761,7 @@
761761
"ERS_Ln22.ne30_ne30.F2010-SCREAMv1.eamxx-internal_diagnostics_level--eamxx-output-preset-3",
762762
"PEM_Ln90.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-spa_remap--eamxx-output-preset-4",
763763
"ERS_Ln90.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-small_kernels--eamxx-output-preset-5",
764-
"ERP_Ln22.conusx4v1pg2_r05_oECv3.F2010-SCREAMv1-noAero.eamxx-bfbhash--eamxx-output-preset-6",
764+
"ERP_Ln22.conusx4v1pg2_r05_oECv3.F2010-SCREAMv1-noAero.eamxx-bfbhash--eamxx-L72",
765765
"ERS_Ln22.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-L128--eamxx-output-preset-4",
766766
"REP_Ld5.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-L128--eamxx-output-preset-6",
767767
"SMS.ne30pg2_EC30to60E2r2.WCYCLXX2010",
@@ -816,42 +816,42 @@
816816
"e3sm_eamxx_mam4xx_lowres" : {
817817
"time" : "01:00:00",
818818
"tests" : (
819-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics",
820-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci",
821-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav",
822-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep",
823-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics",
824-
"REP_Ln5.ne30pg2_oECv3.F2010-EAMxx-MAM4xx.eamxx-mam4xx-remap_emiss_ne4_ne30",
825-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-compute_mam4xx_diags",
826-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx",
827-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics",
828-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci",
829-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav",
830-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep",
831-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics",
832-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx"
819+
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics--eamxx-L72",
820+
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci--eamxx-L72",
821+
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav--eamxx-L72",
822+
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep--eamxx-L72",
823+
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics--eamxx-L72",
824+
"REP_Ln5.ne30pg2_oECv3.F2010-EAMxx-MAM4xx.eamxx-mam4xx-remap_emiss_ne4_ne30--eamxx-L72",
825+
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-compute_mam4xx_diags--eamxx-L72",
826+
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-L72",
827+
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics--eamxx-L72",
828+
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci--eamxx-L72",
829+
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav--eamxx-L72",
830+
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep--eamxx-L72",
831+
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics--eamxx-L72",
832+
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-L72"
833833
)
834834
},
835835

836836
"e3sm_eamxx_mam4xx_lowres_debug" : {
837837
"time" : "01:00:00",
838838
"tests" : (
839-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics",
840-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci",
841-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav",
842-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep",
843-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics",
844-
"SMS_D_Ln5.ne30pg2_oECv3.F2010-EAMxx-MAM4xx.eamxx-mam4xx-remap_emiss_ne4_ne30",
845-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx"
839+
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics--eamxx-L72",
840+
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci--eamxx-L72",
841+
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav--eamxx-L72",
842+
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep--eamxx-L72",
843+
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics--eamxx-L72",
844+
"SMS_D_Ln5.ne30pg2_oECv3.F2010-EAMxx-MAM4xx.eamxx-mam4xx-remap_emiss_ne4_ne30--eamxx-L72",
845+
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-L72"
846846
)
847847
},
848848

849849
"e3sm_eamxx_mam4xx_long_runtime" : {
850850
"time" : "03:00:00",
851851
"tests" : (
852-
"SMS_D_Lm2.ne4pg2_oQU480.F2010-EAMxx-MAM4xx-MPASSI",
853-
"ERS_Ld80.ne4pg2_oQU480.F2010-EAMxx-MAM4xx-MPASSI",
854-
"SMS_Ly1.ne4pg2_oQU480.F2010-EAMxx-MAM4xx-MPASSI"
852+
"SMS_D_Lm2.ne4pg2_oQU480.F2010-EAMxx-MAM4xx-MPASSI.eamxx-L72",
853+
"ERS_Ld80.ne4pg2_oQU480.F2010-EAMxx-MAM4xx-MPASSI.eamxx-L72",
854+
"SMS_Ly1.ne4pg2_oQU480.F2010-EAMxx-MAM4xx-MPASSI.eamxx-L72"
855855
)
856856
},
857857

@@ -955,7 +955,7 @@
955955
"tests" : (
956956
"SMS_Ln9.ne4pg2_ne4pg2.F2010-MMF1",
957957
"ERP_Ln9.ne4pg2_ne4pg2.F2010-SCREAMv1",
958-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx",
958+
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-L72",
959959
"ERS.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-prod",
960960
)
961961
},

‎components/eamxx/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ set(DEFAULT_LIB_ONLY FALSE)
150150
if (SCREAM_CIME_BUILD)
151151
set(DEFAULT_LIB_ONLY TRUE)
152152
endif()
153-
set(DEFAULT_NUM_VERTICAL_LEV 72)
153+
set(DEFAULT_NUM_VERTICAL_LEV 128)
154154

155155
find_path(NF_CONFIG_SEARCH nf-config)
156156
if (NF_CONFIG_SEARCH)

‎components/eamxx/cime_config/config_component.xml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,10 @@
2727
<valid_values></valid_values>
2828
<default_value></default_value>
2929
<values match='last'>
30-
<value compset="_SCREAM">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 72 SCREAM_NUM_TRACERS 10</value>
31-
<value compset="_SCREAM%ZM">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 72 SCREAM_NUM_TRACERS 10</value>
32-
<value compset="_SCREAM" grid="ne256.*|ne512.*|ne1024.*">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 128 SCREAM_NUM_TRACERS 10</value>
33-
<value compset="_SCREAM%MAM4xx">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 72 SCREAM_NUM_TRACERS 41</value>
34-
<value compset="_SCREAM%MAM4xx" grid="ne256.*|ne512.*|ne1024.*">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 128 SCREAM_NUM_TRACERS 41</value>
35-
<value compset="_EAMXX">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 72 SCREAM_NUM_TRACERS 10</value>
36-
<value compset="_EAMXX" grid="ne256.*|ne512.*|ne1024.*">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 128 SCREAM_NUM_TRACERS 10</value>
30+
<value compset="_SCREAM">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 128 SCREAM_NUM_TRACERS 10</value>
31+
<value compset="_SCREAM%ZM">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 128 SCREAM_NUM_TRACERS 10</value>
32+
<value compset="_SCREAM%MAM4xx">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 128 SCREAM_NUM_TRACERS 41</value>
33+
<value compset="_EAMXX">SCREAM_NP 4 SCREAM_NUM_VERTICAL_LEV 128 SCREAM_NUM_TRACERS 10</value>
3734
</values>
3835
<group>build_component_scream</group>
3936
<file>env_build.xml</file>

0 commit comments

Comments
 (0)