Merge pull request #313 from grantfirl/hpc_stack_build_system_run_scm…

…_updates_gjf

Hpc stack build system run scm updates + Grant mods

.gitmodules

@@ -6,3 +6,7 @@
 	path = ccpp/physics
 	url = https://github.com/NCAR/ccpp-physics
 	branch = main
+[submodule "CMakeModules"]
+	path = CMakeModules
+	url = https://github.com/noaa-emc/CMakeModules
+	branch = develop

contrib/get_mg_inccn_data.sh

@@ -12,6 +12,8 @@ BASEDIR=$MYDIR/..
 
 # Change to directory containing the physics input data, download and extract archive
 cd $BASEDIR/scm/data/physics_input_data/
-wget https://github.com/NCAR/gmtb-scm/releases/download/v5.0.0-alpha/MG_INCCN_data.tar
+wget https://github.com/NCAR/ccpp-scm/releases/download/v5.0.0-alpha/MG_INCCN_data.tar
 tar -xvf MG_INCCN_data.tar
 rm -f MG_INCCN_data.tar
+cd $BASEDIR/
+

contrib/get_thompson_tables.sh

@@ -15,3 +15,5 @@ cd $BASEDIR/scm/data/physics_input_data/
 wget https://github.com/NCAR/ccpp-scm/releases/download/v5.0.0/thompson_tables2.tar
 tar -xvf thompson_tables2.tar
 rm -f thompson_tables2.tar
+cd $BASEDIR/
+

scm/etc/CENTOS_docker_setup.sh

@@ -2,7 +2,9 @@
 
 echo "Setting environment variables for SCM-CCPP on CENTOS with gcc/gfortran"
 
-export SCM_ROOT=$PWD
+MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+
+export SCM_ROOT=$MYDIR/../..
 
 export CC=/opt/rh/devtoolset-9/root/usr/bin/gcc
 export CXX=/opt/rh/devtoolset-9/root/usr/bin/g++

scm/etc/Cheyenne_setup_gnu.csh

@@ -2,7 +2,17 @@
 
 echo "Setting environment variables for CCPP-SCM on Cheyenne with gcc/gfortran"
 
-setenv SCM_ROOT $PWD
+set called=($_)
+
+if ( "$called" != "") then  ### called by source
+    set MYSCRIPT=`readlink -f -n $called[2]`
+else                        ### called by direct execution of the script
+    set MYSCRIPT=`readlink -f -n '$0'`
+endif
+set MYDIR=`dirname $MYSCRIPT`
+set MYDIR=`cd $MYDIR && pwd -P`
+
+setenv SCM_ROOT $MYDIR/../..
 
 #start with a "clean" environment; activate and deactivate ncar_pylib in order to successfully deactivate previously activated environment without errors
 module load ncarenv/1.3

scm/etc/Cheyenne_setup_gnu.sh

@@ -2,7 +2,9 @@
 
 echo "Setting environment variables for CCPP-SCM on Cheyenne with gcc/gfortran"
 
-export SCM_ROOT=$PWD
+MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+
+export SCM_ROOT=$MYDIR/../..
 
 #start with a "clean" environment; activate and deactivate ncar_pylib in order to successfully deactivate previously activated environment without errors
 module load ncarenv/1.3

scm/etc/Cheyenne_setup_intel.csh

@@ -2,7 +2,17 @@
 
 echo "Setting environment variables for CCPP-SCM on Cheyenne with icc/ifort"
 
-setenv SCM_ROOT $PWD
+set called=($_)
+
+if ( "$called" != "") then  ### called by source
+    set MYSCRIPT=`readlink -f -n $called[2]`
+else                        ### called by direct execution of the script
+    set MYSCRIPT=`readlink -f -n '$0'`
+endif
+set MYDIR=`dirname $MYSCRIPT`
+set MYDIR=`cd $MYDIR && pwd -P`
+
+setenv SCM_ROOT $MYDIR/../..
 
 #start with a "clean" environment; activate and deactivate ncar_pylib in order to successfully deactivate previously activated environment without errors
 module load ncarenv/1.3

scm/etc/Cheyenne_setup_intel.sh

@@ -2,7 +2,9 @@
 
 echo "Setting environment variables for CCPP-SCM on Cheyenne with icc/ifort"
 
-export SCM_ROOT=$PWD
+MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+
+export SCM_ROOT=$MYDIR/../..
 
 #start with a "clean" environment; activate and deactivate ncar_pylib in order to successfully deactivate previously activated environment without errors
 module load ncarenv/1.3

scm/etc/Desktop_setup_gfortran.csh

@@ -2,7 +2,17 @@
 
 echo "Setting environment variables for CCPP-SCM on Desktop (MacOS) with gcc/gfortran"
 
-setenv SCM_ROOT $PWD
+set called=($_)
+
+if ( "$called" != "") then  ### called by source
+    set MYSCRIPT=`readlink -f -n $called[2]`
+else                        ### called by direct execution of the script
+    set MYSCRIPT=`readlink -f -n '$0'`
+endif
+set MYDIR=`dirname $MYSCRIPT`
+set MYDIR=`cd $MYDIR && pwd -P`
+
+setenv SCM_ROOT $MYDIR/../..
 
 echo "Setting CC/CXX/FC environment variables"
 setenv CC /opt/local/bin/gcc-mp-10

scm/etc/Desktop_setup_gfortran.sh

@@ -2,7 +2,13 @@
 
 echo "Setting environment variables for CCPP-SCM on Desktop (MacOS) with gcc/gfortran"
 
-export SCM_ROOT=$PWD
+if [[ $(uname -s) == Darwin ]]; then
+  MYDIR=$(cd "$(dirname "$(greadlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+else
+  MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+fi
+
+export SCM_ROOT=$MYDIR/../..
 
 echo "Setting CC/CXX/FC environment variables"
 export CC=/opt/local/bin/gcc-mp-10

scm/etc/Hera_setup_intel.csh

@@ -2,7 +2,17 @@
 
 echo "Setting environment variables for CCPP-SCM on Hera with icc/ifort"
 
-setenv SCM_ROOT $PWD
+set called=($_)
+
+if ( "$called" != "") then  ### called by source
+    set MYSCRIPT=`readlink -f -n $called[2]`
+else                        ### called by direct execution of the script
+    set MYSCRIPT=`readlink -f -n '$0'`
+endif
+set MYDIR=`dirname $MYSCRIPT`
+set MYDIR=`cd $MYDIR && pwd -P`
+
+setenv SCM_ROOT $MYDIR/../..
 
 #load the modules in order to compile the CCPP SCM
 echo "Loading intel and netcdf modules..."

scm/etc/Hera_setup_intel.sh

@@ -2,7 +2,9 @@
 
 echo "Setting environment variables for CCPP-SCM on Hera with icc/ifort"
 
-export SCM_ROOT=$PWD
+MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+
+export SCM_ROOT=$MYDIR/../..
 
 #load the modules in order to compile the CCPP SCM
 echo "Loading intel and netcdf modules..."