Revert "Modifications to allow workflow to run to completion with GNU…

… build on Hera (#526)" (#559) This reverts commit 19a872b.
ufs-community · Jul 23, 2021 · c7c48a3 · c7c48a3
1 parent ea648a0
commit c7c48a3
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 124 deletions.
diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -608,13 +608,6 @@ $settings"
 # of chgres_cube is nonzero.
 # A similar thing happens in the forecast task.
 #
-#-----------------------------------------------------------------------
-# Deactivate the conda environment to avoid conflicts between the 
-# environment used by the regional workflow (prepended to your $PATH)
-# and that used in the run environment.
-#-----------------------------------------------------------------------
-unload_python
-
 ${APRUN} ${exec_fp} || \
   print_err_msg_exit "\
 Call to executable (exec_fp) to generate surface and initial conditions

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -523,13 +523,6 @@ $settings"
 # of chgres_cube is nonzero.
 # A similar thing happens in the forecast task.
 #
-#-----------------------------------------------------------------------
-# Deactivate the conda environment to avoid conflicts between the 
-# environment used by the regional workflow (prepended to your $PATH)
-# and that used in the run environment.
-#-----------------------------------------------------------------------
-  unload_python
-
   ${APRUN} ${exec_fp} || \
     print_err_msg_exit "\
 Call to executable (exec_fp) to generate lateral boundary conditions (LBCs)

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -523,13 +523,6 @@ Call to function to create a diag table file for the current cycle's
 #
 #-----------------------------------------------------------------------
 #
-#-----------------------------------------------------------------------
-# Deactivate the conda environment to avoid conflicts between the 
-# environment used by the regional workflow (prepended to your $PATH)
-# and that used in the run environment.
-#-----------------------------------------------------------------------
-unload_python
-
 $APRUN ${FV3_EXEC_FP} || print_err_msg_exit "\
 Call to executable to run FV3-LAM forecast returned with nonzero exit
 code."

diff --git a/ush/bash_utils/unload_python.sh b/ush/bash_utils/unload_python.sh
diff --git a/ush/source_util_funcs.sh b/ush/source_util_funcs.sh
@@ -183,12 +183,6 @@ function source_util_funcs() {
 #
 #-----------------------------------------------------------------------
 #
-#  Unload python or miniconda3 if loaded
-#
-#-----------------------------------------------------------------------
-#
-  . ${bashutils_dir}/unload_python.sh
-#
 # Source the file containing the function that creates a symlink to a
 # file (including performing checks).
 #