Skip to content

Commit 04a67f0

Browse files
natalie-perlinnatalie-perlin
authored
Use cray wrappers for compilers/mpi on Derecho (ufs-community#3097)
* UFSWM - Use cray wrappers for compilers/mpi on Derecho * UFSWM - fix job status issue for PBS scheduler on Derecho
1 parent 900ef4d commit 04a67f0

8 files changed

Lines changed: 772 additions & 766 deletions

File tree

‎modulefiles/ufs_derecho.gnu.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ loads UFS Model prerequisites for Derecho/GNU
33
]])
44

55
setenv("LMOD_TMOD_FIND_FIRST","yes")
6-
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-gcc-12.4/install/modulefiles/Core")
6+
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-gcc-12.4-zlib-1.2.13/install/modulefiles/Core")
77

88
unload("ncarcompilers")
99
stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.4.0"
@@ -23,9 +23,9 @@ load("ufs_common")
2323
nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
2424
load(pathJoin("nccmp", nccmp_ver))
2525

26-
setenv("CC", "mpicc")
27-
setenv("CXX", "mpicxx")
28-
setenv("FC", "mpif90")
26+
setenv("CC","cc")
27+
setenv("CXX","CC")
28+
setenv("FC","ftn")
2929
setenv("CMAKE_Platform", "derecho.gnu")
3030

3131
whatis("Description: UFS build environment")

‎modulefiles/ufs_derecho.intel.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ loads UFS Model prerequisites for NOAA Parallelworks/Intel
33
]])
44

55
setenv("LMOD_TMOD_FIND_FIRST","yes")
6-
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
7-
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/cray-mpich/8.1.29-3sepg3g/gcc/12.4.0")
6+
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-oneapi-zlib.1.2.13/install/modulefiles/Core")
7+
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-oneapi-zlib.1.2.13/install/modulefiles/cray-mpich/8.1.29-3sepg3g/gcc/12.4.0")
88

99
unload("ncarcompilers")
1010
stack_intel_ver=os.getenv("stack_intel_ver") or "2024.2.1"
@@ -24,9 +24,9 @@ load("ufs_common")
2424
nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
2525
load(pathJoin("nccmp", nccmp_ver))
2626

27-
setenv("CC", "mpicc")
28-
setenv("CXX", "mpicxx")
29-
setenv("FC", "mpif90")
27+
setenv("CC","cc")
28+
setenv("CXX","CC")
29+
setenv("FC","ftn")
3030
setenv("I_MPI_CC", "icx")
3131
setenv("I_MPI_CXX", "icpx")
3232
setenv("I_MPI_F90", "ifort")

‎tests/bl_date.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20260608
1+
export BL_DATE=20260615

‎tests/logs/RegressionTests_derecho.log‎

Lines changed: 396 additions & 534 deletions
Large diffs are not rendered by default.

‎tests/logs/RegressionTests_wcoss2.log‎

Lines changed: 216 additions & 216 deletions
Large diffs are not rendered by default.

‎tests/rt.conf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ RUN | cpld_decomp_gfsv17 | - noaacloud orion dere
4343
RUN | cpld_2threads_gfsv17 | + ursa gaeac6 | |
4444

4545
#SFS
46-
COMPILE | s2s_32bit_sfs | intel | -DAPP=S2S -D32BIT=ON -DHYDRO=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | - noaacloud | fv3 |
47-
RUN | cpld_control_sfs | - noaacloud | baseline |
48-
RUN | cpld_restart_sfs | - noaacloud | | cpld_control_sfs
46+
COMPILE | s2s_32bit_sfs | intel | -DAPP=S2S -D32BIT=ON -DHYDRO=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | - noaacloud derecho| fv3 |
47+
RUN | cpld_control_sfs | - noaacloud derecho | baseline |
48+
RUN | cpld_restart_sfs | - noaacloud derecho | | cpld_control_sfs
4949

5050
# DEBUG
51-
COMPILE | s2s_32bit_sfs_debug | intel | -DAPP=S2S -D32BIT=ON -DHYDRO=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DDEBUG=ON | - noaacloud | fv3 |
52-
RUN | cpld_debug_sfs | - noaacloud | baseline |
51+
COMPILE | s2s_32bit_sfs_debug | intel | -DAPP=S2S -D32BIT=ON -DHYDRO=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DDEBUG=ON | - noaacloud derecho | fv3 |
52+
RUN | cpld_debug_sfs | - noaacloud derecho | baseline |
5353

5454
COMPILE | s2sw_32bit_pdlib_debug | intel | -DAPP=S2SW -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
5555
RUN | cpld_debug_gfsv17 | - noaacloud | baseline |

‎tests/rt_utils.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ submit_and_wait() {
317317
job_info=$( qstat "${jobid}" )
318318
job_info=$( grep -v "Job has finished, use -x or -H to obtain historical job information" <<< "${job_info}")
319319
set -e
320-
if grep -q "${jobid}" <<< "${job_info}"; then
320+
if [[ ${job_info} == *"${jobid}"* && ${status_label:-} != "Unknown" ]]; then
321321
job_running=true
322322
# Getting the status letter from scheduler info
323323
status=$( grep "${jobid}" <<< "${job_info}" )

‎tests/test_changes.list‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
cpld_control_gfsv17 intel
2+
cpld_control_gfsv17_iau intel
3+
cpld_restart_gfsv17 intel
4+
cpld_restart_gfsv17_iau intel
5+
cpld_mpi_gfsv17 intel
6+
cpld_control_p8 intel
7+
cpld_control_p8.v2.sfc intel
8+
cpld_restart_p8 intel
9+
cpld_2threads_p8 intel
10+
cpld_decomp_p8 intel
11+
cpld_mpi_p8 intel
12+
cpld_control_ciceC_p8 intel
13+
cpld_control_noaero_p8_agrid intel
14+
cpld_control_c48_5deg intel
15+
cpld_warmstart_c48_5deg intel
16+
cpld_restart_c48_5deg intel
17+
cpld_control_c24_5deg intel
18+
cpld_warmstart_c24_5deg intel
19+
cpld_restart_c24_5deg intel
20+
cpld_control_c24_9deg intel
21+
cpld_warmstart_c24_9deg intel
22+
cpld_restart_c24_9deg intel
23+
cpld_control_c12_9deg intel
24+
cpld_warmstart_c12_9deg intel
25+
cpld_restart_c12_9deg intel
26+
control_CubedSphereGrid_parallel intel
27+
control_latlon intel
28+
control_wrtGauss_netcdf_parallel intel
29+
control_c192 intel
30+
control_c384 intel
31+
control_c384gdas intel
32+
control_stochy intel
33+
control_stochy_restart intel
34+
control_lndp intel
35+
control_iovr4_gfdlmpv3 intel
36+
control_p8 intel
37+
control_p8.v2.sfc intel
38+
control_p8_ugwpv1 intel
39+
control_p8_ugwpv1_tempo intel
40+
control_p8_ugwpv1_tempo_aerosol intel
41+
control_p8_ugwpv1_tempo_aerosol_hail intel
42+
control_restart_p8 intel
43+
control_noqr_p8 intel
44+
control_restart_noqr_p8 intel
45+
control_decomp_p8 intel
46+
control_2threads_p8 intel
47+
control_p8_lndp intel
48+
control_p8_rrtmgp intel
49+
control_p8_mynn intel
50+
merra2_thompson intel
51+
merra2_hf_thompson intel
52+
regional_control intel
53+
regional_restart intel
54+
regional_decomp intel
55+
regional_2dwrtdecomp intel
56+
regional_wofs intel
57+
control_p8_rrtmgp_rad32 intel
58+
rap_control intel
59+
regional_spp_sppt_shum_skeb intel
60+
rap_decomp intel
61+
rap_2threads intel
62+
rap_restart intel
63+
rap_sfcdiff intel
64+
rap_sfcdiff_decomp intel
65+
rap_sfcdiff_restart intel
66+
hrrr_control intel
67+
hrrr_control_decomp intel
68+
hrrr_control_2threads intel
69+
hrrr_control_restart intel
70+
rrfs_v1beta intel
71+
rrfs_v1nssl intel
72+
rrfs_v1nssl_nohailnoccn intel
73+
control_csawmg intel
74+
rap_unified_drag_suite_debug intel
75+
regional_spp_sppt_shum_skeb_dyn32_phy32 intel
76+
rap_control_dyn32_phy32 intel
77+
hrrr_control_dyn32_phy32 intel
78+
rap_2threads_dyn32_phy32 intel
79+
hrrr_control_2threads_dyn32_phy32 intel
80+
hrrr_control_decomp_dyn32_phy32 intel
81+
rap_restart_dyn32_phy32 intel
82+
hrrr_control_restart_dyn32_phy32 intel
83+
rap_control_dyn64_phy32 intel
84+
conus13km_debug_2threads intel
85+
hafs_regional_atm intel
86+
hafs_regional_atm_gfdlmpv3 intel
87+
hafs_global_multiple_4nests_atm intel
88+
hafs_regional_specified_moving_1nest_atm intel
89+
hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 intel
90+
hafs_regional_docn intel
91+
hafs_regional_docn_oisst intel
92+
datm_cdeps_control_cfsr intel
93+
datm_cdeps_restart_cfsr intel
94+
datm_cdeps_control_gefs intel
95+
datm_cdeps_iau_gefs intel
96+
datm_cdeps_stochy_gefs intel
97+
datm_cdeps_ciceC_cfsr intel
98+
datm_cdeps_mx025_cfsr intel
99+
datm_cdeps_mx025_gefs intel
100+
datm_cdeps_multiple_files_cfsr intel
101+
datm_cdeps_3072x1536_cfsr intel
102+
datm_cdeps_gfs intel
103+
datm_cdeps_lnd_gswp3 intel
104+
atm_ds2s_docn_pcice intel
105+
atmaero_control_p8 intel
106+
atmaero_control_p8_rad intel
107+
atmaero_control_p8_rad_micro intel
108+
cpld_regional_atm_fbh intel
109+
control_c48 gnu
110+
control_stochy gnu
111+
control_p8 gnu
112+
control_p8_ugwpv1 gnu
113+
rap_control gnu
114+
rap_decomp gnu
115+
rap_2threads gnu
116+
rap_restart gnu
117+
rap_sfcdiff gnu
118+
rap_sfcdiff_decomp gnu
119+
rap_sfcdiff_restart gnu
120+
hrrr_control gnu
121+
hrrr_control_noqr gnu
122+
hrrr_control_2threads gnu
123+
hrrr_control_decomp gnu
124+
hrrr_control_restart gnu
125+
hrrr_control_restart_noqr gnu
126+
rrfs_v1beta gnu
127+
control_csawmg gnu
128+
rap_noah_sfcdiff_cires_ugwp_debug gnu
129+
rap_control_dyn32_phy32 gnu
130+
hrrr_control_dyn32_phy32 gnu
131+
rap_2threads_dyn32_phy32 gnu
132+
hrrr_control_2threads_dyn32_phy32 gnu
133+
hrrr_control_decomp_dyn32_phy32 gnu
134+
rap_restart_dyn32_phy32 gnu
135+
hrrr_control_restart_dyn32_phy32 gnu
136+
conus13km_control gnu
137+
conus13km_2threads gnu
138+
conus13km_decomp gnu
139+
conus13km_restart gnu
140+
rap_control_dyn64_phy32 gnu
141+
cpld_control_gfsv17 gnu
142+
cpld_control_sfs gnu
143+
datm_cdeps_control_cfsr gnu
144+
control_gfs_mpas gnu

0 commit comments

Comments
 (0)