Changeset 5280 for branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting.env

Timestamp:

2015-05-15T19:55:34+02:00 (9 years ago)

Author:

nicolasmartin

Message:

dev_r5092_CNRS_SETTE Updates

File:

• branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting.env (modified) (3 diffs)

branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/SETTE/trusting.env

@@ -6 +6 @@
 export DATESTR=$( LC_ALL=C date -d"${date_test}" +%Y%m%dT%H%M )
 
+# External softs directories
+export DIR_XIOS=${DIR_WORK}/XIOS/xios-1.0 DIR_OASI=${DIR_WORK}/OASIS
+
+# Environment architecture (XIOS for compliance)
+. ${DIR_XIOS}/arch/arch-${ARCH}.env
+
 # Super-computers configuration
 if   [ $USER == ${IDRIS_ID} ]; then 
-    ARCH=X64_ADA_trust
+    ARCH=X64_ADA_trust  ; COMPILER=ifort; MPI=intel
     # Job commands : LoadLeveler
     JOB_SUB=llsubmit; JOB_LIST=llq    ; JOB_VIEW='llq -xl'; JOB_DEL=llcancel                          
-    # Directories $HOME $WORKDIR $COMMONDIR $TMPDIR
+    # Directories $HOME $WORKDIR $COMMONDIR $TMPDIR     ergon
     DIR_WORK=$WORKDIR   ; DIR_SCRA=$TMPDIR/trusting    ; DIR_STOR=trusting_sav
 elif [ $USER == ${TGCC_ID}  ]; then
-    ARCH=X64_CURIE_trust
+    ARCH=X64_CURIE_trust; COMPILER=ifort; MPI=bullxmpi
     # Job commands : ccc_*
     JOB_SUB=ccc_msub; JOB_LIST=ccc_mpp; JOB_VIEW=ccc_macct; JOB_DEL=ccc_mdel                          
@@ -20 +26 @@
     DIR_WORK=$CCCWORKDIR; DIR_SCRA=$SCRATCHDIR/trusting; DIR_STOR=$CCCSTOREDIR/trusting_sav
 else
-    ARCH=''
+    ARCH=''             ; COMPILER=''   ; MPI=''
     JOB_SUB=''      ; JOB_LIST=''     ; JOB_VIEW=''       ; JOB_DEL=''                                
     DIR_WORK=''      ; DIR_SCRA=''                  ; DIR_STOR=''
 fi
 
-export ARCH
+[ -z "$FC" ] && COMPILER=$FC
+
+export ARCH     COMPILER MPI
 export JOB_SUB  JOB_LIST JOB_VIEW JOB_DEL 
 export DIR_WORK DIR_SCRA DIR_STOR 
@@ -38 +46 @@
 export NEMO_FORC=${DIR_WORK}/NEMO/FORC FORC_TAR=ORCA2_LIM_nemo_v3.6.tar
 
-# External softs directories
-export DIR_XIOS=${DIR_WORK}/XIOS/xios-1.0 DIR_OASI=${DIR_WORK}/OASIS
-
-# Environment architecture (XIOS for compliance)
-. ${DIR_XIOS}/arch/arch-${ARCH}.env
-
 # Comparatives directories localization
-DIR_REFE=${DIR_STOR}/${CONF_REF}/${NEMO_BRAN}
-DIR_TEST=${DIR_SCRA}/${CONF_REF}/${NEMO_BRAN}/trusting_${DATESTR}
+DIR_REFE=${DIR_STOR}/${CONF_REFE}/${NEMO_BRAN}
+DIR_TEST=${DIR_SCRA}/${CONF_REFE}/${NEMO_BRAN}/trusting_${DATESTR}
 export DIR_REFE DIR_TEST