Skip to content

Update Orion stack location for the new role-epic account #15

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

Merged
RussTreadon-NOAA merged 3 commits into from
Aug 1, 2023
Merged

Update Orion stack location for the new role-epic account #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ac2e26
corrections to module-setup.sh
Jul 31, 2023
2465cc7
update to Orion software stack in a new role-epic location
Jul 31, 2023
67b87f4
updated regression/regression_param.sh srun command for Orion
Jul 31, 2023
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/gsi_orion.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
help([[
]])

prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/contrib/orion/miniconda3/modulefiles")
miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
load(pathJoin("miniconda3", miniconda3_ver))

prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/contrib/orion/hpc-stack/intel-2022.1.2/modulefiles/stack")

local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
local hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1.2"
Expand Down
2 changes: 1 addition & 1 deletion regression/regression_param.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ if [[ "$machine" = "Hera" ]]; then
export APRUN="srun"
elif [[ "$machine" = "Orion" ]]; then
export OMP_STACKSIZE=2048M
export APRUN="srun --label -n \$ntasks"
export APRUN="srun -n \$ntasks"
elif [[ "$machine" = "Jet" ]]; then
export OMP_STACKSIZE=1024M
export MPI_BUFS_PER_PROC=256
Expand Down
3 changes: 1 addition & 2 deletions ush/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ elif [[ $MACHINE_ID = hera* ]] ; then
elif [[ $MACHINE_ID = orion* ]] ; then
# We are on Orion
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/init/bash
source /apps/lmod/lmod/init/bash
fi
module purge

Expand Down Expand Up @@ -58,7 +58,6 @@ elif [[ $MACHINE_ID = gaea* ]] ; then
source /etc/profile
__ms_source_etc_profile=yes
fi
source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh

source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh

Expand Down