diff --git a/jobs/JHAFS_ANALYSIS b/jobs/JHAFS_ANALYSIS
index 91f45da5d..622f6162c 100755
--- a/jobs/JHAFS_ANALYSIS
+++ b/jobs/JHAFS_ANALYSIS
@@ -51,13 +51,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_ANALYSIS_VR b/jobs/JHAFS_ANALYSIS_VR
index 57ce4adbe..a337010ec 100755
--- a/jobs/JHAFS_ANALYSIS_VR
+++ b/jobs/JHAFS_ANALYSIS_VR
@@ -61,13 +61,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_ATM_INIT b/jobs/JHAFS_ATM_INIT
index ee12b2df0..eff807c86 100755
--- a/jobs/JHAFS_ATM_INIT
+++ b/jobs/JHAFS_ATM_INIT
@@ -129,9 +129,6 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
-  #module purge
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
@@ -151,6 +148,7 @@ if [ "$RUN_ENVIR" = prod ]; then
   module load fv3
   module list
   export LD_LIBRARY_PATH="$HOMEhafs/sorc/hafs_forecast.fd/FV3/ccpp/lib::${LD_LIBRARY_PATH}"
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_CHGRES_BC b/jobs/JHAFS_CHGRES_BC
index 5af44e83e..c77a227a4 100755
--- a/jobs/JHAFS_CHGRES_BC
+++ b/jobs/JHAFS_CHGRES_BC
@@ -66,16 +66,14 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
   fi
-  #source ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles/build.${machine}
   module use ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles
   module load build.${machine}.intel
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_CHGRES_IC b/jobs/JHAFS_CHGRES_IC
index 216f158f1..bae75b322 100755
--- a/jobs/JHAFS_CHGRES_IC
+++ b/jobs/JHAFS_CHGRES_IC
@@ -59,16 +59,14 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
   fi
-  #source ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles/build.${machine}
   module use ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles
   module load build.${machine}.intel
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_EMCGRAPHICS b/jobs/JHAFS_EMCGRAPHICS
index affb11ad9..3a0b28159 100755
--- a/jobs/JHAFS_EMCGRAPHICS
+++ b/jobs/JHAFS_EMCGRAPHICS
@@ -57,6 +57,7 @@ if [ "$RUN_ENVIR" = prod ]; then
   module use ${HOMEgraph}/modulefiles
   module load modulefile.graphics.run.${machine}
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_ENKF_HX b/jobs/JHAFS_ENKF_HX
index 47dcccbde..9b54fcb2d 100755
--- a/jobs/JHAFS_ENKF_HX
+++ b/jobs/JHAFS_ENKF_HX
@@ -67,13 +67,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_ENKF_MEAN b/jobs/JHAFS_ENKF_MEAN
index 93ee1000e..b22d9dac5 100755
--- a/jobs/JHAFS_ENKF_MEAN
+++ b/jobs/JHAFS_ENKF_MEAN
@@ -67,13 +67,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_ENKF_RECENTER b/jobs/JHAFS_ENKF_RECENTER
index 9d4a66627..8b5b2e2ca 100755
--- a/jobs/JHAFS_ENKF_RECENTER
+++ b/jobs/JHAFS_ENKF_RECENTER
@@ -67,13 +67,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_ENKF_UPDATE b/jobs/JHAFS_ENKF_UPDATE
index 529fc88c2..6b6bea7f5 100755
--- a/jobs/JHAFS_ENKF_UPDATE
+++ b/jobs/JHAFS_ENKF_UPDATE
@@ -67,13 +67,10 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  module use ${HOMEhafs}/modulefiles
-  module load modulefile.hafs.run.${machine}
   module use $HOMEhafs/sorc/hafs_gsi.fd/modulefiles
   module load modulefile.ProdGSI.${machine}
-  #source $HOMEhafs/sorc/hafs_gsi.fd/modulefiles/modulefile.ProdGSI.${machine}
-  #env
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_FORECAST b/jobs/JHAFS_FORECAST
index 1bea9cbaa..16750be25 100755
--- a/jobs/JHAFS_FORECAST
+++ b/jobs/JHAFS_FORECAST
@@ -129,9 +129,6 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
-  #module purge
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
@@ -151,6 +148,7 @@ if [ "$RUN_ENVIR" = prod ]; then
   module load fv3
   module list
   export LD_LIBRARY_PATH="$HOMEhafs/sorc/hafs_forecast.fd/FV3/ccpp/lib::${LD_LIBRARY_PATH}"
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_GRID b/jobs/JHAFS_GRID
index a93e11844..4f89ad8b2 100755
--- a/jobs/JHAFS_GRID
+++ b/jobs/JHAFS_GRID
@@ -96,16 +96,14 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
   fi
-  #source ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles/build.${machine}
   module use ${HOMEhafs}/sorc/hafs_utils.fd/modulefiles
   module load build.${machine}.intel
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_HRDGRAPHICS b/jobs/JHAFS_HRDGRAPHICS
index 3436164cd..15670d351 100755
--- a/jobs/JHAFS_HRDGRAPHICS
+++ b/jobs/JHAFS_HRDGRAPHICS
@@ -59,6 +59,7 @@ export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
   source ${GPLOThafs}/modulefiles/modulefile.gplot.${machine}
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_HYCOMPOST b/jobs/JHAFS_HYCOMPOST
index dcf93c49f..3568735d1 100755
--- a/jobs/JHAFS_HYCOMPOST
+++ b/jobs/JHAFS_HYCOMPOST
@@ -47,16 +47,8 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module purge
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
-  if [ "$machine" = wcoss_dell_p3 ]; then
-    module unload NetCDF
-    module unload HDF5-serial
-  fi
-  module use ${HOMEhafs}/sorc/hafs_hycom_utils.fd/modulefiles
-  module load modulefile.hycom_utils.${machine}
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_OCEAN_INIT b/jobs/JHAFS_OCEAN_INIT
index 5827ee23f..8e7e94aa1 100755
--- a/jobs/JHAFS_OCEAN_INIT
+++ b/jobs/JHAFS_OCEAN_INIT
@@ -48,9 +48,8 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_POST b/jobs/JHAFS_POST
index 7ccca9aa6..35991a3f2 100755
--- a/jobs/JHAFS_POST
+++ b/jobs/JHAFS_POST
@@ -72,9 +72,6 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module purge
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   if [ "$machine" = wcoss_dell_p3 ]; then
     module unload NetCDF
     module unload HDF5-serial
@@ -94,6 +91,7 @@ if [ "$RUN_ENVIR" = prod ]; then
   module use ${HOMEhafs}/sorc/hafs_post.fd/modulefiles
   module load ${machine}
   module list
+  env
 fi
 
 #####################################
diff --git a/jobs/JHAFS_PRODUCT b/jobs/JHAFS_PRODUCT
index 2816be684..e352f4207 100755
--- a/jobs/JHAFS_PRODUCT
+++ b/jobs/JHAFS_PRODUCT
@@ -73,9 +73,8 @@ export machine=${WHERE_AM_I:-wcoss_cray} # platforms: wcoss_cray, wcoss_dell_p3,
 #export RUN_ENVIR=${RUN_ENVIR:-prod}
 export RUN_ENVIR=${envir:-prod}
 if [ "$RUN_ENVIR" = prod ]; then
-  #module use ${HOMEhafs}/modulefiles
-  #module load modulefile.hafs.run.${machine}
   module list
+  env
 fi
 
 #####################################
diff --git a/modulefiles/modulefile.hafs.base.wcoss_cray b/modulefiles/modulefile.hafs.base.wcoss_cray
deleted file mode 100644
index 4aa27521b..000000000
--- a/modulefiles/modulefile.hafs.base.wcoss_cray
+++ /dev/null
@@ -1,38 +0,0 @@
-#%Module#####################################################
-## Module file for hafs
-#############################################################
-proc ModulesHelp { } {
-    puts stderr "Set environment veriables for compiling or running HAFS"
-}
-module-whatis " HAFS model prerequisites"
-
-set ver 1.0.0
-
-module use /usrx/local/prod/modulefiles
-module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles
-module use /gpfs/hps/nco/ops/nwprod/modulefiles
-module use /opt/cray/alt-modulefiles
-module use /opt/cray/craype/default/alt-modulefiles
-module use /opt/cray/ari/modulefiles
-module use /opt/modulefiles
-
-#module available
-
-module load modules
-module load switch
-module load craype-network-aries
-module load craype-haswell
-module load xt-lsfhpc
-
-module load craype/2.3.0
-module load cray-mpich/7.2.0
-module load cfp-intel-sandybridge
-module load PrgEnv-intel/5.2.56
-module load intel/15.0.3.187
-module load hpss
-
-# Load these last:
-#module load ncep/1.0 # Careful this will set OMP_NUM_THREADS=1
-# Modules loaded by ncep/1.0
-module load eswrap
-
diff --git a/modulefiles/modulefile.hafs.run.hera b/modulefiles/modulefile.hafs.hera
similarity index 100%
rename from modulefiles/modulefile.hafs.run.hera
rename to modulefiles/modulefile.hafs.hera
diff --git a/modulefiles/modulefile.hafs.run.jet b/modulefiles/modulefile.hafs.jet
similarity index 100%
rename from modulefiles/modulefile.hafs.run.jet
rename to modulefiles/modulefile.hafs.jet
diff --git a/modulefiles/modulefile.hafs.run.orion b/modulefiles/modulefile.hafs.orion
similarity index 100%
rename from modulefiles/modulefile.hafs.run.orion
rename to modulefiles/modulefile.hafs.orion
diff --git a/modulefiles/modulefile.hafs.run.wcoss_cray b/modulefiles/modulefile.hafs.wcoss_cray
similarity index 100%
rename from modulefiles/modulefile.hafs.run.wcoss_cray
rename to modulefiles/modulefile.hafs.wcoss_cray
diff --git a/modulefiles/modulefile.hafs.run.wcoss_dell_p3 b/modulefiles/modulefile.hafs.wcoss_dell_p3
similarity index 100%
rename from modulefiles/modulefile.hafs.run.wcoss_dell_p3
rename to modulefiles/modulefile.hafs.wcoss_dell_p3
diff --git a/modulefiles/modulefile.tools.hera b/modulefiles/modulefile.tools.hera
deleted file mode 120000
index 2e5d95e8e..000000000
--- a/modulefiles/modulefile.tools.hera
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.hafs.run.hera
\ No newline at end of file
diff --git a/modulefiles/modulefile.tools.jet b/modulefiles/modulefile.tools.jet
deleted file mode 120000
index 386fb63a5..000000000
--- a/modulefiles/modulefile.tools.jet
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.vortextracker.jet
\ No newline at end of file
diff --git a/modulefiles/modulefile.tools.orion b/modulefiles/modulefile.tools.orion
deleted file mode 120000
index 19f4c2947..000000000
--- a/modulefiles/modulefile.tools.orion
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.vortextracker.orion
\ No newline at end of file
diff --git a/modulefiles/modulefile.tools.wcoss_cray b/modulefiles/modulefile.tools.wcoss_cray
deleted file mode 120000
index 94b1e5409..000000000
--- a/modulefiles/modulefile.tools.wcoss_cray
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.vortextracker.wcoss_cray
\ No newline at end of file
diff --git a/modulefiles/modulefile.tools.wcoss_dell_p3 b/modulefiles/modulefile.tools.wcoss_dell_p3
deleted file mode 120000
index 0246fb09b..000000000
--- a/modulefiles/modulefile.tools.wcoss_dell_p3
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.vortextracker.wcoss_dell_p3
\ No newline at end of file
diff --git a/modulefiles/modulefile.vortextracker.hera b/modulefiles/modulefile.vortextracker.hera
deleted file mode 120000
index 2e5d95e8e..000000000
--- a/modulefiles/modulefile.vortextracker.hera
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.hafs.run.hera
\ No newline at end of file
diff --git a/modulefiles/modulefile.vortextracker.jet b/modulefiles/modulefile.vortextracker.jet
deleted file mode 120000
index 525da7735..000000000
--- a/modulefiles/modulefile.vortextracker.jet
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.hafs.run.jet
\ No newline at end of file
diff --git a/modulefiles/modulefile.vortextracker.orion b/modulefiles/modulefile.vortextracker.orion
deleted file mode 120000
index af9ece283..000000000
--- a/modulefiles/modulefile.vortextracker.orion
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.hafs.run.orion
\ No newline at end of file
diff --git a/modulefiles/modulefile.vortextracker.wcoss_cray b/modulefiles/modulefile.vortextracker.wcoss_cray
deleted file mode 120000
index b10194cce..000000000
--- a/modulefiles/modulefile.vortextracker.wcoss_cray
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.hafs.run.wcoss_cray
\ No newline at end of file
diff --git a/modulefiles/modulefile.vortextracker.wcoss_dell_p3 b/modulefiles/modulefile.vortextracker.wcoss_dell_p3
deleted file mode 120000
index e245efa75..000000000
--- a/modulefiles/modulefile.vortextracker.wcoss_dell_p3
+++ /dev/null
@@ -1 +0,0 @@
-modulefile.hafs.run.wcoss_dell_p3
\ No newline at end of file
diff --git a/sorc/build_hycom_utils.sh b/sorc/build_hycom_utils.sh
index ebc70dbbc..bd8b61688 100755
--- a/sorc/build_hycom_utils.sh
+++ b/sorc/build_hycom_utils.sh
@@ -9,22 +9,10 @@ if [ $target = wcoss_cray ]; then
   export DM_CC="cc -static"
 fi
 
-module use hafs_hycom_utils.fd/modulefiles
-module load modulefile.hycom_utils.$target
+module use ../modulefiles
+module load modulefile.hafs.$target
 module list
 
-#export NETCDF_INCLUDE=${NETCDF_INCLUDE:-"-I${NETCDF}/include"}
-#export NETCDF_LDFLAGS=${NETCDF_LDFLAGS:-"-L${NETCDF}/lib -lnetcdf -lnetcdff"}
-## export NETCDF_INCLUDE="-I${NETCDF}/include"
-## export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdff -lnetcdf"
-
-##export HDF5_INCLUDE=${HDF5_INCLUDE:-"-I${HDF5}/include"}
-#export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5}/lib -lhdf5_hl -lhdf5hl_fortran -lhdf5 -lhdf5_fortran"}
-##export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5}/lib -lhdf5_hl -lhdf5"}
-
-#export HDF5_LDFLAGS="-L${HDF5}/lib -lhdf5_hl -lhdf5hl_fortran -lhdf5 -lhdf5_fortran -lz";
-#export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdff -lnetcdf -lz ${HDF5_LDFLAGS}";
-
 cd hafs_hycom_utils.fd/libs
 if [ -d "build" ]; then
    rm -rf build
@@ -52,14 +40,6 @@ fi
 make -j 8 VERBOSE=1
 make install
 
-# Ensure a clean compile:
-#make -i clean
-#find . -name '*.o' -o -name '*.a' -o -name '*.mod' | xargs rm -f
-#rm -f ./exec/*
-
-# Compile hycom_utils
-#make -i -f makefile all
-
 cd ../
 
 exit
diff --git a/sorc/build_tools.sh b/sorc/build_tools.sh
index ebbfd511c..3d1f5ae9f 100755
--- a/sorc/build_tools.sh
+++ b/sorc/build_tools.sh
@@ -3,65 +3,45 @@ set -eux
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=`pwd`
 
+export target=${target}
+module use ../modulefiles
+module load modulefile.hafs.${target}
+module list
+
 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
-    module list
-    export FC=ifort
-    export F90=ifort
-    export CC=icc
-    export MPIFC=mpif90
+  export FC=ifort
+  export F90=ifort
+  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 list
-    export FC="ftn -static"
-    export F90="ftn -free -static"
-    export CC=icc
-    export DM_FC="ftn -static"
-    export DM_F90="ftn -free -static"
-    export DM_CC="cc -static"
+  export FC="ftn -static"
+  export F90="ftn -free -static"
+  export CC=icc
+  export DM_FC="ftn -static"
+  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}
-    module list
-    export FC=ifort
-    export F90=ifort
-    export CC=icc
+  export FC=ifort
+  export F90=ifort
+  export CC=icc
 else
-    echo "Unknown machine = $target"
-    exit 1
+  echo "Unknown machine = $target"
+  exit 1
 fi
 
 #export NETCDF_INCLUDE=${NETCDF_INCLUDE:-"-I${NETCDF}/include"}
 #export NETCDF_LDFLAGS=${NETCDF_LDFLAGS:-"-L${NETCDF}/lib -lnetcdf -lnetcdff"}
 export NETCDF_INCLUDE="-I${NETCDF}/include"
 export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdff -lnetcdf"
-export HDF5_INCLUDE=${HDF5_INCLUDE:-"-I${HDF5}/include"}
+export HDF5_INCLUDE=${HDF5_INCLUDE:-"-I${HDF5_INCLUDES:-"-I${HDF5}/include"}}"}
 #export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5}/lib -lhdf5_hl -lhdf5hl_fortran -lhdf5 -lhdf5_fortran"}
-export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5}/lib -lhdf5_hl -lhdf5"}
+export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5_LIBRARIES:-"${HDF5}/lib"} -lhdf5_hl -lhdf5"}
 export BUFR_LDFLAGS="${BUFR_LIBd}"
 
 TOOLS_PATH=${cwd}/hafs_tools.fd
-
-# Build the libraries in the tools
-##cd ${TOOLS_PATH}/libsrc
-##./build_libs_cmake.sh
-
-# Build the tools programs
 export TOOLS_INC=${TOOLS_PATH}/include
 export TOOLS_INCLUDE="-I${TOOLS_PATH}/include"
 export TOOLS_LIBDIR=${TOOLS_PATH}/lib
-#cd ${TOOLS_PATH}/sorc
-#make clean
-#make
-
 if [ -d "${TOOLS_PATH}/build" ]; then
   rm -rf ${TOOLS_PATH}/build
 fi
diff --git a/sorc/build_vortextracker.sh b/sorc/build_vortextracker.sh
index e2b00c8e8..545a3a844 100755
--- a/sorc/build_vortextracker.sh
+++ b/sorc/build_vortextracker.sh
@@ -3,90 +3,43 @@ set -eux
 source ./machine-setup.sh > /dev/null 2>&1
 cwd=`pwd`
 
+module use ../modulefiles
+module load modulefile.hafs.$target
+module list
+
 if [ $target = hera ]; then
-    targetx=hera
-    #source ../modulefiles/modulefile.vortextracker.$target > /dev/null 2>&1
-    module use ../modulefiles
-    module load modulefile.vortextracker.$target
-    module list
-    export FC=ifort
-    export F90=ifort
-    export CC=icc
-    export hwrf_g2_inc=/scratch1/NCEPDEV/hwrf/save/Bin.Liu/hwrf-utilities/libs/mods/g2
-    export hwrf_g2_lib=/scratch1/NCEPDEV/hwrf/save/Bin.Liu/hwrf-utilities/libs/libg2.a
+  export FC=ifort
+  export F90=ifort
+  export CC=icc
+  export hwrf_g2_inc=/scratch1/NCEPDEV/hwrf/save/Bin.Liu/hwrf-utilities/libs/mods/g2
+  export hwrf_g2_lib=/scratch1/NCEPDEV/hwrf/save/Bin.Liu/hwrf-utilities/libs/libg2.a
 elif [ $target = orion ]; then
-    targetx=orion
-    #source ../modulefiles/modulefile.vortextracker.$target > /dev/null 2>&1
-    module use ../modulefiles
-    module load modulefile.vortextracker.$target
-    module list
-    export FC=ifort
-    export F90=ifort
-    export CC=icc
-    export hwrf_g2_inc=/work/noaa/hwrf/noscrub/bthomas/H220/sorc/hwrf-utilities/libs/mods/g2
-    export hwrf_g2_lib=/work/noaa/hwrf/noscrub/bthomas/H220/sorc/hwrf-utilities/libs/libg2.a
+  export FC=ifort
+  export F90=ifort
+  export CC=icc
+  export hwrf_g2_inc=/work/noaa/hwrf/noscrub/bthomas/H220/sorc/hwrf-utilities/libs/mods/g2
+  export hwrf_g2_lib=/work/noaa/hwrf/noscrub/bthomas/H220/sorc/hwrf-utilities/libs/libg2.a
 elif [ $target = jet ]; then
-    targetx=jet
-    #source ../modulefiles/modulefile.vortextracker.$target > /dev/null 2>&1
-    module use ../modulefiles
-    module load modulefile.vortextracker.$target
-    module list
-    export FC=ifort
-    export F90=ifort
-    export CC=icc
-    export hwrf_g2_inc=/lfs4/HFIP/hwrf-vd/Zhan.Zhang/H219_kjet/sorc/hwrf-utilities/libs/mods/g2
-    export hwrf_g2_lib=/lfs4/HFIP/hwrf-vd/Zhan.Zhang/H219_kjet/sorc/hwrf-utilities/libs/libg2.a
+  export FC=ifort
+  export F90=ifort
+  export CC=icc
+  export hwrf_g2_inc=/lfs4/HFIP/hwrf-vd/Zhan.Zhang/H219_kjet/sorc/hwrf-utilities/libs/mods/g2
+  export hwrf_g2_lib=/lfs4/HFIP/hwrf-vd/Zhan.Zhang/H219_kjet/sorc/hwrf-utilities/libs/libg2.a
 elif [ $target = wcoss_cray ]; then
-    targetx=cray
-    #source ../modulefiles/modulefile.vortextracker.$target           > /dev/null 2>&1
-    module use ../modulefiles
-    module load modulefile.vortextracker.$target
-    module list
-    export FC=ftn
-    export F90=ftn
-    export CC=icc
-    export hwrf_g2_inc=/gpfs/hps3/emc/hwrf/noscrub/Bin.Liu/save/H221final/sorc/hwrf-utilities/libs/mods/g2
-    export hwrf_g2_lib=/gpfs/hps3/emc/hwrf/noscrub/Bin.Liu/save/H221final/sorc/hwrf-utilities/libs/libg2.a
+  export FC=ftn
+  export F90=ftn
+  export CC=icc
+  export hwrf_g2_inc=/gpfs/hps3/emc/hwrf/noscrub/Bin.Liu/save/H221final/sorc/hwrf-utilities/libs/mods/g2
+  export hwrf_g2_lib=/gpfs/hps3/emc/hwrf/noscrub/Bin.Liu/save/H221final/sorc/hwrf-utilities/libs/libg2.a
 elif [ $target = wcoss_dell_p3 ]; then
-    targetx=wcoss_dell_p3
-    #source ../modulefiles/modulefile.vortextracker.$target           > /dev/null 2>&1
-    module use ../modulefiles
-    module load modulefile.vortextracker.$target
-    module list
-    export FC=ifort
-    export F90=ifort
-    export CC=icc
+  export FC=ifort
+  export F90=ifort
+  export CC=icc
 else
-    echo "Unknown machine = $target"
-    exit 1
+  echo "Unknown machine = $target"
+  exit 1
 fi
 
-#export NETCDF_INCLUDE=${NETCDF_INCLUDE:-"-I${NETCDF}/include"}
-#export NETCDF_LDFLAGS=${NETCDF_LDFLAGS:-"-L${NETCDF}/lib -lnetcdf -lnetcdff"}
- export NETCDF_INCLUDE="-I${NETCDF}/include"
- export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdff -lnetcdf"
-
-##export HDF5_INCLUDE=${HDF5_INCLUDE:-"-I${HDF5}/include"}
-#export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5}/lib -lhdf5_hl -lhdf5hl_fortran -lhdf5 -lhdf5_fortran"}
-##export HDF5_LDFLAGS=${HDF5_LDFLAGS:-"-L${HDF5}/lib -lhdf5_hl -lhdf5"}
-
-##export INC="-I${W3EMC_INCd} -I${G2_INCd} -I${SIGIO_INC4}"
-##export LIBS="${W3EMC_LIBd} ${W3NCO_LIBd} ${BACIO_LIB4} ${G2_LIBd} ${PNG_LIB} ${JASPER_LIB} ${Z_LIB}"
-
-##export INC_GETTRK="-I${W3EMC_INCd} -I${G2_INCd} -I${SIGIO_INC4} ${NETCDF_INCLUDE} ${HDF5_INCLUDE}"
-##export LIBS_GETTRK="${W3EMC_LIBd} ${W3NCO_LIBd} ${BACIO_LIB4} ${G2_LIBd} ${NETCDF_LDFLAGS} ${HDF5_LDFLAGS} ${PNG_LIB} ${JASPER_LIB} ${Z_LIB}"
-
-# The following is a temporary fix to enable running the tracker on Hera and Orion.
-##if [ $target = hera ]; then
-##  HWRF_UTIL_LIB=/scratch1/NCEPDEV/hwrf/save/Bin.Liu/hwrf-utilities/libs
-##  export INC_GETTRK="-I${HWRF_UTIL_LIB}/mods/bacio_8 -I${HWRF_UTIL_LIB}/mods/g2 -I${W3EMC_INCd} ${NETCDF_INCLUDE} ${HDF5_INCLUDE}"
-##  export LIBS_GETTRK="-L${HWRF_UTIL_LIB} -lbacio -lg2 ${W3EMC_LIBd} ${W3NCO_LIBd} ${NETCDF_LDFLAGS} ${HDF5_LDFLAGS} -L/usr/lib64 -lz -lpng -ljasper"
-##elif [ $target = orion ]; then
-##  HWRF_UTIL_LIB=/work/noaa/hwrf/noscrub/bthomas/H220/sorc/hwrf-utilities/libs
-##  LIBS_GETTRK="-L${HWRF_UTIL_LIB} -lbacio -lg2 -lz -lpng  ${W3EMC_LIBd} ${W3NCO_LIBd} ${NETCDF_LDFLAGS} ${HDF5_LDFLAGS} ${JASPER_LIB}"
-##  INC_GETTRK="-I${HWRF_UTIL_LIB}/mods/bacio_8 -I${HWRF_UTIL_LIB}/mods/g2 -I${W3EMC_INCd} ${NETCDF_INCLUDE} ${HDF5_INCLUDE}"
-##fi
-
 cd hafs_vortextracker.fd
 if [ -d "build" ]; then
    rm -rf build
@@ -107,10 +60,6 @@ fi
 make -j 8 VERBOSE=1
 make install
 
-#   make clean
-#   make FC=${FC} F90=${F90} CC=${CC} -f Makefile
-#  make install
-
 cd ../
 
 exit
diff --git a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.hera b/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.hera
deleted file mode 100644
index ab17d1689..000000000
--- a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.hera
+++ /dev/null
@@ -1,63 +0,0 @@
-#%Module#####################################################
-## Module file for hafs_hycom_utils
-#############################################################
-proc ModulesHelp { } {
-    puts stderr "Set environment veriables for compiling hycom_utils"
-}
-module-whatis "hycom_utils prerequisites"
-
-module load cmake/3.16.1
-setenv CMAKE_C_COMPILER mpiicc
-setenv CMAKE_CXX_COMPILER mpiicpc
-setenv CMAKE_Fortran_COMPILER mpiifort
-setenv CMAKE_Platform hera.intel
-
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/18.0.5.274
-module load hpc-impi/2018.0.4
-
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-#module load netcdf/4.7.4
-module load hdf5parallel/1.10.6
-module load netcdf-hdf5parallel/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_27
-
-module load bacio/2.4.1
-module load crtm/2.3.0
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load sp/2.3.3
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load upp/10.0.0
-
-module load bufr/11.4.0
-module load sigio/2.3.2
-module load sfcio/1.4.1
-module load gfsio/1.4.1
-module load nemsiogfs/2.5.3
-module load landsfcutil/2.4.1
-module load szip/2.1.1
-module load prod_util/1.2.2
-module load grib_util/1.2.2
-
-module load bufr/11.4.0
-
-###############################################################################
-#module use /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles
-
-#module load z/1.2.11
-
-#module load hdf5_parallel/1.10.6
-#module load netcdf_parallel/4.7.4
-
-#module use -a /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
-#module load esmf/8.1.0bs19_ParallelNetCDF
diff --git a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.jet b/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.jet
deleted file mode 100644
index df4fb1ef3..000000000
--- a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.jet
+++ /dev/null
@@ -1,42 +0,0 @@
-#%Module#####################################################
-## Module file for hafs_hycom_utils
-#############################################################
-proc ModulesHelp { } {
-    puts stderr "Set environment veriables for compiling hycom_utils"
-}
-module-whatis "hycom_utils prerequisites"
-
-module load cmake/3.16.1
-setenv CMAKE_C_COMPILER mpiicc
-setenv CMAKE_CXX_COMPILER mpiicpc
-setenv CMAKE_Fortran_COMPILER mpiifort
-setenv CMAKE_Platform jet.intel
-
-setenv COREPATH /lfs4/HFIP/hfv3gfs/nwprod/NCEPLIBS/modulefiles
-setenv NCEPLIBS /lfs4/HFIP/hfv3gfs/nwprod/NCEPLIBS/modulefiles
-
-module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/18.0.5.274
-module load hpc-impi/2018.4.274
-
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load szip/2.1.1 
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load sp/2.3.3
-module load ip/3.3.3
-module load bacio/2.4.1
-module load sigio/2.3.2
-module load sfcio/1.4.1
-module load nemsio/2.5.2
-module load nemsiogfs/2.5.3
-module load gfsio/1.4.1
-module load landsfcutil/2.4.1
-module load g2/3.4.1
-module load hdf5/1.10.6
-module load netcdf/4.7.4
diff --git a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.orion b/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.orion
deleted file mode 100644
index 6c48eb4df..000000000
--- a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.orion
+++ /dev/null
@@ -1,46 +0,0 @@
-#%Module#####################################################
-## Module file for hafs_hycom_utils
-#############################################################
-proc ModulesHelp { } {
-    puts stderr "Set environment veriables for compiling hycom_utils"
-}
-module-whatis "hycom_utils prerequisites"
-
-module load cmake/3.17.3
-setenv CMAKE_C_COMPILER mpiicc
-setenv CMAKE_CXX_COMPILER mpiicpc
-setenv CMAKE_Fortran_COMPILER mpiifort
-setenv CMAKE_Platform orion.intel
-
-module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-intel/2018.4
-module load hpc-impi/2018.4
-
-module load szip/2.1.1
-
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load g2/3.4.1
-module load g2tmpl/1.9.1
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load sp/2.3.3
-module load ip/3.3.3
-module load bufr/11.4.0
-module load bacio/2.4.1
-module load sigio/2.3.2
-module load sfcio/1.4.1
-module load gfsio/1.4.1
-module load nemsio/2.5.2
-module load nemsiogfs/2.5.3
-module load landsfcutil/2.4.1
-module load crtm/2.3.0
-module load hdf5/1.10.6
-module load netcdf/4.7.4
-#module load hdf5/1.10.5-parallel
-#module load netcdf/4.7.2-parallel
-
diff --git a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.wcoss_cray b/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.wcoss_cray
deleted file mode 100644
index 60d2f9e9b..000000000
--- a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.wcoss_cray
+++ /dev/null
@@ -1,37 +0,0 @@
-#%Module#####################################################
-## Module file for hafs_hycom_utils
-#############################################################
-proc ModulesHelp { } {
-    puts stderr "Set environment veriables for compiling hycom_utils"
-}
-module-whatis "hycom_utils prerequisites"
-
-module load cmake/3.16.2
-module load PrgEnv-intel/5.2.56
-module rm intel
-module load intel/18.1.163
-module load cray-mpich/7.2.0
-module load craype-haswell
-
-module use /usrx/local/dev/modulefiles
-module load HDF5-parallel-intel-sandybridge/1.10.6
-module load NetCDF-intel-sandybridge/4.7.4
-
-module load jasper-gnu-sandybridge/1.900.1
-setenv Jasper_ROOT /usrx/local/prod/jasper/1.900.1/gnu/sandybridge
-module load zlib-intel-sandybridge/1.2.7
-module load png-intel-sandybridge/1.2.49
-setenv PNG_ROOT /usrx/local/prod/png/1.2.49/intel/sandybridge
-
-module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.2.0/modules
-module load bacio/2.4.1
-module load g2/3.4.1
-module load ip/3.3.3
-module load nemsio/2.5.2
-module load nemsiogfs/2.5.3
-module load sp/2.3.3
-module load w3nco/2.4.1
-module load w3emc/2.7.3
-module load sfcio/1.4.1
-module load sigio/2.3.2
-module load bufr/11.4.0
diff --git a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.wcoss_dell_p3 b/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.wcoss_dell_p3
deleted file mode 100644
index 78629f714..000000000
--- a/sorc/hafs_hycom_utils.fd/modulefiles/modulefile.hycom_utils.wcoss_dell_p3
+++ /dev/null
@@ -1,38 +0,0 @@
-#%Module#####################################################
-## Module file for hafs_hycom_utils
-#############################################################
-proc ModulesHelp { } {
-    puts stderr "Set environment veriables for compiling hycom_utils"
-}
-module-whatis "hycom_utils prerequisites"
-
-module load cmake/3.16.2
-setenv CMAKE_C_COMPILER mpiicc
-setenv CMAKE_CXX_COMPILER mpiicpc
-setenv CMAKE_Fortran_COMPILER mpiifort
-setenv CMAKE_Platform wcoss_dell_p3
-
-module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/modulefiles/stack
-
-module load hpc/1.1.0
-module load hpc-ips/18.0.1.163
-module load hpc-impi/18.0.1
-
-module load jasper/2.0.22
-module load zlib/1.2.11
-module load png/1.6.35
-
-module load g2/3.4.1
-module load w3emc/2.7.3
-module load w3nco/2.4.1
-module load sp/2.3.3
-module load ip/3.3.3
-module load bufr/11.4.0
-module load bacio/2.4.1
-module load sigio/2.3.2
-module load sfcio/1.4.1
-module load nemsio/2.5.2
-module load nemsiogfs/2.5.3
-
-module load hdf5/1.10.6
-module load netcdf/4.7.4
diff --git a/sorc/hafs_tools.fd/sorc/build_hafs_utils.sh b/sorc/hafs_tools.fd/sorc/build_hafs_utils.sh
index a8ea68321..cfd36c8de 100755
--- a/sorc/hafs_tools.fd/sorc/build_hafs_utils.sh
+++ b/sorc/hafs_tools.fd/sorc/build_hafs_utils.sh
@@ -83,11 +83,11 @@ _hafsutils_analysis_update (){
 
     # Build the analysis-update application.
 
-    make all >& ${HAFS_UTILS_SORC}/logs/make.analysis-update.log
+    make all
 
     # Move the analysis-update application executable to the HAFS
     # utility application executables path.
-    make install >& ${HAFS_UTILS_SORC}/logs/install.analysis-update.log
+    make install
 }
 
 #----
@@ -126,11 +126,11 @@ _hafsutils_obs_preproc (){
     fi
 
     # Build the obs-preproc application.
-    make all >& ${HAFS_UTILS_SORC}/logs/make.obs-preproc.log
+    make all
 
     # Move the analysis-update application executable to the HAFS
     # utility application executables path.
-    make install >& ${HAFS_UTILS_SORC}/logs/install.obs-preproc.log
+    make install
 }
 
 #----
@@ -199,15 +199,15 @@ _extlib_fftw (){
 
 #    make clean
 
-    ./configure --prefix=${PREFIX} --disable-doc >& ${HAFS_UTILS_EXTLIBS}/logs/configure.fftw.log
+    ./configure --prefix=${PREFIX} --disable-doc
 
     # Build the FFTW application.
 
-    make >& ${HAFS_UTILS_EXTLIBS}/logs/make.fftw.log
+    make
 
     # Install the FFTW application.
 
-    make install >& ${HAFS_UTILS_EXTLIBS}/logs/install.fftw.log
+    make install
 }
 
 #----
@@ -241,15 +241,15 @@ _extlib_shtns (){
     # Configure the compile-time environment for the SHTNS application
     # build.
 
-    ./configure --prefix=${PREFIX} >& ${HAFS_UTILS_EXTLIBS}/logs/configure.shtns.log
+    ./configure --prefix=${PREFIX}
 
     # Build the SHTNS application.
 
-    make >& ${HAFS_UTILS_EXTLIBS}/logs/make.shtns.log
+    make
 
     # Install the SHTNS application.
 
-    make install >& ${HAFS_UTILS_EXTLIBS}/logs/install.shtns.log
+    make install
 }
 
 #----
@@ -296,7 +296,7 @@ build_extlibs (){
     # Build all utility libraries.
 
     _setup_compiler
-    make >& ${HAFS_UTILS_EXTLIBS}/logs/make.ext-libs.log
+    make
 }
 
 #----
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/fson/clean.fson b/sorc/hafs_tools.fd/sorc/hafs_extlibs/fson/clean.fson
deleted file mode 100644
index 188931218..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/fson/clean.fson
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/fson'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/fson'
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridprojs/clean.gridprojs b/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridprojs/clean.gridprojs
deleted file mode 100644
index 4074217d9..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridprojs/clean.gridprojs
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridprojs'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridprojs'
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridtrans/clean.gridtrans b/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridtrans/clean.gridtrans
deleted file mode 100644
index 92f9782e6..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridtrans/clean.gridtrans
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridtrans'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/gridtrans'
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/kdtree/clean.kdtree b/sorc/hafs_tools.fd/sorc/hafs_extlibs/kdtree/clean.kdtree
deleted file mode 100644
index d930eb82c..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/kdtree/clean.kdtree
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/kdtree'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/kdtree'
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/Makefile b/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/Makefile
deleted file mode 100644
index 431472791..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-## path prefix for make install (installs to $(PREFIX)/lib and $(PREFIX)/include)
-PREFIX=/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs
-SED=/usr/bin/sed
-CC=/usr/bin/gcc -march=native
-CFLAGS=-O2 -I/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/include -L/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib -ffast-math -std=gnu99 -L/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib
-LIBS=-lfftw3 -lm 
-PYTHON=
-
-
-## global options for gcc
-## there should be -ffast-math or at least -fcx-limited-range to produce fast code.
-go= $(CFLAGS) -D_GNU_SOURCE
-
-
-# compiler command with options for the sht codelets
-shtcc = $(CC) $(go) -O3
-# compiler command with options for other source (initialization, ...)
-cc = $(CC) $(go) -O2
-fc = ifort $(go) -O2
-
-hfiles = sht_private.h sht_config.h shtns.h
-objs = sht_init.o sht_kernels_a.o sht_fly.o
-libname = libshtns.a
-
-default : libshtns.a
-
-install : install-lib
-
-libshtns.a : Makefile $(objs)
-	ar rcs libshtns.a $(objs)
-	@echo " "
-	@cat COPYRIGHT
-	@echo " "
-	@echo "**** link with : -L/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib -lfftw3 -lm "
-
-install-lib : $(libname)
-	@mkdir -p $(PREFIX)/lib/
-	@mkdir -p $(PREFIX)/include/
-	cp $(libname) $(PREFIX)/lib/$(libname)
-	cp shtns.h $(PREFIX)/include/
-	cp shtns_cuda.h $(PREFIX)/include/
-	cp shtns.f shtns.f03 $(PREFIX)/include/
-	@echo " "
-	@cat COPYRIGHT
-	@echo " "
-	@echo "**** link with : -L$(PREFIX)/lib -L/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib -lfftw3 -lm "
-
-# codelets :
-SHT/SH_to_spat.c : SHT/hyb_SH_to_spat.gen.c
-	$(MAKE) SH_to_spat.c -C SHT SED=$(SED)
-SHT/spat_to_SH.c : SHT/hyb_spat_to_SH.gen.c
-	$(MAKE) spat_to_SH.c -C SHT SED=$(SED)
-SHT/SH_to_spat_fly.c : SHT/fly_SH_to_spat.gen.c
-	$(MAKE) SH_to_spat_fly.c -C SHT SFX=fly SED=$(SED)
-SHT/spat_to_SH_fly.c : SHT/fly_spat_to_SH.gen.c
-	$(MAKE) spat_to_SH_fly.c -C SHT SFX=fly SED=$(SED)
-SHT/SH_to_spat_omp.c : SHT/omp_SH_to_spat.gen.c
-	$(MAKE) SH_to_spat_omp.c -C SHT SFX=omp SED=$(SED)
-SHT/spat_to_SH_omp.c : SHT/omp_spat_to_SH.gen.c
-	$(MAKE) spat_to_SH_omp.c -C SHT SFX=omp SED=$(SED)
-SHT/spat_to_SH_kernel.c : SHT/kernel_spat_to_SH.gen.c
-	$(MAKE) spat_to_SH_kernel.c -C SHT SFX=kernel SED=$(SED)
-
-# objects :
-sht_init.o : sht_init.c Makefile sht_legendre.c sht_func.c sht_com.c $(hfiles)
-	$(cc) -c $< -o $@
-
-sht_mem.o : sht_mem.c Makefile $(hfiles) SHT/SH_to_spat.c SHT/spat_to_SH.c
-	$(shtcc) -c $< -o $@
-sht_fly.o : sht_fly.c Makefile $(hfiles) SHT/SH_to_spat_fly.c SHT/spat_to_SH_fly.c
-	$(shtcc) -c $< -o $@
-sht_omp.o : sht_omp.c Makefile $(hfiles) SHT/SH_to_spat_omp.c SHT/spat_to_SH_omp.c
-	$(shtcc) -c $< -o $@
-sht_kernels_a.o : sht_kernels_a.c Makefile $(hfiles) SHT/spat_to_SH_kernel.c
-	$(shtcc) -c $< -o $@
-sht_gpu.o : sht_gpu.cu sht_gpu_kernels.cu Makefile $(hfiles)
-	nvcc -c sht_gpu.cu -lineinfo -Xptxas=-v 
-
-# programs & Examples
-time_SHT : time_SHT.c $(libname) shtns.h
-	$(cc) time_SHT.c -I. ./$(libname) $(LIBS) -o time_SHT
-
-test_rot : examples/test_rot.c $(libname) shtns.h
-	$(cc) examples/test_rot.c -I. ./$(libname) $(LIBS) -o test_rot
-
-SHT_example : examples/SHT_example.c $(libname) shtns.h
-	$(cc) examples/SHT_example.c -I. ./$(libname) $(LIBS) -o SHT_example
-
-SHT_fort_ex : examples/SHT_example.f $(libname) shtns.f
-	$(fc) -L$(PREFIX)/lib -I$(PREFIX)/include -I. -fdefault-real-8 examples/SHT_example.f ./$(libname) $(LIBS) -lc -o SHT_fort_ex
-SHT_f90_ex : examples/SHT_example.f90 $(libname) shtns.f03
-	$(fc) -L$(PREFIX)/lib -I$(PREFIX)/include -I. -fdefault-real-8 examples/SHT_example.f90 ./$(libname) $(LIBS) -lc -o SHT_f90_ex
-
-wigner : examples/wigner.c $(libname) shtns.h
-	$(cc) examples/wigner.c -I. ./$(libname) $(LIBS) -o wigner
-
-#documentation :
-docs :
-	( cat doc/doxygen.conf ; echo "PROJECT_NUMBER=3.3.1" ) | doxygen -
-
-clean :
-	$(MAKE) clean -C SHT
-	rm -f *.o *.a
-	rm -rf doc/html
-	rm -rf doc/latex
-	rm -rf build
-
-
-# build a python interface using SWIG.
-# use it with "from shtns import *" in a python program/shell
-_shtns.so : shtns_numpy_wrap.c Makefile $(hfiles) $(objs)
-	CC="$(CC)" $(PYTHON) setup.py build
-	@echo "*****************************************************************************************"
-	@echo "*** Now, for system wide install, run 'make install' as root.                           *"
-	@echo "*** Otherwise run '$(PYTHON) setup.py install --user' to install for current user only. *"
-	@echo "*****************************************************************************************"
-
-# generate python and c glue code with SWIG.
-shtns_numpy_wrap.c : shtns_numpy.i sht_private.h shtns.h
-	swig -python shtns_numpy.i
-
-install-py : _shtns.so
-	$(PYTHON) setup.py install
-
-.PHONY : install install-py install-lib clean docs
-
-
-#fftw compiling options :
-#-O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math -fno-schedule-insns -fno-web -fno-loop-optimize --param inline-unit-growth=1000 --param large-function-growth=1000
-
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/config.status b/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/config.status
deleted file mode 100755
index bee9b02f4..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/config.status
+++ /dev/null
@@ -1,1018 +0,0 @@
-#! /bin/sh
-# Generated by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by SHTns $as_me 3.3.1, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-# Files that config.status was made for.
-config_files=" Makefile setup.py"
-config_headers=" sht_config.h"
-
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Report bugs to the package provider.
-SHTns home page: <https://bitbucket.org/nschaeff/shtns>."
-
-ac_cs_config="'--prefix=/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs' 'CC=/usr/bin/gcc' 'LDFLAGS=-L/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib' 'FC=ifort'"
-ac_cs_version="\
-SHTns config.status 3.3.1
-configured by ./configure, generated by GNU Autoconf 2.69,
-  with options \"$ac_cs_config\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns'
-srcdir='.'
-test -n "$AWK" || AWK=awk
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-if $ac_cs_recheck; then
-  set X /bin/sh './configure'  '--prefix=/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs' 'CC=/usr/bin/gcc' 'LDFLAGS=-L/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib' 'FC=ifort' $ac_configure_extra_args --no-create --no-recursion
-  shift
-  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
-  CONFIG_SHELL='/bin/sh'
-  export CONFIG_SHELL
-  exec "$@"
-fi
-
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "sht_config.h") CONFIG_HEADERS="$CONFIG_HEADERS sht_config.h" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "setup.py") CONFIG_FILES="$CONFIG_FILES setup.py" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
-S["LTLIBOBJS"]=""
-S["LIBOBJS"]=""
-S["nvcc_flags"]=""
-S["shtcc_flags"]="-O3"
-S["libname"]="libshtns.a"
-S["objs"]="sht_fly.o"
-S["install"]="install-lib"
-S["target"]="libshtns.a"
-S["ac_ct_FC"]=""
-S["FCFLAGS"]="-g"
-S["FC"]="ifort"
-S["python_inc"]=""
-S["numpy_inc"]=""
-S["OPENMP_CFLAGS"]=""
-S["EGREP"]="/usr/bin/grep -E"
-S["GREP"]="/usr/bin/grep"
-S["CPP"]="/usr/bin/gcc -march=native -E"
-S["SED"]="/usr/bin/sed"
-S["OBJEXT"]="o"
-S["EXEEXT"]=""
-S["ac_ct_CC"]="/usr/bin/gcc"
-S["CPPFLAGS"]=""
-S["LDFLAGS"]="-L/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib"
-S["CFLAGS"]="-O2 -I/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/include -L/scratch1/NCEPDEV/hwrf/save/Biju.T"\
-"homas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib -ffast-math -std=gnu99"
-S["CC"]="/usr/bin/gcc -march=native"
-S["PYTHON"]=""
-S["target_alias"]=""
-S["host_alias"]=""
-S["build_alias"]=""
-S["LIBS"]="-lfftw3 -lm "
-S["ECHO_T"]=""
-S["ECHO_N"]="-n"
-S["ECHO_C"]=""
-S["DEFS"]="-DHAVE_CONFIG_H"
-S["mandir"]="${datarootdir}/man"
-S["localedir"]="${datarootdir}/locale"
-S["libdir"]="${exec_prefix}/lib"
-S["psdir"]="${docdir}"
-S["pdfdir"]="${docdir}"
-S["dvidir"]="${docdir}"
-S["htmldir"]="${docdir}"
-S["infodir"]="${datarootdir}/info"
-S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}"
-S["oldincludedir"]="/usr/include"
-S["includedir"]="${prefix}/include"
-S["localstatedir"]="${prefix}/var"
-S["sharedstatedir"]="${prefix}/com"
-S["sysconfdir"]="${prefix}/etc"
-S["datadir"]="${datarootdir}"
-S["datarootdir"]="${prefix}/share"
-S["libexecdir"]="${exec_prefix}/libexec"
-S["sbindir"]="${exec_prefix}/sbin"
-S["bindir"]="${exec_prefix}/bin"
-S["program_transform_name"]="s,x,x,"
-S["prefix"]="/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs"
-S["exec_prefix"]="${prefix}"
-S["PACKAGE_URL"]="https://bitbucket.org/nschaeff/shtns"
-S["PACKAGE_BUGREPORT"]=""
-S["PACKAGE_STRING"]="SHTns 3.3.1"
-S["PACKAGE_VERSION"]="3.3.1"
-S["PACKAGE_TARNAME"]="shtns"
-S["PACKAGE_NAME"]="SHTns"
-S["PATH_SEPARATOR"]=":"
-S["SHELL"]="/bin/sh"
-_ACAWK
-cat >>"$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-D["PACKAGE_NAME"]=" \"SHTns\""
-D["PACKAGE_TARNAME"]=" \"shtns\""
-D["PACKAGE_VERSION"]=" \"3.3.1\""
-D["PACKAGE_STRING"]=" \"SHTns 3.3.1\""
-D["PACKAGE_BUGREPORT"]=" \"\""
-D["PACKAGE_URL"]=" \"https://bitbucket.org/nschaeff/shtns\""
-D["STDC_HEADERS"]=" 1"
-D["HAVE_SYS_TYPES_H"]=" 1"
-D["HAVE_SYS_STAT_H"]=" 1"
-D["HAVE_STDLIB_H"]=" 1"
-D["HAVE_STRING_H"]=" 1"
-D["HAVE_MEMORY_H"]=" 1"
-D["HAVE_STRINGS_H"]=" 1"
-D["HAVE_INTTYPES_H"]=" 1"
-D["HAVE_STDINT_H"]=" 1"
-D["HAVE_UNISTD_H"]=" 1"
-D["HAVE_STDLIB_H"]=" 1"
-D["HAVE_STDIO_H"]=" 1"
-D["HAVE_STRING_H"]=" 1"
-D["HAVE_MATH_H"]=" 1"
-D["HAVE_COMPLEX_H"]=" 1"
-D["HAVE_LIBM"]=" 1"
-D["HAVE_LIBFFTW3"]=" 1"
-D["SHT_F77_API"]=" 1"
-D["_GCC_VEC_"]=" 1"
-D["SHT_VERBOSE"]=" 1"
-D["HAVE_FFTW_COST"]=" 1"
-D["TIME_WITH_SYS_TIME"]=" 1"
-D["HAVE_SYS_TIME_H"]=" 1"
-D["HAVE_CLOCK_GETTIME"]=" 1"
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*([\t (]|$)/ {
-  line = $ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-  ac_datarootdir_hack='
-  s&@datadir@&${datarootdir}&g
-  s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g
-  s&@infodir@&${datarootdir}/info&g
-  s&@localedir@&${datarootdir}/locale&g
-  s&@mandir@&${datarootdir}/man&g
-  s&\${datarootdir}&${prefix}/share&g' ;;
-esac
-ac_sed_extra="/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}
-
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
- ;;
-
-
-  esac
-
-done # for ac_tag
-
-
-as_fn_exit 0
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/setup.py b/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/setup.py
deleted file mode 100644
index d208a8849..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/shtns/setup.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Python setup
-
-from distutils.core import setup, Extension
-from numpy import get_include
-
-numpy_inc = get_include()		#  NumPy include path.
-objs = "sht_init.o sht_kernels_a.o sht_fly.o"
-shtns_o = objs.split()			# transform to list of objects
-libdir = "/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs"
-if len(libdir) == 0:
-	libdir = []
-else:
-	libdir = [libdir+"/lib"]
-cargs = ""
-largs = "-L/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack/sorc/hafs_tools.fd/sorc/hafs_extlibs/lib"
-libs = "-lfftw3 -lm "
-libslist = libs.replace('-l','').split()	# transform to list of libraries
-
-shtns_module = Extension('_shtns', sources=['shtns_numpy_wrap.c'],
-	extra_objects=shtns_o, depends=shtns_o,
-	extra_compile_args=cargs.split(),
-	extra_link_args=largs.split(),
-	library_dirs=libdir,
-	libraries=libslist,
-	include_dirs=[numpy_inc])
-
-setup(name='SHTns',
-	version='3.3.1',
-	description='High performance Spherical Harmonic Transform',
-	license='CeCILL',
-	author='Nathanael Schaeffer',
-	author_email='nschaeff@ujf-grenoble.fr',
-	url='https://bitbucket.org/nschaeff/shtns',
-	ext_modules=[shtns_module],
-	py_modules=["shtns"],
-	requires=["numpy"],
-	)
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/slatec/clean.slatec b/sorc/hafs_tools.fd/sorc/hafs_extlibs/slatec/clean.slatec
deleted file mode 100644
index f3b2cccfb..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/slatec/clean.slatec
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/slatec'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/slatec'
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/slint/clean.slint b/sorc/hafs_tools.fd/sorc/hafs_extlibs/slint/clean.slint
deleted file mode 100644
index 34dd18d00..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/slint/clean.slint
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/slint'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/slint'
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/sondelib/clean.sondelib b/sorc/hafs_tools.fd/sorc/hafs_extlibs/sondelib/clean.sondelib
deleted file mode 100644
index 6bb24cdbb..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/sondelib/clean.sondelib
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/sondelib'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/sondelib'
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/spline/clean.spline b/sorc/hafs_tools.fd/sorc/hafs_extlibs/spline/clean.spline
deleted file mode 100644
index 23701d99d..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/spline/clean.spline
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/spline'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/spline'
diff --git a/sorc/hafs_tools.fd/sorc/hafs_extlibs/wmm/clean.wmm b/sorc/hafs_tools.fd/sorc/hafs_extlibs/wmm/clean.wmm
deleted file mode 100644
index 954abd21e..000000000
--- a/sorc/hafs_tools.fd/sorc/hafs_extlibs/wmm/clean.wmm
+++ /dev/null
@@ -1,4 +0,0 @@
-make[1]: Entering directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/wmm'
-Makefile:31: ../../configure.ext-libs: No such file or directory
-make[1]: *** No rule to make target `../../configure.ext-libs'.  Stop.
-make[1]: Leaving directory `/scratch1/NCEPDEV/hwrf/save/Biju.Thomas/hafs_cmake_hpc_stack2/sorc/hafs_tools.fd/sorc/hafs_extlibs/wmm'
diff --git a/ush/hafs_pre_job.sh.inc b/ush/hafs_pre_job.sh.inc
index c16f53ebd..179a910cf 100644
--- a/ush/hafs_pre_job.sh.inc
+++ b/ush/hafs_pre_job.sh.inc
@@ -167,7 +167,7 @@ export WHERE_AM_I=${target}
 moduleuse=$HOMEhafs/modulefiles
 if [[ "$moduleuse" != no ]] ; then
   module use $moduleuse 
-  module load modulefile.hafs.run.$WHERE_AM_I
+  module load modulefile.hafs.$WHERE_AM_I
 fi
 
 # Avoild "NetCDF: HDF error"