Update Release/public v1 for changing release tag from v1.0.0 to v1.0…

….1 (#572) * An array index is added to 'cycle_status' in the conditional statement of the launch script (launch_FV3LAM_wflow.sh) by Chan-hoo * This commit is from christinaholtNOAA:lmod_update to address an error that occurs at run time ModuleNotFoundError: No module named 'f90nml'. A similar error may appear in any of the tasks that use a conda environment, and could potentially list jinja2 instead. * This is the commit from JiliDong-NOAA:fix_filter_topo to remove "refine_ratio = ${refine_ratio}" in scripts/exregional_make_orog.sh to fix filter_topo failure * Changing #!/bin/bash -l to Co-authored-by: Linlin.Pan <[email protected]>
ufs-community · Aug 24, 2021 · 99a2c47 · 99a2c47
1 parent 938d9cb
commit 99a2c47
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 39 deletions.
diff --git a/modulefiles/tasks/hera/make_grid.local b/modulefiles/tasks/hera/make_grid.local
@@ -1,6 +1,5 @@
 #%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,5 @@
 #%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,5 @@
 #%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,5 @@
 #%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,5 @@
 #%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,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/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_fcst.local b/modulefiles/tasks/jet/run_fcst.local
@@ -1,6 +1,5 @@
 #%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/orion/make_grid.local b/modulefiles/tasks/orion/make_grid.local
@@ -1,6 +1,5 @@
 #%Module
 module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/orion/make_ics.local b/modulefiles/tasks/orion/make_ics.local
@@ -1,6 +1,5 @@
 #%Module
 module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/orion/make_lbcs.local b/modulefiles/tasks/orion/make_lbcs.local
@@ -1,6 +1,5 @@
 #%Module
 module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/orion/run_fcst.local b/modulefiles/tasks/orion/run_fcst.local
@@ -1,6 +1,5 @@
 #%Module
 module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles
 module load miniconda3
-if [module-info mode load] {
-  system "conda activate regional_workflow"
-}
+
+setenv SRW_ENV regional_workflow
diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh
@@ -451,7 +451,6 @@ cat > "${filter_dir}/input.nml" <<EOF
   mask_field = "land_frac"
   regional = .true.
   stretch_fac = ${STRETCH_FAC}
-  refine_ratio = ${refine_ratio}
   res = $res
 /
 EOF

diff --git a/ush/launch_FV3LAM_wflow.sh b/ush/launch_FV3LAM_wflow.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 
 #
 #-----------------------------------------------------------------------
@@ -337,7 +337,7 @@ done <<< "${rocotostat_output}"
 num_cycles_total=${#cycle_str[@]}
 num_cycles_completed=0
 for (( i=0; i<=$((num_cycles_total-1)); i++ )); do
-  if [ "${cycle_status}" = "Done" ]; then
+  if [ "${cycle_status[i]}" = "Done" ]; then
     num_cycles_completed=$((num_cycles_completed+1))
   fi
 done

diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh
@@ -325,6 +325,17 @@ ules_dir) for the specified task (task_name) failed:
   module list
 
 #fi #End if statement for tasks that load no modules
+
+# Modules that use conda and need an environment activated will set the
+# SRW_ENV variable to the name of the environment to be activated. That
+# must be done within the script, and not inside the module. Do that
+# now.
+
+if [ -n "${SRW_ENV:-}" ] ; then
+  conda activate ${SRW_ENV}
+fi
+
+
 #
 #-----------------------------------------------------------------------
 #