Changeset 8826 for branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting.env

Timestamp:

2017-11-27T17:49:45+01:00 (6 years ago)

Author:

nicolasmartin

Message:

Continuation of global refactoring of the tool: bugfixes, adjust cfg files mime property and default settings, improve error management

File:

• branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting.env (modified) (9 diffs)

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting.env

@@ -19 +19 @@
 fi
 
-## Forcing archive unset
-#if [[ ! ${TRUST_IO_FORC_TAR} && ${TRUST_IO_FORC_TAR-_} ]]; then
-
-    ## Forcing directory set
-#    if [ ${TRUST_IO_FORC_PATH} ]; then
-
-   ## Default forcing archive from trunk
-#  TRUST_IO_FORC_TAR='ORCA2_LIM_nemo_v3.7.tar INPUTS_PISCES_v3.6st.tar'
-
-#  [ ${TRUST_CFG_REF} == 'AMM12' ] && TRUST_IO_FORC_TAR='AMM12_v3.7.tar'
-
-#  if [ ${TRUST_SVN_BRANCH} == 'nemo_v3_6_STABLE' ]; then
-
-#      TRUST_IO_FORC_TAR='ORCA2_LIM_nemo_v3.6.tar'
-
-#      if   [ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES' ]; then
-#     TRUST_IO_FORC_TAR='INPUTS_ORCA1_LIM3_PISCES_V10.tar'
-#      elif [ ${TRUST_CFG_REF} == 'AMM12'             ]; then
-#     TRUST_IO_FORC_TAR='AMM12_v3.6.tar'
-#      fi
-
-#  fi
-
-#    fi
-
-#fi
-
 
 ## Source user & (super)computer configurations
@@ -61 +34 @@
 [ -z "${TRUST_DIR_WORK}"    ] &&    TRUST_DIR_WORK=${TRUST_MAIN_DIR}/../CONFIG
 [ -z "${TRUST_DIR_SCRATCH}" ] && TRUST_DIR_SCRATCH=${TRUST_MAIN_DIR}
-
 export TRUST_DIR_WORK TRUST_DIR_SCRATCH TRUST_DIR_STORE
 
@@ -69 +41 @@
 
 export TRUST_SVN_REPO='https://forge.ipsl.jussieu.fr/nemo/svn'
-
-export TRUST_SVN_CO=( 'ARCH           CONFIG          NEMO               \
-                       EXTERNAL/AGRIF EXTERNAL/fcm    EXTERNAL/IOIPSL    \
-                       TOOLS/COMPILE  TOOLS/maketools TOOLS/REBUILD_NEMO \
-                       TRUST                                              ' )
+export TRUST_SVN_CO=( 'ARCH           CONFIG          NEMO              
+                       EXTERNAL/AGRIF EXTERNAL/fcm    EXTERNAL/IOIPSL   
+                       TOOLS/COMPILE  TOOLS/maketools TOOLS/REBUILD_NEMO
+                       TRUST                                            ' )
+export TRUST_SVN_UP=( 'ARCH           CONFIG          NEMO           
+                       EXTERNAL/AGRIF EXTERNAL/fcm    EXTERNAL/IOIPSL
+                       TOOLS/COMPILE                                 ' )
 
 export TRUST_SVN_BRANCH
-
 export TRUST_SVN_NEMOGCM=${TRUST_DIR_WORK}/${TRUST_SVN_BRANCH}/NEMOGCM
 
@@ -83 +56 @@
 ##-------------------
 
-## Ref. cfg. unset or empty (mandatory)
-#if [[ -z "${TRUST_CFG_REF}" ]]; then
-
-    ## Default cfg from trunk excepting last stable
-#    TRUST_CFG_REF='ORCA2_LIM3_PISCES'
-
-#    if [ ${TRUST_SVN_BRANCH} == 'nemo_v3_6_STABLE' ]; then
-#  TRUST_CFG_REF='ORCA2_LIM_PISCES'
-#    fi
-
-#fi
-
 ## Forcing archive unset
 if [[ ! ${TRUST_IO_FORC_TAR} && ${TRUST_IO_FORC_TAR-_} ]]; then
@@ -100 +61 @@
     ## Forcing directory set
     if [ ${TRUST_IO_FORC_PATH} ]; then
-
    ## Default forcing archive from trunk
    TRUST_IO_FORC_TAR='ORCA2_LIM_nemo_v3.7.tar INPUTS_PISCES_v3.6st.tar'
-
    [ ${TRUST_CFG_REF} == 'AMM12' ] && TRUST_IO_FORC_TAR='AMM12_v3.7.tar'
 
    if [ ${TRUST_SVN_BRANCH} == 'nemo_v3_6_STABLE' ]; then
-
        TRUST_IO_FORC_TAR='ORCA2_LIM_nemo_v3.6.tar'
 
@@ -123 +81 @@
 
 [ -z "${TRUST_CFG_NEW}" ] && TRUST_CFG_NEW=${TRUST_CFG_REF}'_trust'
-
 export TRUST_CFG_NEW TRUST_CFG_REF
-export TRUST_IO_FORC_TAR
-
 export TRUST_CFG_KEY_ADD TRUST_CFG_KEY_DEL
 
@@ -133 +88 @@
 ## --------------
 
-[ -z "${TRUST_IO_XIOS}" ] && get_out X
-export TRUST_IO_XIOS TRUST_IO_FORC_PATH
+[ -z "${TRUST_IO_XIOS}" ] && get_out A
+export TRUST_IO_XIOS
+export TRUST_IO_FORC_PATH TRUST_IO_FORC_TAR
 export TRUST_IO_CDO
 
@@ -141 +97 @@
 ##----------------------
 
+if [ -z "${TRUST_JOB_ENV}" ]; then
+    TRUST_JOB_ENV=${TRUST_IO_XIOS}/arch/arch-${TRUST_MAIN_HPCC}.env
+fi
+
 export TRUST_JOB_ENV
-export TRUST_COMPILE_FORTRAN TRUST_COMPILE_NPROC
-export TRUST_COMPILE_MPI     TRUST_COMPILE_NETCDF
-export TRUST_JOB_SCRIPT TRUST_JOB_SUBMIT 
-export TRUST_JOB_STATE  TRUST_JOB_KILL   TRUST_JOB_TIMEOUT
-export TRUST_JOB_INFO   TRUST_JOB_TIME   TRUST_JOB_RAM_P   TRUST_JOB_RAM_V
+
+[ -z "${TRUST_COMPILE_NPROC}" ] && TRUST_COMPILE_NPROC='4'
+export TRUST_COMPILE_NPROC
+
+export TRUST_COMPILE_FORTRAN TRUST_COMPILE_MPI TRUST_COMPILE_NETCDF
+
+if [ -z "${TRUST_JOB_SCRIPT}" ]; then
+    TRUST_JOB_SCRIPT=${TRUST_MAIN_DIR}/batch/${TRUST_MAIN_HPCC}.sh || get_out A
+fi
+
+export TRUST_JOB_SCRIPT 
+
+
+if [[ -z "${TRUST_JOB_SUBMIT}" || -z "${TRUST_JOB_STATE}" \
+                               || -z "${TRUST_JOB_KILL}"    ]]; then
+    get_out A
+fi
+
+export TRUST_JOB_SUBMIT TRUST_JOB_STATE TRUST_JOB_KILL
+
+[ -z "${TRUST_JOB_TIMEOUT}" ] && TRUST_JOB_TIMEOUT='10800'
+export TRUST_JOB_TIMEOUT
+
+export TRUST_JOB_INFO TRUST_JOB_TIME TRUST_JOB_RAM_P TRUST_JOB_RAM_V
 
 
@@ -160 +139 @@
 ##       TRUST_TEST_DIR unset
 if [[ ! ${TRUST_TEST_DIR}       && ${TRUST_TEST_DIR-_}       ]]; then
-        TRUST_TEST_DIR=${TRUST_DIR_SCRATCH}/${TRUST_CFG_REF}/${TRUST_SVN_BRANCH}/${TRUST_TEST_DATE}
+        TRUST_TEST_DIR=${TRUST_DIR_SCRATCH}/${TRUST_CFG_REF}/${TRUST_SVN_BRANCH}
+        TRUST_TEST_DIR+=/${TRUST_TEST_DATE}
     export TRUST_TEST_DIR
 fi