Fix lmod problem on Hera based on the same fix on community regional …

…workflow from Christina. (NOAA-EMC#165)
EricJames-NOAA · Jul 27, 2021 · 23afedd · 23afedd
1 parent cb9f79b
commit 23afedd
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 27 deletions.
diff --git a/modulefiles/tasks/hera/make_grid.local b/modulefiles/tasks/hera/make_grid.local
@@ -1,6 +1,4 @@
 #%Module
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/hera/make_ics.local b/modulefiles/tasks/hera/make_ics.local
@@ -1,6 +1,4 @@
 #%Module
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/hera/make_lbcs.local b/modulefiles/tasks/hera/make_lbcs.local
@@ -1,6 +1,4 @@
 #%Module
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/hera/run_fcst.local b/modulefiles/tasks/hera/run_fcst.local
@@ -1,6 +1,4 @@
 #%Module
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/jet/make_grid.local b/modulefiles/tasks/jet/make_grid.local
@@ -1,6 +1,4 @@
 #%Module
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/jet/make_ics.local b/modulefiles/tasks/jet/make_ics.local
@@ -3,6 +3,4 @@ module load wgrib2/2.0.8
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/jet/make_lbcs.local b/modulefiles/tasks/jet/make_lbcs.local
@@ -3,6 +3,5 @@ module load wgrib2/2.0.8
 
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/jet/run_anal_gsi.local b/modulefiles/tasks/jet/run_anal_gsi.local
@@ -1,6 +1,4 @@
 #%Module
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/jet/run_fcst.local b/modulefiles/tasks/jet/run_fcst.local
@@ -1,6 +1,4 @@
 #%Module
 module use -a /contrib/miniconda3/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+setenv SRW_ENV regional_workflow
diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh
@@ -329,6 +329,10 @@ ules_dir) for the specified task (task_name) failed:
 
   module list
 
+if [ -n "${SRW_ENV:-}" ] ; then
+  conda activate ${SRW_ENV}
+fi
+
 #fi #End if statement for tasks that load no modules
 #
 #-----------------------------------------------------------------------