Skip to content

Commit c1a3007

Browse files
Natalie PerlinNatalie Perlin
authored andcommitted
Derecho: updated spack-stack, job_card, RT tests configurations
1 parent 8056a36 commit c1a3007

9 files changed

+17
-14
lines changed

modulefiles/ufs_derecho.intel.lua

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

55
setenv("LMOD_TMOD_FIND_FIRST","yes")
6-
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
7-
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
8-
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-4natrhl/gcc/12.2.0")
6+
prepend_path("MODULEPATH", "/glade/derecho/scratch/nperlin/spack-stack-R1.9.0/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
7+
prepend_path("MODULEPATH", "/glade/derecho/scratch/nperlin/spack-stack-R1.9.0/envs/ue-oneapi-2024.2.1/install/modulefiles/cray-mpich/8.1.29-56ro2ht/gcc/12.4.0")
98

10-
unload("ncarcompilers")
9+
-- unload("ncarcompilers")
10+
prepend_path("MODULEPATH", "/glade/derecho/scratch/nperlin/UFS-WM/ufs-weather-model/modulefiles/stack")
1111
stack_intel_ver=os.getenv("stack_intel_ver") or "2024.2.1"
1212
load(pathJoin("stack-oneapi", stack_intel_ver))
1313

@@ -21,6 +21,7 @@ stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
2121
load(pathJoin("stack-python", stack_python_ver))
2222

2323
setenv("CMAKE_Platform", "derecho.intel")
24+
2425
load("ufs-weather-model-env")
2526
load("sp/2.5.0")
2627
load("crtm/2.4.0.1")

tests/fv3_conf/fv3_qsub.IN_derecho

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#PBS -N @[JBNME]
55
#PBS -A @[ACCNR]
66
#PBS -q @[QUEUE]
7-
#PBS -l select=@[NODES]:ncpus=@[TPN]:mpiprocs=@[TPN]:ompthreads=@[THRD]
7+
#PBS -l select=@[NODES]:ncpus=@[TPN]:ompthreads=@[THRD]
88
#PBS -l walltime=00:@[WLCLK]:00
99

1010
set -eux
@@ -30,6 +30,10 @@ export OMP_NUM_THREADS=@[THRD]
3030
export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
3131
export ESMF_RUNTIME_PROFILE=ON
3232
export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
33+
export I_MPI_EXTRA_FILESYSTEM="ON"
34+
35+
export FI_CXI_RX_MATCH_MODE=hybrid
36+
export FI_MR_HMEM=0
3337

3438
# Avoid job errors because of filesystem synchronization delays
3539
sync && sleep 1
@@ -41,7 +45,7 @@ if [ "${JOB_SHOULD_FAIL:-NO}" = WHEN_RUNNING ] ; then
4145
false
4246
fi
4347

44-
mpiexec -n @[TASKS] -ppn @[TPN] -depth @[THRD] ./fv3.exe
48+
mpiexec -n @[UFS_TASKS] -depth @[THRD] ./fv3.exe
4549

4650
echo "Model ended: " `date`
4751
echo -n " $( date +%s )," >> job_timestamp.txt

tests/tests/cpld_control_c192_p8

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,6 @@ export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"
140140

141141
export FV3_RUN=cpld_control_run.IN
142142

143-
if [[ $MACHINE_ID = derecho ]]; then
144-
TPN=96
145-
fi
146143
if [[ $MACHINE_ID = gaeac6 ]]; then
147144
TPN=144
148145
fi

tests/tests/cpld_control_ciceC_p8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,6 @@ export N_SPLIT=5
9494
export DO_GWD_OPT_PSL=.true.
9595
export DO_GSL_DRAG_SS=.false.
9696

97-
if [[ $MACHINE_ID = gaeac6 ]] || [[ $MACHINE_ID = derecho ]]; then
97+
if [[ $MACHINE_ID = gaeac6 ]]; then
9898
TPN=96
9999
fi

tests/tests/cpld_control_p8.v2.sfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export eps_imesh=2.5e-1
8787
export FV3_RUN=cpld_control_run.IN
8888
export V2_SFC_FILE=true
8989

90-
if [[ $MACHINE_ID = derecho ]] || [[ $MACHINE_ID = gaeac6 ]]; then
90+
if [[ $MACHINE_ID = gaeac6 ]]; then
9191
TPN=96
9292
fi
9393

tests/tests/cpld_decomp_p8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export eps_imesh=2.5e-1
8787

8888
export FV3_RUN=cpld_control_run.IN
8989

90-
if [[ $MACHINE_ID = derecho ]] || [[ $MACHINE_ID = gaeac6 ]]; then
90+
if [[ $MACHINE_ID = gaeac6 ]]; then
9191
TPN=96
9292
fi
9393

tests/tests/cpld_mpi_p8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export eps_imesh=2.5e-1
8787

8888
export FV3_RUN=cpld_control_run.IN
8989

90-
if [[ $MACHINE_ID = derecho ]] || [[ $MACHINE_ID = gaeac6 ]]; then
90+
if [[ $MACHINE_ID = gaeac6 ]]; then
9191
TPN=96
9292
fi
9393

tests/tests/cpld_restart_p8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
9393

9494
export FV3_RUN=cpld_control_run.IN
9595

96-
if [[ $MACHINE_ID = derecho ]] || [[ $MACHINE_ID = gaeac6 ]]; then
96+
if [[ $MACHINE_ID = gaeac6 ]]; then
9797
TPN=96
9898
fi
9999

tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,4 @@ export INPUT_NEST02_NML=input_nest_hafs.nml.IN
143143
export MODEL_CONFIGURE=model_configure_hafs.IN
144144
export UFS_CONFIGURE=ufs.configure.hafs_atm_ocn_wav.IN
145145
export FV3_RUN="hafs_fv3_run.IN hycom_hat10_run.IN hafs_ww3_run.IN"
146+

0 commit comments

Comments
 (0)