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

Timestamp:

2017-11-22T11:28:53+01:00 (6 years ago)

Author:

nicolasmartin

Message:

Push modifications from functional Trusting in Curie HPC

Location:

branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg

Files:

• . (moved) (moved from branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config)
• X64_CURIE.cfg (modified) (1 diff)
• X64_CURIE_cron.cfg (copied) (copied from branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/X64_CURIE_cron.cfg) (1 diff)
• martin.cfg (modified) (2 diffs)
• romr005.cfg (modified) (1 diff)
• user_template.cfg (modified) (1 diff)

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

@@ -9 +9 @@
 TRUS_CDOD='cdo diffn'
 
-[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='16'
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='4'
 [ -z "${TRUS_TOUT}" ] && TRUS_TOUT='10800'
 

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

@@ -1 +1 @@
 ## Curie configuration
-##--------------------
+##---------------------------------------------------
 
-## Available softwares:
-CDO='netcdf-utils-'
-COMPILER='ifort'
-MPI='bullxmpi/'
-NETCDF='netcdf-'
 
-## Job commands: ccc_*
-JOB_SUBM="ccc_msub ${NEMO_TRUS}/batch/${NEMO_HPCC}.sh | grep -oe '\<[0-9]*\>'"
-JOB_LIST=ccc_mpp
-JOB_INFO=ccc_macct
-JOB_TIME="ccc_macct \${JOB_ID} | awk '/opa/ {print \$9}'"
-JOB_DELE=ccc_mdel
+## Default settings
+##---------------------------------------------------
+TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC}
 
-## Compiling & computing settings
-[ -z "$NPROC"       ] && NPROC=16
-[ -z "${TIME_LIMI}" ] && TIME_LIMI=10800 # 3h
+TRUS_CDOD='cdo diffn'
 
-## Architecture environment (be careful with compliance with XIOS)
-ARCH_ENV=${DIR_XIOS}/arch/arch-${NEMO_HPCC}.env
+[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='4'
+[ -z "${TRUS_TOUT}" ] && TRUS_TOUT='10800'
 
-## $CDO command to compare 2 datasets
-CDOD='cdo diffn'
+
+## (Super)computer environment
+##---------------------------------------------------
+TRUS_JSPT=${TRUS_HPCC}.sh
+TRUS_JSUB="ccc_msub ${TRUS_JSPT} | grep -oe '\<[0-9]*\>'"
+TRUS_JINF="ccc_macct \${TRUS_JIDN}"
+TRUS_JSTA="ccc_mpp  | grep \${TRUS_JIDN}"
+TRUS_JKIL="ccc_mdel        \${TRUS_JIDN}"
+
+TRUS_JTIM="ccc_macct \${TRUS_JIDN} | grep     \"\${TRUS_JIDN}.0 *opa\" | awk '{print               \$9      }'"
+TRUS_JPME="ccc_macct \${TRUS_JIDN} | grep -m1 \"\${TRUS_JIDN}.0\"      | awk '{printf \"%d Mo\n\", \$2; exit}'"
+TRUS_JVME="ccc_macct \${TRUS_JIDN} | grep -m1 \"\${TRUS_JIDN}.0\"      | awk '{printf \"%d Go\n\", \$7; exit}'"
+
+TRUS_CMPV='ifort'
+TRUS_CDOR='netcdf-utils-'
+TRUS_MPIR='bullxmpi/'
+TRUS_CDFR='netcdf-'
+
+PATH='/usr/local/netcdf-utils-4.3.3.1_hdf5/bin':$PATH

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

@@ -14 +14 @@
 
 [ -z "${TRUS_TARF}" ] && TRUS_TARF='ORCA2_LIM_nemo_v3.6.tar'
-[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V10.tar'
 [ ${TRUS_REFE} == 'AMM12'             ] && TRUS_TARF='AMM12_v3.6.tar'
 
@@ -24 +24 @@
 ##---------------------------------------------------
 TRUS_WORK=$CCCWORKDIR/NEMO
-TRUS_SCRA=$SCRATCHDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${DATE}
+TRUS_SCRA=$CCCSCRATCHDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${TRUS_DATE}
 TRUS_STOR=$CCCSTOREDIR/NEMO/trusting_sav/${TRUS_REFE}/${TRUS_BRAN}
 TRUS_FORC=$CCCWORKDIR/NEMO/FORC
 TRUS_XIOS=$CCCWORKDIR/XIOS/xios-1.0
 
+[ ${TRUS_BRAN} == 'trunk'             ] && TRUS_XIOS=$CCCWORKDIR/XIOS/trunk
 [ ${TRUS_REFE} == 'ORCA2_LIM_PISCES'  ] && TRUS_CONF='O2LP_trust'
-[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_CONF='O1L3P_trust'
+[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_CONF='O1L3P_trust' && TRUS_XIOS=${TRUS_WORK}/XIOS/XIOS_DEV_CMIP6
 [ ${TRUS_REFE} == 'ORCA2_LIM'         ] && TRUS_CONF='O2LA_trust'
 
-[ -z "${TRUS_MAIL}" ] && TRUS_MAIL='ntmlod@locean-ipsl.upmc.fr'
+[ -z "${TRUS_MAIL}" ] && TRUS_MAIL='nicolas.martin@upmc.fr claire.levy@locean-ipsl.upmc.fr officers@nemo-ocean.eu'

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

@@ -24 +24 @@
 ##---------------------------------------------------
 TRUS_WORK=$WORKDIR/NEMO
-TRUS_SCRA=$WORKDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${DATE}
+TRUS_SCRA=$WORKDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${TRUS_DATE}
 TRUS_STOR=$WORKDIR/NEMO/trusting_sav/${TRUS_REFE}/${TRUS_BRAN}
 TRUS_FORC=$WORKDIR/NEMO/FORC

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

@@ -37 +37 @@
 TRUS_WORK=     ## Testing folder for compilation (branches checkouts & configuration compilation)
 TRUS_SCRA=     ##   " "     ""   " " computation
-                 ## ...../${TRUS_REFE}/${TRUS_BRAN}/${DATE} recommended
+                 ## ...../${TRUS_REFE}/${TRUS_BRAN}/${TRUS_DATE} recommended
 TRUS_STOR=     ## Benchmark folder where target files for comparison have been stored, ie:
                ## Inputs  (all) : CPP_*, namelist_*, *.xml et inputs_list.txt (created by initial test)