Correct the GYSELAX tests

GYSELAX/testcase_big/prepare.sh

@@ -30,10 +30,13 @@ fi
 ####################################
 if [ ${ARCH} = 'occigen2' ]; then
     cp ../machines/occigen-bdw/bigtest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/occigen-bdw/env_bench ./
 elif [ ${ARCH} = 'jeanzay' ]; then
     cp ../machines/jean-zay-cpu/bigtest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/jean-zay-cpu/env_bench ./
 elif [ ${ARCH} = 'irene_amd' ]; then
     cp ../machines/irene-amd/bigtest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/irene-amd/env_bench ./
 fi
 
 

GYSELAX/testcase_big/run.sh

@@ -23,5 +23,6 @@ fi
 ####################################
 # RUN SMALLTEST
 ####################################
+source env_bench
 cd $GYSELA_PATH/wk/
 ./subgys bigtest_TKE_A139_n14_dlogTi0.0

GYSELAX/testcase_big/validate.sh

@@ -5,6 +5,9 @@ path=`ls -d ../gysela/wk/*SMALLTEST_TKE*`
 
 if grep -q "1.401556764165E+08" ${path}/gysela_res.out; then
    echo "TEST HAS PASSED: SUCCESSFUL"
+   mkdir results
+   cp ${path}/gysela_res* ./results
+   cp ${path}/gysela_log* ./results
 else
    echo "TEST HAS NOT PASSED: FAIL"
    echo ">>The ion density is not correct"

GYSELAX/testcase_large/prepare.sh

@@ -30,10 +30,13 @@ fi
 ####################################
 if [ ${ARCH} = 'occigen2' ]; then
     cp ../machines/occigen-bdw/scaltest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/occigen-bdw/env_bench ./
 elif [ ${ARCH} = 'jeanzay' ]; then
     cp ../machines/jean-zay-cpu/scaltest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/jean-zay-cpu/env_bench ./
 elif [ ${ARCH} = 'irene_amd' ]; then
     cp ../machines/irene-amd/scaltest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/irene-amd/env_bench ./
 fi
 
 

GYSELAX/testcase_large/run.sh

@@ -23,5 +23,6 @@ fi
 ####################################
 # RUN SMALLTEST
 ####################################
+source env_bench
 cd $GYSELA_PATH/wk/
 ./subgys scaltest_TKE_A139_n14_dlogTi0.0

GYSELAX/testcase_large/validate.sh

@@ -5,6 +5,9 @@ path=`ls -d ../gysela/wk/*SCALTEST_TKE*`
 
 if grep -q "1.363255632198E+08" ${path}/gysela_res.out; then
    echo "TEST HAS PASSED: SUCCESSFUL"
+   mkdir results
+   cp ${path}/gysela_res* ./results
+   cp ${path}/gysela_log* ./results
 else
    echo "TEST HAS NOT PASSED: FAIL"
    echo ">>The ion density is not correct"

GYSELAX/testcase_small/prepare.sh

@@ -31,10 +31,13 @@ fi
 ####################################
 if [ ${ARCH} == 'occigen2' ]; then
     cp ../machines/occigen-bdw/smalltest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/occigen-bdw/env_bench ./
 elif [ ${ARCH} == 'jeanzay' ]; then
     cp ../machines/jean-zay-cpu/smalltest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/jean-zay-cpu/env_bench ./
 elif [ ${ARCH} == 'irene_amd' ]; then
     cp ../machines/irene-amd/smalltest_TKE_A139_n14_dlogTi0.0 $GYSELA_PATH/wk/
+    cp ../machines/irene_amd/env_bench ./
 fi
    
 

GYSELAX/testcase_small/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
-
 ####################################
 # RUN SMALLTEST
 ####################################
+source env_bench
 cd $GYSELA_PATH/wk/
 ./subgys smalltest_TKE_A139_n14_dlogTi0.0

GYSELAX/testcase_small/validate.sh

@@ -5,6 +5,9 @@ path=`ls -d ../gysela/wk/*SMALLTEST_TKE*`
 
 if grep -q "2.081415648206E+04" ${path}/gysela_res.out; then
    echo "TEST HAS PASSED: SUCCESSFUL"
+   mkdir results
+   cp ${path}/gysela_res* ./results
+   cp ${path}/gysela_log* ./results
 else
    echo "TEST HAS NOT PASSED: FAIL"
    echo ">>The ion density is not correct"