From 9fa36f1741a027afbac2c83627393d8952868a2a Mon Sep 17 00:00:00 2001
From: Grant Firl <grant.firl@noaa.gov>
Date: Wed, 9 Feb 2022 15:00:31 -0700
Subject: [PATCH] update Hera setup scripts

---
 scm/etc/Hera_setup_intel.csh | 54 ++----------------------------------
 scm/etc/Hera_setup_intel.sh  | 54 ++----------------------------------
 2 files changed, 6 insertions(+), 102 deletions(-)

diff --git a/scm/etc/Hera_setup_intel.csh b/scm/etc/Hera_setup_intel.csh
index 61e52dd30..2c32de8ba 100755
--- a/scm/etc/Hera_setup_intel.csh
+++ b/scm/etc/Hera_setup_intel.csh
@@ -28,54 +28,6 @@ setenv CMAKE_CXX_COMPILER icpc
 setenv CMAKE_Fortran_COMPILER ifort
 setenv CMAKE_Platform hera.intel
 
-echo "Loading the anaconda python distribution"
-module use -a /contrib/anaconda/modulefiles
-module load anaconda/anaconda3-4.4.0
-
-#install f90nml for the local user
-
-#check to see if f90nml is installed locally
-echo "Checking if f90nml python module is installed"
-python -c "import f90nml"
-
-if ( $? != 0 ) then
-	echo "Not found; installing f90nml"
-	pip install -e git://github.com/marshallward/f90nml.git@v0.19\#egg=f90nml --user
-else
-	echo "f90nml is installed"
-endif
-
-#install shapely for the local user
-
-#check to see if shapely is installed locally
-echo "Checking if shapely python module is installed"
-python -c "import shapely"
-
-if ( $? != 0 ) then
-	echo "Not found; installing shapely"
-	pip install --index-url http://anaconda.rdhpcs.noaa.gov/simple --trusted-host anaconda.rdhpcs.noaa.gov shapely --user
-else
-	echo "shapely is installed"
-endif
-
-#check to see if configobj is installed locally
-echo "Checking if configobj python module is installed"
-python -c "import configobj"
-
-if ( $? != 0 ) then
-	echo "Not found; installing configobj"
-	pip install --index-url http://anaconda.rdhpcs.noaa.gov/simple --trusted-host anaconda.rdhpcs.noaa.gov configobj --user
-else
-	echo "configobj is installed"
-endif
-
-#check to see if netCDF4 is installed locally
-echo "Checking if netCDF4 python module is installed"
-python -c "import netCDF4"
-
-if ( $? != 0 ) then
-	echo "Not found; installing netCDF4"
-	pip install --index-url http://anaconda.rdhpcs.noaa.gov/simple --trusted-host anaconda.rdhpcs.noaa.gov netCDF4 --user
-else
-	echo "netCDF4 is installed"
-endif
+echo "Loading the SCM python environment"
+source /scratch1/BMC/gmtb/SCM_anaconda/etc/profile.d/conda.csh
+conda activate pyccpp
diff --git a/scm/etc/Hera_setup_intel.sh b/scm/etc/Hera_setup_intel.sh
index 62609db50..57560b50e 100755
--- a/scm/etc/Hera_setup_intel.sh
+++ b/scm/etc/Hera_setup_intel.sh
@@ -25,54 +25,6 @@ export CMAKE_CXX_COMPILER=icpc
 export CMAKE_Fortran_COMPILER=ifort
 export CMAKE_Platform=hera.intel
 
-echo "Loading the anaconda python distribution"
-module use -a /contrib/anaconda/modulefiles
-module load anaconda/anaconda3-4.4.0
-
-#install f90nml for the local user
-
-#check to see if f90nml is installed locally
-echo "Checking if f90nml python module is installed"
-python -c "import f90nml"
-
-if [ $? -ne 0 ]; then
-	echo "Not found; installing f90nml"
-	pip install -e git://github.com/marshallward/f90nml.git@v0.19#egg=f90nml --user
-else
-	echo "f90nml is installed"
-fi
-
-#install shapely for the local user
-
-#check to see if shapely is installed locally
-echo "Checking if shapely python module is installed"
-python -c "import shapely"
-
-if [ $? -ne 0 ]; then
-	echo "Not found; installing shapely"
-	pip install --index-url http://anaconda.rdhpcs.noaa.gov/simple --trusted-host anaconda.rdhpcs.noaa.gov shapely --user
-else
-	echo "shapely is installed"
-fi
-
-#check to see if configobj is installed locally
-echo "Checking if configobj python module is installed"
-python -c "import configobj"
-
-if [ $? -ne 0 ]; then
-	echo "Not found; installing configobj"
-	pip install --index-url http://anaconda.rdhpcs.noaa.gov/simple --trusted-host anaconda.rdhpcs.noaa.gov configobj --user
-else
-	echo "configobj is installed"
-fi
-
-#check to see if netCDF4 is installed locally
-echo "Checking if netCDF4 python module is installed"
-python -c "import netCDF4"
-
-if [ $? -ne 0 ]; then
-	echo "Not found; installing netCDF4"
-	pip install --index-url http://anaconda.rdhpcs.noaa.gov/simple --trusted-host anaconda.rdhpcs.noaa.gov netCDF4 --user
-else
-	echo "netCDF4 is installed"
-fi
+echo "Loading the SCM python environment"
+. "/scratch1/BMC/gmtb/SCM_anaconda/etc/profile.d/conda.sh"
+conda activate pyccpp