From eb5577786c0ddf7548159b99a2bcdf74464daafd Mon Sep 17 00:00:00 2001 From: Mark A Potts Date: Tue, 25 Oct 2022 12:20:35 -0400 Subject: [PATCH 1/2] fix for conda on gaea --- ush/load_modules_run_task.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh index efd14c88ab..bec8f35537 100755 --- a/ush/load_modules_run_task.sh +++ b/ush/load_modules_run_task.sh @@ -183,10 +183,11 @@ module list if [ -n "${SRW_ENV:-}" ] ; then set +u - conda activate ${SRW_ENV} if [ $machine = "gaea" ]; then conda deactivate conda activate ${SRW_ENV} + else + conda activate ${SRW_ENV} fi set -u fi From f4af87b6526ed9102d1123cd9d9038158b646b07 Mon Sep 17 00:00:00 2001 From: Mark A Potts Date: Wed, 26 Oct 2022 09:42:23 -0400 Subject: [PATCH 2/2] Removed unneccessary local modulefiles which were added an extra layer of conda initialization --- modulefiles/tasks/gaea/get_extrn_ics.local.lua | 1 - modulefiles/tasks/gaea/get_extrn_lbcs.local.lua | 1 - modulefiles/tasks/gaea/make_grid.local.lua | 1 - modulefiles/tasks/gaea/make_ics.local.lua | 1 - modulefiles/tasks/gaea/make_lbcs.local.lua | 1 - modulefiles/tasks/gaea/make_orog.local.lua | 1 - modulefiles/tasks/gaea/miniconda_regional_workflow.lua | 4 ---- modulefiles/tasks/gaea/run_fcst.local.lua | 1 - modulefiles/tasks/gaea/run_vx.local.lua | 2 +- ush/load_modules_run_task.sh | 9 ++------- 10 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 modulefiles/tasks/gaea/get_extrn_ics.local.lua delete mode 100644 modulefiles/tasks/gaea/get_extrn_lbcs.local.lua delete mode 100644 modulefiles/tasks/gaea/make_grid.local.lua delete mode 100644 modulefiles/tasks/gaea/make_ics.local.lua delete mode 100644 modulefiles/tasks/gaea/make_lbcs.local.lua delete mode 100644 modulefiles/tasks/gaea/make_orog.local.lua delete mode 100644 modulefiles/tasks/gaea/miniconda_regional_workflow.lua delete mode 100644 modulefiles/tasks/gaea/run_fcst.local.lua diff --git a/modulefiles/tasks/gaea/get_extrn_ics.local.lua b/modulefiles/tasks/gaea/get_extrn_ics.local.lua deleted file mode 100644 index d371c08301..0000000000 --- a/modulefiles/tasks/gaea/get_extrn_ics.local.lua +++ /dev/null @@ -1 +0,0 @@ -load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/gaea/get_extrn_lbcs.local.lua b/modulefiles/tasks/gaea/get_extrn_lbcs.local.lua deleted file mode 100644 index d371c08301..0000000000 --- a/modulefiles/tasks/gaea/get_extrn_lbcs.local.lua +++ /dev/null @@ -1 +0,0 @@ -load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/gaea/make_grid.local.lua b/modulefiles/tasks/gaea/make_grid.local.lua deleted file mode 100644 index d371c08301..0000000000 --- a/modulefiles/tasks/gaea/make_grid.local.lua +++ /dev/null @@ -1 +0,0 @@ -load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/gaea/make_ics.local.lua b/modulefiles/tasks/gaea/make_ics.local.lua deleted file mode 100644 index d371c08301..0000000000 --- a/modulefiles/tasks/gaea/make_ics.local.lua +++ /dev/null @@ -1 +0,0 @@ -load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/gaea/make_lbcs.local.lua b/modulefiles/tasks/gaea/make_lbcs.local.lua deleted file mode 100644 index d371c08301..0000000000 --- a/modulefiles/tasks/gaea/make_lbcs.local.lua +++ /dev/null @@ -1 +0,0 @@ -load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/gaea/make_orog.local.lua b/modulefiles/tasks/gaea/make_orog.local.lua deleted file mode 100644 index d371c08301..0000000000 --- a/modulefiles/tasks/gaea/make_orog.local.lua +++ /dev/null @@ -1 +0,0 @@ -load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/gaea/miniconda_regional_workflow.lua b/modulefiles/tasks/gaea/miniconda_regional_workflow.lua deleted file mode 100644 index dd8ec8f7e4..0000000000 --- a/modulefiles/tasks/gaea/miniconda_regional_workflow.lua +++ /dev/null @@ -1,4 +0,0 @@ -prepend_path("MODULEPATH", "/lustre/f2/dev/role.epic/contrib/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) - -setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/gaea/run_fcst.local.lua b/modulefiles/tasks/gaea/run_fcst.local.lua deleted file mode 100644 index d371c08301..0000000000 --- a/modulefiles/tasks/gaea/run_fcst.local.lua +++ /dev/null @@ -1 +0,0 @@ -load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua index 85e2bc2053..8586a7984a 100644 --- a/modulefiles/tasks/gaea/run_vx.local.lua +++ b/modulefiles/tasks/gaea/run_vx.local.lua @@ -1,2 +1,2 @@ -load("miniconda_regional_workflow") +--load("miniconda_regional_workflow") prepend_path("LD_LIBRARY_PATH", "/ncrc/sw/gaea-cle7/python/3.9/anaconda-base/envs/noaa_py3.9/lib") diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh index bec8f35537..9059b1c492 100755 --- a/ush/load_modules_run_task.sh +++ b/ush/load_modules_run_task.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # #----------------------------------------------------------------------- @@ -183,12 +183,7 @@ module list if [ -n "${SRW_ENV:-}" ] ; then set +u - if [ $machine = "gaea" ]; then - conda deactivate - conda activate ${SRW_ENV} - else - conda activate ${SRW_ENV} - fi + conda activate ${SRW_ENV} set -u fi