Restore build_tools.sh for wcoss_cray.

JohnSteffen-NOAA · Apr 10, 2021 · f806fe5 · f806fe5
1 parent 919533a
commit f806fe5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/sorc/build_tools.sh b/sorc/build_tools.sh
@@ -1,11 +1,10 @@
 #!/bin/sh
-#set -eux
-set -x
-
+set -eux
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=`pwd`
 
 if [ $target = hera ] || [ $target = orion ] || [ $target = jet ]; then
+    export target
     #source ../modulefiles/modulefile.tools.$target > /dev/null 2>&1
     module use ../modulefiles
     module load modulefile.tools.$target
@@ -15,10 +14,10 @@ if [ $target = hera ] || [ $target = orion ] || [ $target = jet ]; then
     export CC=icc
     export MPIFC=mpif90
 elif [ $target = wcoss_cray ]; then
+    export target
     #source ../modulefiles/modulefile.tools.${target} > /dev/null 2>&1
     module use ../modulefiles
     module load modulefile.tools.${target}
-    module load cmake/3.3.2
     module list
     export FC="ftn -static"
     export F90="ftn -free -static"
@@ -27,6 +26,7 @@ elif [ $target = wcoss_cray ]; then
     export DM_F90="ftn -free -static"
     export DM_CC="cc -static"
 elif [ $target = wcoss_dell_p3 ]; then
+    export target
     #source ../modulefiles/modulefile.tools.${target} > /dev/null 2>&1
     module use ../modulefiles
     module load modulefile.tools.${target}

diff --git a/sorc/install_hafs.sh b/sorc/install_hafs.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
-set -x
-source ./machine-setup.sh > /dev/null 2>&1
-cwd=$(pwd)
+set -eux
+cwd=`pwd`
 
 cd ${cwd}
 

diff --git a/sorc/link_fix.sh b/sorc/link_fix.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
-set -x
+set -eux
 source ./machine-setup.sh > /dev/null 2>&1
+cwd=`pwd`
 
 HOMEhafs=$(pwd)/..
 FIXhafs=${HOMEhafs}/fix