Skip to content

Commit eb82040

Browse files
jgfoucajgfouca
committed
Merge remote-tracking branch 'origin/master' into jgfouca/port_more_convect
* origin/master: (62 commits) Replaces -- with . to fix the L72 test mod for MAM4xx test EAMxx: slightly better docs for ieflx default vert levels to 128 from 72 after changing to 128 default vert levels, make changes to test names EAMxx: fix source files for physics share library EAMxx: fix homme interface warning EAMxx: build some physics/share stuff only for testing EAMxx: fix includes of physics share headers Update CIME submodule EAMxx: move common physics unit test to share/physics folder EAMxx: move physics/share to share/physics EAMxx: expose h2otemp, add water thermo fixer EAMxx: fix dependency of scream_control EAMxx: fix cyclic dep between share/io/diag libs Update OPENACC ifdefs after enddo to match beginning of loop. EAMxx: disable mvk test for now EAMxx: link io lib to the test support lib EAMxx: include test-related header with full path EAMxx: consolidate testing-support cmake targets EAMxx: declare test support lib right away ...
2 parents ea81c8e + 7a99457 commit eb82040

File tree

327 files changed

+1839
-994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

327 files changed

+1839
-994
lines changed

‎cime‎

‎cime_config/machines/config_machines.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -219,35 +219,35 @@
219219

220220
<modules compiler="gnu">
221221
<command name="load">PrgEnv-gnu/8.5.0</command>
222-
<command name="load">gcc-native/12.3</command>
223-
<command name="load">cray-libsci/23.12.5</command>
222+
<command name="load">gcc-native/13.2</command>
223+
<command name="load">cray-libsci/24.07.0</command>
224224
</modules>
225225

226226
<modules compiler="intel">
227227
<command name="load">PrgEnv-intel/8.5.0</command>
228-
<command name="load">intel/2023.2.0</command>
228+
<command name="load">intel/2024.1.0</command>
229229
</modules>
230230

231231
<modules compiler="nvidia">
232232
<command name="load">PrgEnv-nvidia</command>
233-
<command name="load">nvidia/24.5</command>
234-
<command name="load">cray-libsci/23.12.5</command>
233+
<command name="load">nvidia/25.5</command>
234+
<command name="load">cray-libsci/24.07.0</command>
235235
</modules>
236236

237237
<modules compiler="amdclang">
238238
<command name="load">PrgEnv-aocc</command>
239239
<command name="load">aocc/4.1.0</command>
240-
<command name="load">cray-libsci/23.12.5</command>
240+
<command name="load">cray-libsci/24.07.0</command>
241241
</modules>
242242

243243
<modules>
244244
<command name="load">craype-accel-host</command>
245-
<command name="load">craype/2.7.30</command>
246-
<command name="load">cray-mpich/8.1.28</command>
245+
<command name="load">craype/2.7.32</command>
246+
<command name="load">cray-mpich/8.1.30</command>
247247
<command name="load">cray-hdf5-parallel/1.12.2.9</command>
248248
<command name="load">cray-netcdf-hdf5parallel/4.9.0.9</command>
249-
<command name="load">cray-parallel-netcdf/1.12.3.9</command>
250-
<command name="load">cmake/3.24.3</command>
249+
<command name="load">cray-parallel-netcdf/1.12.3.13</command>
250+
<command name="load">cmake/3.30.2</command>
251251
</modules>
252252
</module_system>
253253

@@ -406,23 +406,23 @@
406406

407407
<modules compiler="gnu.*">
408408
<command name="load">PrgEnv-gnu/8.5.0</command>
409-
<command name="load">gcc-native/12.3</command>
409+
<command name="load">gcc-native/13.2</command>
410410
</modules>
411411

412412
<modules compiler="nvidia.*">
413413
<command name="load">PrgEnv-nvidia</command>
414-
<command name="load">nvidia/24.5</command>
414+
<command name="load">nvidia/25.5</command>
415415
</modules>
416416

417417
<modules compiler="gnugpu">
418-
<command name="load">cudatoolkit/12.4</command>
418+
<command name="load">cudatoolkit/12.9</command>
419419
<command name="load">craype-accel-nvidia80</command>
420420
</modules>
421421

422422
<modules compiler="nvidiagpu">
423-
<command name="load">cudatoolkit/12.4</command>
423+
<command name="load">cudatoolkit/12.9</command>
424424
<command name="load">craype-accel-nvidia80</command>
425-
<command name="load">gcc-native-mixed/12.3</command>
425+
<command name="load">gcc-native-mixed/13.2</command>
426426
</modules>
427427

428428
<modules compiler="gnu">
@@ -434,13 +434,13 @@
434434
</modules>
435435

436436
<modules>
437-
<command name="load">cray-libsci/23.12.5</command>
438-
<command name="load">craype/2.7.30</command>
439-
<command name="load">cray-mpich/8.1.28</command>
440-
<command name="load">cray-hdf5-parallel/1.12.2.9</command>
441-
<command name="load">cray-netcdf-hdf5parallel/4.9.0.9</command>
442-
<command name="load">cray-parallel-netcdf/1.12.3.9</command>
443-
<command name="load">cmake/3.24.3</command>
437+
<command name="load">cray-libsci/24.07.0</command>
438+
<command name="load">craype/2.7.32</command>
439+
<command name="load">cray-mpich/8.1.30</command>
440+
<command name="load">cray-hdf5-parallel/1.14.3.1</command>
441+
<command name="load">cray-netcdf-hdf5parallel/4.9.0.13</command>
442+
<command name="load">cray-parallel-netcdf/1.12.3.13</command>
443+
<command name="load">cmake/3.30.2</command>
444444
</modules>
445445
</module_system>
446446

‎cime_config/tests.py‎

Lines changed: 29 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -285,20 +285,6 @@
285285
)
286286
},
287287

288-
# experimental eamxx nbfb tests (elr: ne4, lr: ne30)
289-
"eamxx_nbfb_ulr": {
290-
"tests": (
291-
"MVKxx_Ly1.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-mvkpert",
292-
)
293-
},
294-
"eamxx_nbfb_lr": {
295-
"tests": (
296-
"MVKxx_Ly1.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-mvkpert",
297-
)
298-
},
299-
"eamxx_nbfb": {
300-
"inherit": ("eamxx_nbfb_ulr", "eamxx_nbfb_lr"),
301-
},
302288

303289
#ocean non bit-for-bit test
304290
"e3sm_ocn_nbfb": {
@@ -308,7 +294,7 @@
308294
},
309295

310296
"e3sm_nbfb": {
311-
"inherit": ("e3sm_atm_nbfb", "e3sm_ocn_nbfb", "eamxx_nbfb_lr")
297+
"inherit": ("e3sm_atm_nbfb", "e3sm_ocn_nbfb")
312298
},
313299

314300
"e3sm_ocnice_stealth_features" : {
@@ -527,6 +513,7 @@
527513
"ERS_Ld60.f45_g37.IELMFATES.elm-fates_cold_st3",
528514
"ERS_Ld60.f45_g37.IELMFATES.elm-fates_cold_pphys",
529515
"SMS_D_Ld15.f45_g37.IELMFATES.elm-fates_cold_twostream",
516+
"ERS_Ld60.f45_g37.IELMFATES.elm-fates_cold_managedfire"
530517
)
531518
},
532519

@@ -730,10 +717,9 @@
730717
"time" : "01:00:00",
731718
"inherit" : (
732719
"e3sm_eamxx_mam4xx_lowres",
733-
"eamxx_nbfb_ulr",
734720
),
735721
"tests" : (
736-
"ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.eamxx-output-preset-2",
722+
"ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.eamxx-L72",
737723
"ERP_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-output-preset-4",
738724
"ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels--eamxx-output-preset-5",
739725
"ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.eamxx-small_kernels_p3--eamxx-output-preset-5",
@@ -770,15 +756,12 @@
770756

771757
"e3sm_eamxx_v1_medres" : {
772758
"time" : "02:00:00",
773-
"inherit" : (
774-
"eamxx_nbfb_lr",
775-
),
776759
"tests" : (
777760
# "SMS_D_Ln2.ne30_ne30.F2000-SCREAMv1-AQP1", # Uncomment once IC file for ne30 is ready
778761
"ERS_Ln22.ne30_ne30.F2010-SCREAMv1.eamxx-internal_diagnostics_level--eamxx-output-preset-3",
779762
"PEM_Ln90.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-spa_remap--eamxx-output-preset-4",
780763
"ERS_Ln90.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-small_kernels--eamxx-output-preset-5",
781-
"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",
782765
"ERS_Ln22.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-L128--eamxx-output-preset-4",
783766
"REP_Ld5.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-L128--eamxx-output-preset-6",
784767
"SMS.ne30pg2_EC30to60E2r2.WCYCLXX2010",
@@ -814,7 +797,6 @@
814797
"e3sm_eamxx_v1_long" : {
815798
"time" : "01:00:00",
816799
"inherit" : (
817-
"eamxx_nbfb_lr",
818800
),
819801
"tests" : (
820802
"ERP_D_Lh182.ne4pg2_ne4pg2.F2010-SCREAMv1",
@@ -834,42 +816,42 @@
834816
"e3sm_eamxx_mam4xx_lowres" : {
835817
"time" : "01:00:00",
836818
"tests" : (
837-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics",
838-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci",
839-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav",
840-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep",
841-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics",
842-
"REP_Ln5.ne30pg2_oECv3.F2010-EAMxx-MAM4xx.eamxx-mam4xx-remap_emiss_ne4_ne30",
843-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-compute_mam4xx_diags",
844-
"REP_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx",
845-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics",
846-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci",
847-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav",
848-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep",
849-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics",
850-
"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"
851833
)
852834
},
853835

854836
"e3sm_eamxx_mam4xx_lowres_debug" : {
855837
"time" : "01:00:00",
856838
"tests" : (
857-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-optics",
858-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aci",
859-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-wetscav",
860-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-drydep",
861-
"SMS_D_Ln5.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-mam4xx-aero_microphysics",
862-
"SMS_D_Ln5.ne30pg2_oECv3.F2010-EAMxx-MAM4xx.eamxx-mam4xx-remap_emiss_ne4_ne30",
863-
"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"
864846
)
865847
},
866848

867849
"e3sm_eamxx_mam4xx_long_runtime" : {
868850
"time" : "03:00:00",
869851
"tests" : (
870-
"SMS_D_Lm2.ne4pg2_oQU480.F2010-EAMxx-MAM4xx-MPASSI",
871-
"ERS_Ld80.ne4pg2_oQU480.F2010-EAMxx-MAM4xx-MPASSI",
872-
"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"
873855
)
874856
},
875857

@@ -973,7 +955,7 @@
973955
"tests" : (
974956
"SMS_Ln9.ne4pg2_ne4pg2.F2010-MMF1",
975957
"ERP_Ln9.ne4pg2_ne4pg2.F2010-SCREAMv1",
976-
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx",
958+
"ERS.ne4pg2_oQU480.F2010-EAMxx-MAM4xx.eamxx-L72",
977959
"ERS.ne30pg2_ne30pg2.F2010-SCREAMv1.eamxx-prod",
978960
)
979961
},

‎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/SystemTests/mvkxx.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,15 @@ def __init__(self, case, **kwargs):
158158
else:
159159
self.component = "cam"
160160

161-
if (
162-
self._case.get_value("RESUBMIT") == 0
163-
and self._case.get_value("GENERATE_BASELINE") is False
164-
):
165-
self._case.set_value("COMPARE_BASELINE", True)
166-
else:
167-
self._case.set_value("COMPARE_BASELINE", False)
161+
# Typically, we always want to compare baseline for this test.
162+
# but for now, let's turn this OFF until we sort out any issues
163+
# if (
164+
# self._case.get_value("RESUBMIT") == 0
165+
# and self._case.get_value("GENERATE_BASELINE") is False
166+
# ):
167+
# self._case.set_value("COMPARE_BASELINE", True)
168+
# else:
169+
# self._case.set_value("COMPARE_BASELINE", False)
168170

169171
def build_phase(self, sharedlib_only=False, model_only=False):
170172
# Only want this to happen once. It will impact the sharedlib build

‎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>

‎components/eamxx/cime_config/namelist_defaults_eamxx.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ be lost if SCREAM_HACK_XML is not enabled.
191191
in-fields. <= 0 disables hashing. -->
192192
<enable_column_conservation_checks>false</enable_column_conservation_checks>
193193
<enable_energy_fixer type="logical" doc="Turn on energy fixer for dycore (fixes dycore, pressure adjustment, PD coupling)">true</enable_energy_fixer>
194+
<enable_air_sea_surface_water_thermo_fixer type="logical" doc="Turn on energy fixer for inconsistent internal energy due to mismatch with ocean water thermodynamics, works by adding to energy fixer above">true</enable_air_sea_surface_water_thermo_fixer>
194195
<!-- true means 2 more calls to AllReduce after dycore -->
195196
<enable_energy_fixer_debug_info type="logical" doc="Prints debug info that energy fixer indeed fixed energy (cost of an MPI reduce)">false</enable_energy_fixer_debug_info>
196197
<bfb_hash type="integer">18</bfb_hash>

‎components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/mvkpert/shell_commands‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ cime_root=$(./xmlquery --value CIMEROOT)
44
input_data_dir=$(./xmlquery --value DIN_LOC_ROOT)
55
atmchange=$cime_root/../components/eamxx/scripts/atmchange
66
case_name=$(./xmlquery --value CASE)
7+
machine=$(./xmlquery --value MACH)
8+
9+
# on frontier, set proxy settings
10+
if [[ $machine == "frontier" ]]; then
11+
export all_proxy=socks://proxy.ccs.ornl.gov:3128/
12+
export ftp_proxy=ftp://proxy.ccs.ornl.gov:3128/
13+
export http_proxy=http://proxy.ccs.ornl.gov:3128/
14+
export https_proxy=http://proxy.ccs.ornl.gov:3128/
15+
export no_proxy='localhost,127.0.0.0/8,*.ccs.ornl.gov'
16+
fi
717

818
# Change run length
919
./xmlchange RUN_STARTDATE="1995-01-01"

‎components/eamxx/cmake/ScreamUtils.cmake‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,8 @@ list(REMOVE_ITEM SCREAM_CUT_EXEC_OPTIONS USER_DEFINED_TEST_SESSION)
8787
function(CreateUnitTestExec exec_name test_srcs)
8888
###############################################################################
8989
# Call Ekat function, with a couple of extra params
90-
# NTOE: this if statement will disappear, as soon as the share folder reorg
91-
# is completed, and we get rid of cyclic dep between share and io
92-
# Then, we will ask unit test to REALLY link against all they need
93-
if (TARGET scream_test_support)
94-
EkatCreateUnitTestExec("${exec_name}" "${test_srcs}" ${ARGN}
95-
USER_DEFINED_TEST_SESSION LIBS scream_share eamxx_test_session scream_test_support)
96-
else()
97-
EkatCreateUnitTestExec("${exec_name}" "${test_srcs}" ${ARGN}
98-
USER_DEFINED_TEST_SESSION LIBS eamxx_test_session)
99-
endif()
90+
EkatCreateUnitTestExec("${exec_name}" "${test_srcs}" ${ARGN}
91+
USER_DEFINED_TEST_SESSION LIBS eamxx_test_support)
10092
endfunction(CreateUnitTestExec)
10193

10294
###############################################################################

‎components/eamxx/src/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
if (NOT SCREAM_LIB_ONLY)
2+
# Create test_support lib. Subfolders will add sources as we scan them
3+
add_library(eamxx_test_support)
4+
target_include_directories (eamxx_test_support PUBLIC ${EKAT_SOURCE_DIR}/extern/Catch2/single_include)
5+
endif()
6+
17
add_subdirectory(share)
28

39
add_subdirectory(dynamics)

0 commit comments

Comments
 (0)