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

Update module loads to intel/2022 for jobs running gsi.x and enkf.x #1882

Merged
merged 12 commits into from
Sep 29, 2023
Merged

Update module loads to intel/2022 for jobs running gsi.x and enkf.x #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2a1603b
add scripting to load gsi_enkf modules in anal.sh, eobs.sh, and eupd.…
RussTreadon-NOAA Sep 19, 2023
4f25f86
refactor module loads in anal.sh, eobs.sh, and eupd.sh to account for…
RussTreadon-NOAA Sep 20, 2023
c3982ef
Merge branch 'NOAA-EMC:develop' into feature/intel2022_updates
RussTreadon-NOAA Sep 21, 2023
c5606ec
Merge branch 'NOAA-EMC:develop' into feature/intel2022_updates
RussTreadon-NOAA Sep 25, 2023
2d4d020
fix indentation innrocoto jobs (#1863)
RussTreadon-NOAA Sep 25, 2023
a86b95a
update GSI hash to bring in intel/2022 bug fixes and safeguards (#1863)
RussTreadon-NOAA Sep 26, 2023
84f3825
add workflow to PYTHONPATH on Orion (#1863)
RussTreadon-NOAA Sep 26, 2023
d37d3d2
replace PYTHONPATH for Orion with regional_workflow (#1863)
RussTreadon-NOAA Sep 26, 2023
a1cabe0
Merge branch 'NOAA-EMC:develop' into feature/intel2022_updates
RussTreadon-NOAA Sep 27, 2023
95b705f
replace regional_workflow with regional_workflow_cmaq (#1863)
RussTreadon-NOAA Sep 28, 2023
33846f5
replace set -u with set_strict (#1863)
RussTreadon-NOAA Sep 29, 2023
b00f0a7
Merge branch 'NOAA-EMC:develop' into feature/intel2022_updates
RussTreadon-NOAA Sep 29, 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
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protocol = git
required = True

[GSI-EnKF]
hash = accb07e
hash = ca19008
local_path = sorc/gsi_enkf.fd
repo_url = https://github.com/NOAA-EMC/GSI.git
protocol = git
Expand Down
40 changes: 37 additions & 3 deletions jobs/rocoto/anal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,43 @@ source "${HOMEgfs}/ush/preamble.sh"

###############################################################
# Source FV3GFS workflow modules
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit ${status}
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
#status=$?
#[[ ${status} -ne 0 ]] && exit ${status}

# TODO: clean this up
#Source appropriate modulefiles based on machine

source "${HOMEgfs}/ush/detect_machine.sh"
if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
# Source FV3GFS workflow modules
. "${HOMEgfs}"/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit "${status}"
else
# Append compiler (only on machines that have multiple compilers)
COMPILER=${COMPILER:-"intel"}
if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
MACHINE_ID=${MACHINE_ID}.${COMPILER}
fi

# Source machine specific GSI-EnKF modules
set +x
source "${HOMEgfs}/ush/module-setup.sh"
module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
module load gsi_"${MACHINE_ID}"

if [[ "${MACHINE_ID}" = "orion" ]]; then
module load miniconda3/4.12.0
set +u
conda activate regional_workflow_cmaq
set_strict
fi

module list
unset MACHINE_ID
set_trace
fi

export job="anal"
export jobid="${job}.$$"
Expand Down
40 changes: 37 additions & 3 deletions jobs/rocoto/eobs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,43 @@ source "${HOMEgfs}/ush/preamble.sh"

###############################################################
# Source FV3GFS workflow modules
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit ${status}
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
#status=$?
#[[ ${status} -ne 0 ]] && exit ${status}

# TODO: clean this up
#Source appropriate modulefiles based on machine

source "${HOMEgfs}/ush/detect_machine.sh"
if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
# Source FV3GFS workflow modules
. "${HOMEgfs}"/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit "${status}"
else
# Append compiler (only on machines that have multiple compilers)
COMPILER=${COMPILER:-"intel"}
if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
MACHINE_ID=${MACHINE_ID}.${COMPILER}
fi

# Source machine specific GSI-EnKF modules
set +x
source "${HOMEgfs}/ush/module-setup.sh"
module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
module load gsi_"${MACHINE_ID}"

if [[ "${MACHINE_ID}" = "orion" ]]; then
module load miniconda3/4.12.0
set +u
conda activate regional_workflow_cmaq
set_strict
fi

module list
unset MACHINE_ID
set_trace
fi

export job="eobs"
export jobid="${job}.$$"
Expand Down
40 changes: 37 additions & 3 deletions jobs/rocoto/eupd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,43 @@ source "${HOMEgfs}/ush/preamble.sh"

###############################################################
# Source FV3GFS workflow modules
. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit ${status}
#. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
#status=$?
#[[ ${status} -ne 0 ]] && exit ${status}

# TODO: clean this up
#Source appropriate modulefiles based on machine

source "${HOMEgfs}/ush/detect_machine.sh"
if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
# Source FV3GFS workflow modules
. "${HOMEgfs}"/ush/load_fv3gfs_modules.sh
status=$?
[[ ${status} -ne 0 ]] && exit "${status}"
else
# Append compiler (only on machines that have multiple compilers)
COMPILER=${COMPILER:-"intel"}
if [[ "${MACHINE_ID}" = "hera" ]] || [[ "${MACHINE_ID}" = "cheyenne" ]]; then
MACHINE_ID=${MACHINE_ID}.${COMPILER}
fi

# Source machine specific GSI-EnKF modules
set +x
source "${HOMEgfs}/ush/module-setup.sh"
module use "${HOMEgfs}/sorc/gsi_enkf.fd/modulefiles"
module load gsi_"${MACHINE_ID}"

if [[ "${MACHINE_ID}" = "orion" ]]; then
module load miniconda3/4.12.0
set +u
conda activate regional_workflow_cmaq
set_strict
fi

module list
unset MACHINE_ID
set_trace
fi

export job="eupd"
export jobid="${job}.$$"
Expand Down
2 changes: 1 addition & 1 deletion sorc/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model"
checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?))

if [[ ${checkout_gsi} == "YES" ]]; then
checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "accb07e" "NO"; errs=$((errs + $?))
checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "ca19008" "NO"; errs=$((errs + $?))
fi

if [[ ${checkout_gdas} == "YES" ]]; then
Expand Down