Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gaea machine name #14

Merged
merged 19 commits into from
Jan 25, 2024
Merged

Gaea machine name #14

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
bf6975a
Update rt.sh
zach1221 Jan 24, 2024
205ab66
Update rt.sh
zach1221 Jan 24, 2024
eefd6cb
Rename ufs_gaea-c5.intel.lua to ufs_gaea.intel.lua
zach1221 Jan 24, 2024
ef9be14
Update compile.sh Machine name change
zach1221 Jan 24, 2024
7a2a230
Update default_vars.sh Gaea Machine name change
zach1221 Jan 24, 2024
883531a
Rename compile_slurm.IN_gaea-c5 to compile_slurm.IN_gaea
zach1221 Jan 24, 2024
5ddf7e6
Rename fv3_slurm.IN_gaea-c5 to fv3_slurm.IN_gaea
zach1221 Jan 24, 2024
9904511
Update module-setup.sh
zach1221 Jan 24, 2024
9f48137
Update run_test.sh
zach1221 Jan 24, 2024
c1ead3f
Update ufs_gaea.intel.lua
zach1221 Jan 25, 2024
e79c847
Update ufs_noaacloud.intel.lua
zach1221 Jan 25, 2024
cbcabba
Update module-setup.sh
zach1221 Jan 25, 2024
ed87006
Update rt.sh
zach1221 Jan 25, 2024
dabe8c0
Update compile.sh
zach1221 Jan 25, 2024
be90157
Update rt.sh
zach1221 Jan 25, 2024
e0a31d0
Update rt.sh adding back crap-mpich module
zach1221 Jan 25, 2024
dc5966e
Update rt.sh revert a name change
zach1221 Jan 25, 2024
cf0c1bb
Rename ufs_gaea.intel.lua to ufs_gaea-c5.intel.lua
zach1221 Jan 25, 2024
42c97c9
Merge branch 'feature/update_gaea' into Gaea_Machine-name
zach1221 Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modulefiles/ufs_gaea-c5.intel.lua → modulefiles/ufs_gaea.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ load("intel-classic/2023.1.0")
load("cray-mpich/8.1.25")
load("python/3.9.12")

prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles")
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/modulefiles")

stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_noaacloud.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ loads UFS Model prerequisites for NOAA Parallelworks/Intel
]])


prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
4 changes: 2 additions & 2 deletions tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ if [[ $MACHINE_ID == macosx ]] || [[ $MACHINE_ID == linux ]]; then
source $PATHTR/modulefiles/ufs_${MACHINE_ID}.${RT_COMPILER}
else
# Activate lua environment for gaea c5
if [[ $MACHINE_ID == gaea-c5 ]]; then
source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
if [[ $MACHINE_ID == gaea ]]; then
module reset
fi
# Load fv3 module
module use $PATHTR/modulefiles
Expand Down
2 changes: 1 addition & 1 deletion tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ elif [[ $MACHINE_ID = s4 ]]; then
ICE_tasks_cpl_bmrk=48
WAV_tasks_cpl_bmrk=80

elif [[ $MACHINE_ID = gaea-c5 ]]; then
elif [[ $MACHINE_ID = gaea ]]; then

TPN=128

Expand Down
0 tests/fv3_conf/compile_slurm.IN_gaea-c5 → tests/fv3_conf/compile_slurm.IN_gaea
View file
Open in desktop
File renamed without changes.
0 tests/fv3_conf/fv3_slurm.IN_gaea-c5 → tests/fv3_conf/fv3_slurm.IN_gaea
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions tests/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ elif [[ $MACHINE_ID = stampede ]] ; then
fi
module purge

elif [[ $MACHINE_ID = gaea-c5 ]] ; then
# We are on GAEA C5
elif [[ $MACHINE_ID = gaea ]] ; then
# We are on GAEA
if ( ! eval module help > /dev/null 2>&1 ) ; then
# We cannot simply load the module command. The GAEA
# /etc/profile modifies a number of module-related variables
Expand All @@ -75,7 +75,7 @@ elif [[ $MACHINE_ID = gaea-c5 ]] ; then
# /etc/profile here.
source /etc/profile
fi
source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
module reset

elif [[ $MACHINE_ID = expanse ]]; then
# We are on SDSC Expanse
Expand Down
19 changes: 9 additions & 10 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,30 +304,29 @@ elif [[ $MACHINE_ID = acorn ]]; then
PTMP=/lfs/h2/emc/ptmp
SCHEDULER=pbs

elif [[ $MACHINE_ID = gaea-c5 ]]; then
elif [[ $MACHINE_ID = gaea ]]; then

module use /lustre/f2/dev/role.epic/contrib/C5/rocoto/modulefiles
module use /ncrc/proj/epic/rocoto/modulefiles
module load rocoto
ROCOTORUN=$(which rocotorun)
ROCOTOSTAT=$(which rocotostat)
ROCOTOCOMPLETE=$(which rocotocomplete)
ROCOTO_SCHEDULER=slurm


module load PrgEnv-intel/8.3.3
module load intel-classic/2023.1.0
module load cray-mpich/8.1.25
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please add module load cray-mpich/8.1.25 back?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ulmononian ok module added back.

module use /ncrc/proj/epic/spack-stack/modulefiles
module load python/3.9.12
module use /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles
module load ecflow/5.8.4
ECFLOW_START=/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/ecflow-5.8.4/bin/ecflow_start.sh
ECFLOW_START=/ncrc/proj/epic/spack-stack/ecflow-5.8.4/bin/ecflow_start.sh
ECF_PORT=$(( $(id -u) + 1500 ))

DISKNM=/lustre/f2/pdata/ncep/role.epic/C5/RT
DISKNM=/gpfs/f5/epic/world-shared/lustre/epic/UFS-WM_RT
QUEUE=normal
COMPILE_QUEUE=normal
PARTITION=c5
STMP=/lustre/f2/scratch
PTMP=/lustre/f2/scratch
STMP=/gpfs/f5/epic/scratch
PTMP=/gpfs/f5/epic/scratch

SCHEDULER=slurm

Expand Down Expand Up @@ -657,7 +656,7 @@ if [[ $ROCOTO == true ]]; then
QUEUE=main
COMPILE_QUEUE=main
ROCOTO_SCHEDULER=pbspro
elif [[ $MACHINE_ID = gaea-c5 ]]; then
elif [[ $MACHINE_ID = gaea ]]; then
QUEUE=normal
COMPILE_QUEUE=normal
ROCOTO_SCHEDULER=slurm
Expand Down
4 changes: 2 additions & 2 deletions tests/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ cp ${PATHTR}/modulefiles/ufs_common* ./modulefiles/.
cp ${PATHRT}/module-setup.sh module-setup.sh

# load nccmp module
if [[ " s4 hera orion hercules gaea-c5 jet derecho acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
if [[ " s4 hera orion hercules gaea jet derecho acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
if [[ " wcoss2 acorn " =~ " ${MACHINE_ID} " ]] ; then
module load intel/19.1.3.304 netcdf/4.7.4
module load nccmp
Expand All @@ -106,7 +106,7 @@ if [[ " s4 hera orion hercules gaea-c5 jet derecho acorn wcoss2 " =~ " $MACHINE_
module load stack-intel/2021.5.0 stack-intel-oneapi-mpi/2021.5.0
module load miniconda/3.9.12
module load nccmp/1.9.0.1
elif [[ " hera orion hercules gaea-c5 jet " =~ " ${MACHINE_ID} " ]] ; then
elif [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then
module use modulefiles
module load modules.fv3
else
Expand Down