IRENE to IRENE-skylake header

scripts/IRENE.env → scripts/IRENE-skylake.env

 
-#############################     from IRENE.env   #############################
+#############################     from IRENE-skylake.env   #############################
 
 export WORKDIR=${CCCWORKDIR}
 export SCRATCHDIR=${CCCSCRATCHDIR}

scripts/IRENE.header → scripts/IRENE-skylake.header

 #!/bin/bash
 
-#############################   from IRENE.header  #############################
+#############################   from IRENE-skylake.header  #############################
 #===============================================================================
-#                  IRENE.header to submit a MPI batch job 
+#                  IRENE-skylake.header to submit a MPI batch job 
 #===============================================================================
 
 #=======  Job name & ascii output

scripts/namelist_exp.sh

@@ -4,12 +4,26 @@
 #  Namelist for the experiment
 #===============================================================================
 
+#-------------------------------------------------------------------------------
+#  Which Computer?
+#-------------------------------------------------------------------------------
+
+export NODE='skylake'    # just for IRENE  ("skylake" for intel OR "rome" for AMD)
+
+if [ `hostname  |cut -c 1-5` == "irene" ]; then
+#  export NODE=`/usr/bin/grep 'MSUB' IRENE.header | /usr/bin/grep '\-q' | awk -v var=2 -F"-q" '{print $var}'`
+   export COMPUTER="IRENE-${NODE}"
+   export QSUB="ccc_msub"
+elif [ `hostname  |cut -c 1-8` == "jean-zay" ]; then
+   export QSUB="sbatch"
+   export COMPUTER="JEAN-ZAY"
+fi
 
 #-------------------------------------------------------------------------------
 #  Config : Ocean - Atmosphere - Coupling
 #-------------------------------------------------------------------------------
 export CONFIG=`pwd | awk -F"/" '{print $(NF-3)}'`
-export TITLE_EXP="Config Senegal can11sen2   ("`date "+%d %m %Y"`")"
+export TITLE_EXP="Config Senegal can11sen2   ("`date "+%d %m %Y"`" on ${COMPUTER})"
 
 #-------------------------------------------------------------------------------
 #  Debug Modes
@@ -21,7 +35,8 @@ export MODE_TEST=true   #  for running different tests in the same exp with diff
 #  export TEST_NAME="_test_avec_AGRIF_6x24_undef_BIO_HADV_WENO5"
 #  export TEST_NAME="_verif_croco.in_v2.00-THETA_B_0.00"
 #  export TEST_NAME="_001_verif"
-   export TEST_NAME="_bench01_agrif_pisces_2tsp"
+#  export TEST_NAME="_bench01_agrif_pisces_2tsp-options_OPTIM"
+   export TEST_NAME="_bench01_agrif_pisces_2tsp_options_DEBUG"
 
 export TEST_SCRIPT=false       #  the job is not submited     
 
@@ -143,16 +158,3 @@ export    ASCII_DIR_IMG_ROOT="init"
 export    ASCII_DIR_IMG="${ASCII_DIR_IMG_ROOT}${TEST_NAME}" 
 export    SAV_OLD_PROD="production_${OLD}"
 
-#-------------------------------------------------------------------------------
-#  Which Computer?
-#-------------------------------------------------------------------------------
-if [ `hostname  |cut -c 1-5` == "irene" ]; then
-   export QSUB="ccc_msub"
-   export COMPUTER="IRENE"
-elif [ `hostname  |cut -c 1-8` == "jean-zay" ]; then
-   export QSUB="sbatch"
-   export COMPUTER="JEAN-ZAY"
-fi
-
-
-