Changeset 5683


Ignore:
Timestamp:
2015-08-12T19:39:58+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE Modifications for AGRIF Agulhas, bugfixes & more readability

Location:
branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/arch_template.cfg

    r5644 r5683  
    1616JOB_SUBM=''               # Submit a job && get his ID in return 
    1717                                             # ex: "cmd ${NEMO_TRUS}/batch/${NEMO_HPCC}.sh | awk '{print \$NF}'" 
    18 JOB_LIST=''                  # List all submitted jobs (to determine by `grep` if a job completed or not) 
     18JOB_LIST=''                  # List all submitted jobs (to determine by `grep` if a job is completed or not) 
    1919JOB_INFO=''               # Get job informations          with job ID as argument (filling a computation log) 
    2020JOB_TIME=''                               # Get real CPU time computation with `eval "${JOB_INFO} ${JOB_ID} | ${JOB_TIME}"` 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/romr005.cfg

    r5681 r5683  
    1 # User configuration 
     1## User configuration 
     2##------------------- 
    23 
    34 
    4 # Global Directories: 
     5## Global Directories: 
    56DIR_WORK=$WORKDIR 
    67DIR_SCRA=$WORKDIR/NEMO/trusting 
     
    89 
    910 
    10 # NEMO overall configuration: 
     11## NEMO overall installation: 
    1112[ -z "${NEMO_BRAN}" ] && NEMO_BRAN='trunk' 
    1213NEMO_HOME=${DIR_WORK}/NEMO/${NEMO_BRAN}/NEMOGCM 
    1314 
     15### Reference/'Trusting' configuration 
    1416[ -z "${REFE_CONF}" ] && REFE_CONF='ORCA2_LIM_PISCES' 
    15 [ -z "${TEST_CONF}" ] && TEST_CONF='O2LP_trust' 
     17TEST_CONF=${REFE_CONF}'_trust' 
    1618KEYS_ADD=''; KEYS_DEL='' 
     19[ ${REFE_CONF} == 'ORCA2_LIM_PISCES'  ] && TEST_CONF='O2LP_trust' 
     20[ ${REFE_CONF} == 'ORCA1_LIM3_PISCES' ] && TEST_CONF='O1L3P_trust' 
     21[ ${REFE_CONF} == 'ORCA2_LIM'         ] && TEST_CONF='O2LA_trust' && KEYS_ADD='key_agrif' && KEYS_DEL='key_zdftmx' 
    1722 
     23### Inputs 
    1824NEMO_FORC=${DIR_WORK}/NEMO/FORC 
    1925[ -z "${NEMO_TARF}" ] && NEMO_TARF='ORCA2_LIM_nemo_v3.6.tar' 
     26[ ${REFE_CONF} == 'ORCA1_LIM3_PISCES' ] && NEMO_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar' 
     27[ ${REFE_CONF} == 'AMM12'             ] && NEMO_TARF='AMM12_v3.6.tar' 
    2028 
    2129 
    22 # Comparatives directories localization: 
     30## Comparatives directories path: 
    2331REFE_DIR=${DIR_STOR}/${REFE_CONF}/${NEMO_BRAN} 
    2432TEST_DIR=${DIR_SCRA}/${REFE_CONF}/${NEMO_BRAN}/trusting_${DATE} 
    2533 
    2634 
    27 # External softs directories: 
     35## External softs directories: 
    2836DIR_XIOS=${DIR_WORK}/XIOS/xios-1.0 
    2937#DIR_OASI=${DIR_WORK}/OASIS         
    3038 
    3139 
    32 # Mailing list to inform of a failure, -p|--publish option required 
     40## Mailing list to inform of a failure (-p|--publish option required) 
    3341[ -z "$EMAIL"] && EMAIL=ntmlod@locean-ipsl.upmc.fr 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/user_template.cfg

    r5681 r5683  
    55 
    66 
     7## Global Directories: 
     8#DIR_WORK='' 
     9#DIR_SCRA='' 
     10#DIR_STOR='' 
     11 
     12 
    713## NEMO overall installation: 
    814[ -z "${NEMO_BRAN}" ] && NEMO_BRAN=''     ## NEMO SVN branch         to test 
    915                                             ## ex: 'trunk', 'nemo_v3_6_STABLE', ... 
    1016NEMO_HOME=''                              ## NEMOGCM directory (includes ./ARCH, ./CONFIG, ...) 
    11                                              ## ex: ".../NEMO/${NEMO_BRAN}/NEMOGCM", ... 
     17                                             ## ex: "${DIR_WORK}/NEMO/${NEMO_BRAN}/NEMOGCM", ... 
    1218## ${NEMO_BRAN} must be consistent with URL branch that have been checkout by SVN to build ${NEMO_HOME} 
    1319 
     
    1521[ -z "${REFE_CONF}" ] && REFE_CONF=''     ## Reference configuration to test 
    1622                                             ## ex: 'ORCA2_LIM_PISCES', 'GYRE', ... 
    17 [ -z "${TEST_CONF}" ] && TEST_CONF=''     ## Testing configuration name 
    18                                              ## ex: "${REFE_CONF}_trust", ... 
     23TEST_CONF=${REFE_CONF}'_trust'            ## Testing configuration name 
    1924KEYS_ADD=''; KEYS_DEL=''                  ## CPP keys to add or remove from reference configuration 
    2025                                             ## ex: "key_mpp_rep key_tide", ... 
    21 [ "" == '' ] && KEYS_ADD='' && KEYS_DEL='' 
     26#[ ${REFE_CONF} == '' ] && TEST_CONF='' && KEYS_ADD='' && KEYS_DEL='' 
    2227 
    2328### Inputs 
     
    2631[ -z "${NEMO_TARF}" ] && NEMO_TARF=''     ## Archive inputs name, let blank if not requested 
    2732                                             ## ex: 'ORCA2_LIM_nemo_v3.6.tar', 'AMM12_v3.6.tar', ... 
     33#[ ${REFE_CONF} == '' ] && NEMO_TARF='' 
    2834 
    2935 
    3036## Comparative directories path: 
    3137REFE_DIR=''                  ## "Standard" folder where benchmark result files have been stored for comparison 
    32                                              ## ex: ".../${REFE_CONF}/${NEMO_BRAN}" 
    33 TEST_DIR=''                  ## Test       folder for computation 
    34                                              ## ex: ".../${REFE_CONF}/${NEMO_BRAN}/trusting_${DATE}" 
     38                                             ## ex: "${DIR_STOR}/${REFE_CONF}/${NEMO_BRAN}" 
     39TEST_DIR=''                  ## Testing    folder for computation 
     40                                             ## ex: "${DIR_SCRA}/${REFE_CONF}/${NEMO_BRAN}/trusting_${DATE}" 
    3541 
    3642 
    3743## External softs directories: 
    38 DIR_XIOS=''                     ## ex: '.../XIOS/xios-1.0' 
    39 #DIR_OASI=''                       ## ex: '.../OASIS' 
     44DIR_XIOS=''                     ## ex: '${DIR_WORK}/XIOS/xios-1.0' 
     45#DIR_OASI=''                       ## ex: '${DIR_WORK}/OASIS' 
    4046 
    4147 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.env

    r5681 r5683  
    1818 
    1919## Only interest for essential NEMO directories 
    20 NEMO_ARCH=${NEMO_HOME}/ARCH              ; NEMO_CONF=${NEMO_HOME}/CONFIG       ; NEMO_ENGI=${NEMO_HOME}/NEMO 
    21 NEMO_EIOI=${NEMO_HOME}/EXTERNAL/IOIPSL   ; NEMO_EFCM=${NEMO_HOME}/EXTERNAL/fcm 
    22 NEMO_TRBD=${NEMO_HOME}/TOOLS/REBUILD_NEMO; NEMO_TCMP=${NEMO_HOME}/TOOLS/COMPILE 
     20NEMO_ARCH=${NEMO_HOME}/ARCH          ; NEMO_CONF=${NEMO_HOME}/CONFIG             
     21NEMO_ENGI=${NEMO_HOME}/NEMO 
     22NEMO_EAGR=${NEMO_HOME}/EXTERNAL/AGRIF; NEMO_EIOI=${NEMO_HOME}/EXTERNAL/IOIPSL    
     23NEMO_EFCM=${NEMO_HOME}/EXTERNAL/fcm 
     24NEMO_TCMP=${NEMO_HOME}/TOOLS/COMPILE ; NEMO_TRBD=${NEMO_HOME}/TOOLS/REBUILD_NEMO 
    2325export NEMO_ARCH NEMO_CONF NEMO_ENGI 
    24 export NEMO_EIOI NEMO_EFCM 
    25 export NEMO_TRBD NEMO_TCMP 
     26export NEMO_EAGR NEMO_EIOI NEMO_EFCM 
     27export NEMO_TCMP NEMO_TRBD 
    2628 
    2729## Sourcing super-computer configuration 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

    r5681 r5683  
    112112print_step 'Set job (copying & extracting input files)' 
    113113cd ${TEST_DIR} 
    114 find ${NEMO_CONF}/${TEST_CONF}/EXP00 -regex '.*\(cfg\|opa\|ref\|xml\)' -exec cp {} . \; 
     114cp ${NEMO_CONF}/${TEST_CONF}/cpp_* . 
     115find ${NEMO_CONF}/${TEST_CONF}/EXP00 -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' -exec cp {} . \; 
    115116get_inputs 
    116117(( $? != 0 )) && get_out 3 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5681 r5683  
    5353 
    5454    for dir in ${NEMO_ARCH} ${NEMO_CONF} ${NEMO_ENGI} \ 
    55                ${NEMO_EIOI} ${NEMO_EFCM}              \ 
     55               ${NEMO_EAGR} ${NEMO_EIOI} ${NEMO_EFCM} \ 
    5656          ${NEMO_TCMP} ${NEMO_TRBD}              \ 
    5757          ${DIR_XIOS}                             ; do 
     
    122122   if [ -n "$dif" ]; then 
    123123       mesg='Different' 
    124        [ $dif != '0' ] && echo $dif && files_list+=$file' ' 
     124       [ "$dif" != '0' ] && echo $dif && files_list+=$file' ' 
    125125   fi 
    126126 
     
    283283XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 
    284284 
     285`cat ${TEST_DIR}/${FILE_TRUS}` 
    285286END_MAIL 
    286        [ -e ${TEST_DIR}/${FILE_TRUS} ] && cat ${TEST_DIR}/${FILE_TRUS}                  \ 
    287       >> trusting.mail 
     287#      cat ${TEST_DIR}/${FILE_TRUS}                  \ 
     288#     >> trusting.mail 
    288289       mail -s "[NEMO Trusting ${NEMO_HPCC} ${REFE_CONF} ${NEMO_BRAN}] $ST $ERR" $EMAIL \ 
    289290      <  trusting.mail 
     
    323324    if [[ $ST == 'FAILED' && $PUBLISH -eq 1 && $DEBUG -eq 0 ]]; then 
    324325   echo 'Creating archive '${FILE_ARCH}' under '${REFE_DIR} 
    325    tar -czf ${REFE_DIR}/${FILE_ARCH} * ${NEMO_HOME}/CONFIG/${TEST_CONF}/cpp_*  \ 
    326                                         ${NEMO_HOME}/CONFIG/${TEST_CONF}/MY_SRC \ 
     326   tar -czf ${REFE_DIR}/${FILE_ARCH} * ${NEMO_HOME}/CONFIG/${TEST_CONF}/MY_SRC \ 
    327327                                       ${NEMO_HOME}/CONFIG/${TEST_CONF}/WORK 
    328328    fi 
Note: See TracChangeset for help on using the changeset viewer.