update to start getting rid of HOSTTYPE variable, using machine argument instead

YALES2BIO/machines/jean-zay-cpu/jeanzay_testcase_big.batch → YALES2BIO/machines/jean-zay-cpu/testcase_big.batch

@@ -11,7 +11,7 @@
 #SBATCH --error yales2bio_smalltests.err
 #SBATCH -A qbg@cpu
 
-source $YALES2_HOME/../machines/jean-zay-cpu/env_bench
+source env_bench
 
 export cores=920
 

YALES2BIO/machines/occigen-bdw/occigen_testcase_big.batch → YALES2BIO/machines/occigen-bdw/testcase_big.batch

@@ -8,7 +8,7 @@
 #SBATCH --output yales2bio_testcase_big.log
 #SBATCH --error yales2bio_testcase_big.err
 
-source $YALES2_HOME/../machines/occigen-bdw/env_bench
+source env_bench
 module load vtune/2019.2
 
 export cores=896

YALES2BIO/testcase_big/prepare.sh

@@ -35,14 +35,9 @@ make 1>makeSmallCase.out 2>makeSmallCase.err
 ####################################
 # COPY THE BATCH FILE
 ####################################
-if [ $YALES2_HOSTTYPE == 'occigen' ]; then
-   machine=occigen-bdw
-elif [ $YALES2_HOSTTYPE == 'jeanzay' ]; then
-   machine='jean-zay-cpu'
-fi
 rm *.batch
-cp ../machines/$machine/env_bench ./
-cp ../machines/$machine/${YALES2_HOSTTYPE}_testcase_big.batch ./
+cp ../machines/$1/env_bench ./
+cp ../machines/$1/testcase_big.batch ./
 
 ####################################
 # COPY THE RESTART FOLDER

YALES2BIO/testcase_big/run.sh

-
-####################################
-# Source the right environment
-####################################
-if [ -z "$1" ]
-  then
-    echo "Please provide the targeted machine from:"
-    ls machines/
-    echo ""
-    echo "Example: ./run.sh occigen-bdw"
-    exit 1
-fi
-env_file="../machines/$1/env_bench"
-
-if [ ! -f $env_file ]
-        then
-    echo "ERROR: $env_file not found!"
-                exit 1
-        else
-                source $env_file
-fi
-
-###########################################
-# LAUNCH THE TEST CASE
-###########################################
-source env_bench
-if [ $YALES2_HOSTTYPE == 'occigen' ]; then
-   sbatch ${YALES2_HOSTTYPE}_testcase_big.batch
-elif [ $YALES2_HOSTTYPE == 'jeanzay' ]; then
-   sbatch ${YALES2_HOSTTYPE}_testcase_big.batch
-fi
-
+#!/bin/bash   
+sbatch testcase_big.batch