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

Timestamp:

2017-11-29T12:20:30+01:00 (6 years ago)

Author:

nicolasmartin

Message:

Review forcing inputs management + cosmetic changes

File:

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

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

@@ -12 +12 @@
 ##-------------------------------------------------------------------
 
-if [ ${TRUST_FLAG_DEBUG} == 'true' ]; then
+if [ ${TRUST_FLAG_DEBUG} == 'false' ]; then
+    ## std mode (merge stdout & stderr to /dev/null, XIOS compilation from scratch)
+    TRUST_IO_XIOS_MODE='--full'
+    TRUST_MAIN_STDOUT='>& /dev/null'
+else
     ## debug mode (verbose output and skip XIOS compilation)
     TRUST_IO_XIOS_MODE=''
     TRUST_MAIN_STDOUT='1> /dev/null'
-else
-    ## std mode (merge stdout & stderr to /dev/null, XIOS compilation from scratch)
-    TRUST_IO_XIOS_MODE='--full'
-    TRUST_MAIN_STDOUT='>& /dev/null'
 fi
 
@@ -101 +101 @@
 ##-------------------
 
-## Forcing archive unset
-if [[ ! ${TRUST_IO_FORC_TAR} && ${TRUST_IO_FORC_TAR-_} ]]; then
-
-    ## Forcing directory set
-    if [ ${TRUST_IO_FORC_PATH} ]; then
+[ -z "${TRUST_CFG_NEW}" ] && TRUST_CFG_NEW=${TRUST_CFG_REF}'_trust'
+export TRUST_CFG_NEW TRUST_CFG_REF
+export TRUST_CFG_KEY_ADD TRUST_CFG_KEY_DEL
+
+
+## Inputs/Outputs
+## --------------
+
+[ -z "${TRUST_IO_XIOS}" ] && get_out A
+export TRUST_IO_XIOS
+
+## Forcing directory set and not empty
+if [ ${TRUST_IO_FORC_PATH} ]; then
+
+    ## Forcing archive unset
+    if [[ ! ${TRUST_IO_FORC_TAR} && ${TRUST_IO_FORC_TAR-_} ]]; then
+
    ## Default forcing archive from trunk
    TRUST_IO_FORC_TAR='ORCA2_LIM_nemo_v3.7.tar INPUTS_PISCES_v3.6st.tar'
@@ -126 +138 @@
 fi
 
-[ -z "${TRUST_CFG_NEW}" ] && TRUST_CFG_NEW=${TRUST_CFG_REF}'_trust'
-export TRUST_CFG_NEW TRUST_CFG_REF
-export TRUST_CFG_KEY_ADD TRUST_CFG_KEY_DEL
-
-
-## Inputs/Outputs
-## --------------
-
-[ -z "${TRUST_IO_XIOS}" ] && get_out A
-export TRUST_IO_XIOS
 export TRUST_IO_FORC_PATH TRUST_IO_FORC_TAR
 export TRUST_IO_CDO
 
 
-## Compilation & Running
-##----------------------
+## Compilation
+##------------
 
 ## Assuming the sourcing of XIOS arch .env file (modules) for setting 
@@ -156 +158 @@
 ## Not mandatory
 export TRUST_COMPILE_FORTRAN TRUST_COMPILE_MPI TRUST_COMPILE_NETCDF
+
+
+## Running
+##--------
 
 ## Assuming the job submit script is in './batch', if not