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.

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

Update modulefiles for Rocky9 on Orion #119

Merged
merged 3 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parm/*.out
parm/*.err
parm/*.log
parm/land_analysis.yaml
parm/log.rocoto_launch
parm/log.*

__pycache__
*.swp
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/build_orion_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ load(pathJoin("mapl", mapl_ver))
load(pathJoin("prod_util", prod_util_ver))
load(pathJoin("ufs-pyenv", ufs_pyenv_ver))

setenv("CFLAGS","-diag-disable=10441")
setenv("FFLAGS","-diag-disable=10441")

setenv("CC", "mpiicc")
setenv("CXX", "mpiicpc")
setenv("FC", "mpiifort")
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/wflow_orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ the MSU machine Orion
whatis([===[Loads libraries needed for running the land-DA workflow on Orion ]===])

load("contrib")
load("rocoto")
load("wget")
load("ruby/3.2.3")
load("rocoto/1.3.7")

unload("python")
load("conda")
Expand Down
2 changes: 1 addition & 1 deletion parm/land_analysis_hera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ workflow:
RES: "96"
FCSTHR: "24"
NPROCS_ANALYSIS: "6"
NPROCS_FORECAST: "6"
NPROCS_FORECAST: "7"
OBSDIR: ""
OBSDIR_SUBDIR: ""
OBS_TYPES: "GHCN"
Expand Down
2 changes: 1 addition & 1 deletion parm/land_analysis_orion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ workflow:
RES: "96"
FCSTHR: "24"
NPROCS_ANALYSIS: "6"
NPROCS_FORECAST: "6"
NPROCS_FORECAST: "7"
OBSDIR: ""
OBSDIR_SUBDIR: ""
OBS_TYPES: "GHCN"
Expand Down
9 changes: 6 additions & 3 deletions parm/launch_rocoto_wflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ PARMdir=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
source ${PARMdir}/detect_platform.sh

# Load rocoto
module purge
if [ "${MACHINE}" == "hera" ]; then
module load rocoto
elif [ "${MACHINE}" == "orion" ]; then
Expand All @@ -16,7 +17,8 @@ elif [ "${MACHINE}" == "orion" ]; then
module load stack-intel/$stack_intel_ver
module load stack-python/$stack_python_ver
module load contrib
module load rocoto
module load ruby/3.2.3
module load rocoto/1.3.7
else
echo "FATAL ERROR: modules are not loaded"
fi
Expand All @@ -26,6 +28,7 @@ WFLOW_XML_FN="land_analysis.xml"
rocoto_xml_bn=$( basename "${WFLOW_XML_FN}" ".xml" )
rocoto_database_fn="${rocoto_xml_bn}.db"
WFLOW_LOG_FN="log.rocoto_launch"
LOG_FN_ROCOTO_RUN="log.rocoto_run"

# Initialize the default status of the workflow to "IN PROGRESS".
wflow_status="IN PROGRESS"
Expand All @@ -43,8 +46,8 @@ if [ "$#" -eq 1 ] && [ "$1" == "add" ]; then
fi

cd "${PARMdir}"
rocotorun_cmd="rocotorun -w \"${WFLOW_XML_FN}\" -d \"${rocoto_database_fn}\""
eval ${rocotorun_cmd}
rocotorun_cmd="rocotorun -w \"${WFLOW_XML_FN}\" -d \"${rocoto_database_fn}\" -v 10"
eval ${rocotorun_cmd} > ${LOG_FN_ROCOTO_RUN} 2>&1

rocotostat_output=$( rocotostat -w ${WFLOW_XML_FN} -d ${rocoto_database_fn} )

Expand Down
6 changes: 3 additions & 3 deletions versions/build.ver_orion
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core"
export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core"

export bacio_ver="2.4.1"
export cmake_ver="3.23.1"
Expand All @@ -21,8 +21,8 @@ export netcdf_fortran_ver="4.6.1"
export parallelio_ver="2.5.10"
export prod_util_ver="2.1.1"
export sp_ver="2.5.0"
export stack_intel_oneapi_mpi_ver="2021.5.1"
export stack_intel_ver="2022.0.2"
export stack_intel_oneapi_mpi_ver="2021.9.0"
export stack_intel_ver="2021.9.0"
export stack_python_ver="3.10.13"
export ufs_pyenv_ver="1.0.0"
export w3emc_ver="2.10.0"
Expand Down
6 changes: 3 additions & 3 deletions versions/run.ver_orion
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core"
export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core"

export bacio_ver="2.4.1"
export cmake_ver="3.23.1"
Expand Down Expand Up @@ -28,8 +28,8 @@ export py_pyyaml_ver="6.0"
export py_scipy_ver="1.11.3"
export py_xarray_ver="2023.7.0"
export sp_ver="2.5.0"
export stack_intel_oneapi_mpi_ver="2021.5.1"
export stack_intel_ver="2022.0.2"
export stack_intel_oneapi_mpi_ver="2021.9.0"
export stack_intel_ver="2021.9.0"
export stack_python_ver="3.10.13"
export ufs_pyenv_ver="1.0.0"
export w3emc_ver="2.10.0"
Expand Down
Loading