Merge pull request #365 from E3SM-Project/jgfouca/descream_ekat

De-scream a few things in EKAT

scripts/jenkins/jenkins.sh

@@ -16,7 +16,7 @@ export WORK_DIR=$(pwd)
 export SCREAM_SCRIPTS=${WORK_DIR}/scream/components/eamxx/scripts
 export JENKINS_SCRIPT_DIR=${SCREAM_SCRIPTS}/jenkins # some scream env setups depend on this
 source ${SCREAM_SCRIPTS}/jenkins/${NODE_NAME}_setup
-source ${SCREAM_SCRIPTS}/source_to_load_scream_env.sh
+source ${SCREAM_SCRIPTS}/source_to_load_eamxx_env.sh
 
 if [ -z "$SCREAM_MACHINE" ]; then
     echo "SCREAM_MACHINE must be set by ${SCREAM_SCRIPTS}/jenkins/${NODE_NAME}_setup in order for jenkins infrastructure to work"
@@ -25,7 +25,7 @@ fi
 
 export SCREAM_MACHINE
 
-BATCHP=$(${SCREAM_SCRIPTS}/query-scream $SCREAM_MACHINE batch)
+BATCHP=$(${SCREAM_SCRIPTS}/query-eamxx $SCREAM_MACHINE batch)
 
 set -o pipefail
 $BATCHP $EKAT_JENKINS_SCRIPT_DIR/jenkins_impl.sh 2>&1 | tee JENKINS_$DATE_STAMP

scripts/jenkins/jenkins_impl.sh

@@ -12,12 +12,12 @@ if [ $? -ne 0 ]; then
 fi
 
 # Query scream for machine info
-MPICXX=$(${SCREAM_SCRIPTS}/query-scream $SCREAM_MACHINE cxx_compiler)
-MPICC=$(${SCREAM_SCRIPTS}/query-scream $SCREAM_MACHINE c_compiler)
-MPIF90=$(${SCREAM_SCRIPTS}/query-scream $SCREAM_MACHINE f90_compiler)
-COMP_J=$(${SCREAM_SCRIPTS}/query-scream $SCREAM_MACHINE comp_j)
-TEST_J=$(${SCREAM_SCRIPTS}/query-scream $SCREAM_MACHINE test_j)
-ISCUDA=$(${SCREAM_SCRIPTS}/query-scream $SCREAM_MACHINE cuda)
+MPICXX=$(${SCREAM_SCRIPTS}/query-eamxx $SCREAM_MACHINE cxx_compiler)
+MPICC=$(${SCREAM_SCRIPTS}/query-eamxx $SCREAM_MACHINE c_compiler)
+MPIF90=$(${SCREAM_SCRIPTS}/query-eamxx $SCREAM_MACHINE f90_compiler)
+COMP_J=$(${SCREAM_SCRIPTS}/query-eamxx $SCREAM_MACHINE comp_j)
+TEST_J=$(${SCREAM_SCRIPTS}/query-eamxx $SCREAM_MACHINE test_j)
+ISCUDA=$(${SCREAM_SCRIPTS}/query-eamxx $SCREAM_MACHINE cuda)
 
 # We create separate builds for single precision (SP), double precision (DP),
 # DP with floating point exceptions enabled (FPE), and, on CUDA, DP with