Changeset 8843 for branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg

Timestamp:

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

Author:

nicolasmartin

Message:

Review forcing inputs management + cosmetic changes

Location:

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg

Files:

• X64_ADA.cfg (modified) (2 props)
• X64_CURIE.cfg (modified) (1 diff, 2 props)
• X64_CURIE_trust.cfg (moved) (moved from branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/X64_CURIE_cron.cfg) (1 diff, 2 props)
• arch_template.cfg (modified) (2 props)
• martin.cfg (modified) (3 diffs, 2 props)
• romr005.cfg (modified) (1 diff, 2 props)
• user_template.cfg (modified) (1 diff, 2 props)

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/X64_CURIE.cfg

@@ -1 +1 @@
 ## Curie configuration
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
+
+## Compilation
+##------------
+
+TRUST_COMPILE_FORTRAN='ifort'
+TRUST_COMPILE_MPI='bullxmpi/'
+TRUST_COMPILE_NETCDF='netcdf-[0-9]'
 
 
-## Default settings
-##---------------------------------------------------
-TRUST_JOB_ENV=${TRUST_IO_XIOS}/arch/arch-${TRUST_MAIN_HPCC}
+## Inputs/Outputs
+## --------------
 
-='cdo diffn'
-
-[ -z "${TRUST_COMPILE_NPROC}" ] && TRUST_COMPILE_NPROC='4'
-[ -z "${TRUST_JOB_TIMEOUT}" ] && TRUST_JOB_TIMEOUT='10800'
+TRUST_IO_CDO='cdo'
 
 
-## (Super)computer environment
-##---------------------------------------------------
-TRUST_JOB_SCRIPT=${TRUST_MAIN_HPCC}.sh
-TRUST_JOB_SUBMIT="ccc_msub ${TRUST_JOB_SCRIPT} | grep -oe '\<[0-9]*\>'"
-TRUST_JOB_INFO="ccc_macct \${TRUST_JOB_ID}"
+## Running
+##--------
+
+TRUST_JOB_SUBMIT="ccc_msub \${TRUST_JOB_SCRIPT} | grep -oe '\<[0-9]*\>'"
 TRUST_JOB_STATE="ccc_mpp  | grep \${TRUST_JOB_ID}"
-TRUST_JOB_KILL="ccc_mdel        \${TRUST_JOB_ID}"
+TRUST_JOB_INFO="ccc_macct        \${TRUST_JOB_ID}"
+TRUST_JOB_KILL="ccc_mdel         \${TRUST_JOB_ID}"
 
-TRUST_JOB_TIME="ccc_macct \${TRUST_JOB_ID} | grep     \"\${TRUST_JOB_ID}.0 *opa\" | awk '{print               \$9      }'"
-TRUST_JOB_RAM_P="ccc_macct \${TRUST_JOB_ID} | grep -m1 \"\${TRUST_JOB_ID}.0\"      | awk '{printf \"%d Mo\n\", \$2; exit}'"
-TRUST_JOB_RAM_V="ccc_macct \${TRUST_JOB_ID} | grep -m1 \"\${TRUST_JOB_ID}.0\"      | awk '{printf \"%d Go\n\", \$7; exit}'"
-
-TRUST_COMPILE_FORTRAN='ifort'
-TRUST_IO_CDO='netcdf-utils-'
-TRUST_COMPILE_MPI='bullxmpi/'
-TRUST_COMPILE_NETCDF='netcdf-'
-
-PATH='/usr/local/netcdf-utils-4.3.3.1_hdf5/bin':$PATH
+TRUST_JOB_TIME="
+ccc_macct \${TRUST_JOB_ID} | grep     \"\${TRUST_JOB_ID}.0 *opa\" \
+    | awk '{print               \$9      }'                 \
+"
+TRUST_JOB_RAM_P="
+ccc_macct \${TRUST_JOB_ID} | grep -m1 \"\${TRUST_JOB_ID}.0\"      \
+    | awk '{printf \"%d Mo\n\", \$2; exit}'                 \
+"
+TRUST_JOB_RAM_V="
+ccc_macct \${TRUST_JOB_ID} | grep -m1 \"\${TRUST_JOB_ID}.0\"      \
+    | awk '{printf \"%d Go\n\", \$7; exit}'                 \
+"

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/X64_CURIE_trust.cfg

@@ -1 +1 @@
 ## Curie configuration
-##---------------------------------------------------
+##--------------------------------------------------------------------------------
 
+## Compilation
+##------------
 
-## Default settings
-##---------------------------------------------------
 TRUST_COMPILE_FORTRAN='ifort'
 TRUST_COMPILE_MPI='bullxmpi/'
 TRUST_COMPILE_NETCDF='netcdf-[0-9]'
 
+
+## Inputs/Outputs
+## --------------
+
 TRUST_IO_CDO='cdo'
+
+## Running
+##--------
 
 TRUST_JOB_SUBMIT="ccc_msub \${TRUST_JOB_SCRIPT} | grep -oe '\<[0-9]*\>'"

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/martin.cfg

@@ -1 @@
-## Settings for 
+## Regular trusting tests on Curie
 ##--------------------------------------------------------------------------------
-
 
 ## Trusting installation
 ## ---------------------
+
    TRUST_DIR_WORK=$CCCWORKDIR/NEMO
 TRUST_DIR_SCRATCH=$CCCSCRATCHDIR/NEMO/trusting
@@ -10 +10 @@
 
 
-## Branch checkout
-## ---------------
-
-
 ## NEMO configuration
 ## ------------------
+
 [ ${TRUST_CFG_REF} == 'ORCA2_LIM_PISCES'  ] && TRUST_CFG_NEW='O2LP_trust'
 [ ${TRUST_CFG_REF} == 'ORCA2_LIM3_PISCES' ] && TRUST_CFG_NEW='O2L3P_trust'
@@ -23 +20 @@
 ## Inputs/Outputs
 ## --------------
+
 TRUST_IO_FORC_PATH=$CCCWORKDIR/NEMO/FORC
      TRUST_IO_XIOS=$CCCWORKDIR/XIOS

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/romr005.cfg

@@ -1 @@
-## Installation for trusting tests on Ada Supercomputer
-##---------------------------------------------------
+## Regular trusting tests on Ada
+##--------------------------------------------------------------------------------
+
+## Trusting installation
+## ---------------------
+
+   TRUST_DIR_WORK=$WORKDIR/NEMO
+TRUST_DIR_SCRATCH=$WORKDIR/NEMO/trusting
+  TRUST_DIR_STORE=$WORKDIR/NEMO/trusting_sav
 
 
-## Default settings
-##---------------------------------------------------
-[ -z "${TRUST_SVN_BRANCH}" ] && TRUST_SVN_BRANCH='trunk'
-TRUST_SVN_CO=( 'ARCH           CONFIG          NEMO               \
-             EXTERNAL/AGRIF EXTERNAL/fcm    EXTERNAL/IOIPSL    \
-             TOOLS/COMPILE  TOOLS/maketools TOOLS/REBUILD_NEMO  ' )
+## NEMO configuration
+## ------------------
 
-[ -z "${TRUST_CFG_REF}" ] && TRUST_CFG_REF='ORCA2_LIM_PISCES'
-TRUST_CFG_NEW=${TRUST_CFG_REF}'_trust'
-
-[ -z "${TRUST_IO_FORC_TAR}" ] && TRUST_IO_FORC_TAR='ORCA2_LIM_nemo_v3.6.tar'
-[ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES' ] && TRUST_IO_FORC_TAR='INPUTS_ORCA1_LIM3_PISCES_V6.tar'
-[ ${TRUST_CFG_REF} == 'AMM12'             ] && TRUST_IO_FORC_TAR='AMM12_v3.6.tar'
-
-TRUST_CFG_KEY_ADD=''; TRUST_CFG_KEY_DEL=''
-[ ${TRUST_CFG_REF} == 'ORCA2_LIM' ] && TRUST_CFG_KEY_ADD='key_add key_agrif' && TRUST_CFG_KEY_DEL='key_del key_zdftmx'
+[ ${TRUST_CFG_REF} == 'ORCA2_LIM_PISCES'  ] && TRUST_CFG_NEW='O2LP_trust'
+[ ${TRUST_CFG_REF} == 'ORCA2_LIM3_PISCES' ] && TRUST_CFG_NEW='O2L3P_trust'
+[ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES' ] && TRUST_CFG_NEW='O1L3P_trust'
 
 
-## User environment
-##---------------------------------------------------
-TRUST_DIR_WORK=$WORKDIR/NEMO
-TRUST_DIR_SCRATCH=$WORKDIR/NEMO/trusting/${TRUST_CFG_REF}/${TRUST_SVN_BRANCH}/${TRUST_TEST_DATE}
-TRUST_DIR_STORE=$WORKDIR/NEMO/trusting_sav/${TRUST_CFG_REF}/${TRUST_SVN_BRANCH}
-TRUST_IO_FORC_PATH=$WORKDIR/NEMO/FORC
-TRUST_IO_XIOS=$WORKDIR/XIOS/xios-1.0
+## Inputs/Outputs
+## --------------
 
-[ ${TRUST_CFG_REF} == 'ORCA2_LIM_PISCES'  ] && TRUST_CFG_NEW='O2LP_trust'
-[ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES' ] && TRUST_CFG_NEW='O1L3P_trust'
-[ ${TRUST_CFG_REF} == 'ORCA2_LIM'         ] && TRUST_CFG_NEW='O2LA_trust'
+TRUST_IO_FORC_PATH=$COMMONDIR/NEMO/Online_forcing_archives
+     TRUST_IO_XIOS=$WORKDIR/XIOS
 
-[ -z "${TRUST_TEST_MAILING}" ] && TRUST_TEST_MAILING='ntmlod@locean-ipsl.upmc.fr'
+if   [ ${TRUST_SVN_BRANCH} == 'nemo_v3_6_STABLE'  ]; then
+    TRUST_IO_XIOS+='/xios-1.0'
+elif [ ${TRUST_CFG_REF} == 'ORCA1_LIM3_PISCES'    ]; then
+    TRUST_IO_XIOS+='/XIOS_DEV_CMIP6'
+else
+    TRUST_IO_XIOS+='/trunk'
+fi
+
+
+## Trusting test
+##--------------
+
+TRUST_TEST_MAILING=$( cat ./cfg/mailing_list.txt )

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/user_template.cfg

@@ -59 +59 @@
 ##  2 variables to handle 4 different cases: TRUST_IO_FORC_PATH for path to the forcing directory
 ##+ and TRUST_IO_FORC_TAR for potential archive(s) to extract
-##o TRUST_IO_FORC_PATH unset & TRUST_IO_FORC_TAR unset => No files needed at all
+##o TRUST_IO_FORC_PATH unset                           => No files needed at all
 ##o TRUST_IO_FORC_PATH set   & TRUST_IO_FORC_TAR empty => All inside files will be copied
 ##o TRUST_IO_FORC_PATH set   & TRUST_IO_FORC_TAR   set => Files will be extracted from archives list