Changeset 8780


Ignore:
Timestamp:
2017-11-22T11:28:53+01:00 (3 years ago)
Author:
nicolasmartin
Message:

Push modifications from functional Trusting in Curie HPC

Location:
branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST
Files:
3 deleted
9 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/batch/X64_CURIE.sh

    r5788 r8780  
    11#!/bin/bash 
    22 
    3 #Config ccc_msub 
    4 #MSUB -A  gen7451 
    5 #MSUB -r  NEMO_CI 
    6 #MSUB -o  NEMO_CI_%I 
    7 #MSUB -e  NEMO_CI_%I 
     3##Config ccc_msub 
     4#MSUB -A  gen0826 
     5#MSUB -r  NEMO_Trust 
     6#MSUB -o  NEMO_Trust_%I 
     7#MSUB -e  NEMO_Trust_%I 
    88#MSUB -oe 
    9 #MSUB -q  xlarge 
    10 #MSUB -n  128 
    11 #MSUB -N  1 
     9#MSUB -q  standard 
     10#MSUB -n  32 
     11#MSUB -N  2 
    1212#MSUB -T  1800 
    13 ##MSUB -@  ntmlod@locean-ipsl.upmc.fr:begin,end 
     13 
    1414ccc_mprun ./opa 
     15 
     16exit 0 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/batch/X64_CURIE_cron.sh

    r5697 r8780  
    11#!/bin/bash 
    22 
    3 #Config ccc_msub 
    4 #MSUB -A  gen7451 
    5 #MSUB -r  Trust 
    6 #MSUB -o  Trust_%I 
    7 #MSUB -e  Trust_%I 
     3##Config ccc_msub 
     4#MSUB -A  gen0826 
     5#MSUB -r  NEMO_Trust 
     6#MSUB -o  NEMO_Trust_%I 
     7#MSUB -e  NEMO_Trust_%I 
    88#MSUB -oe 
    9 #MSUB -q  xlarge 
    10 #MSUB -n  128 
    11 #MSUB -N  1 
     9#MSUB -q  standard 
     10#MSUB -n  32 
     11#MSUB -N  2 
    1212#MSUB -T  1800 
    13 ##MSUB -@  ntmlod@locean-ipsl.upmc.fr:begin,end 
     13 
    1414ccc_mprun ./opa 
     15 
     16exit 0 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/X64_CURIE.cfg

    r5929 r8780  
    99TRUS_CDOD='cdo diffn' 
    1010 
    11 [ -z "${TRUS_NPRO}" ] && TRUS_NPRO='16' 
     11[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='4' 
    1212[ -z "${TRUS_TOUT}" ] && TRUS_TOUT='10800' 
    1313 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/X64_CURIE_cron.cfg

    r5697 r8780  
    11## Curie configuration 
    2 ##-------------------- 
     2##--------------------------------------------------- 
    33 
    4 ## Available softwares: 
    5 CDO='netcdf-utils-' 
    6 COMPILER='ifort' 
    7 MPI='bullxmpi/' 
    8 NETCDF='netcdf-' 
    94 
    10 ## Job commands: ccc_* 
    11 JOB_SUBM="ccc_msub ${NEMO_TRUS}/batch/${NEMO_HPCC}.sh | grep -oe '\<[0-9]*\>'" 
    12 JOB_LIST=ccc_mpp 
    13 JOB_INFO=ccc_macct 
    14 JOB_TIME="ccc_macct \${JOB_ID} | awk '/opa/ {print \$9}'" 
    15 JOB_DELE=ccc_mdel 
     5## Default settings 
     6##--------------------------------------------------- 
     7TRUS_ENVI=${TRUS_XIOS}/arch/arch-${TRUS_HPCC} 
    168 
    17 ## Compiling & computing settings 
    18 [ -z "$NPROC"       ] && NPROC=16 
    19 [ -z "${TIME_LIMI}" ] && TIME_LIMI=10800 # 3h 
     9TRUS_CDOD='cdo diffn' 
    2010 
    21 ## Architecture environment (be careful with compliance with XIOS) 
    22 ARCH_ENV=${DIR_XIOS}/arch/arch-${NEMO_HPCC}.env 
     11[ -z "${TRUS_NPRO}" ] && TRUS_NPRO='4' 
     12[ -z "${TRUS_TOUT}" ] && TRUS_TOUT='10800' 
    2313 
    24 ## $CDO command to compare 2 datasets 
    25 CDOD='cdo diffn' 
     14 
     15## (Super)computer environment 
     16##--------------------------------------------------- 
     17TRUS_JSPT=${TRUS_HPCC}.sh 
     18TRUS_JSUB="ccc_msub ${TRUS_JSPT} | grep -oe '\<[0-9]*\>'" 
     19TRUS_JINF="ccc_macct \${TRUS_JIDN}" 
     20TRUS_JSTA="ccc_mpp  | grep \${TRUS_JIDN}" 
     21TRUS_JKIL="ccc_mdel        \${TRUS_JIDN}" 
     22 
     23TRUS_JTIM="ccc_macct \${TRUS_JIDN} | grep     \"\${TRUS_JIDN}.0 *opa\" | awk '{print               \$9      }'" 
     24TRUS_JPME="ccc_macct \${TRUS_JIDN} | grep -m1 \"\${TRUS_JIDN}.0\"      | awk '{printf \"%d Mo\n\", \$2; exit}'" 
     25TRUS_JVME="ccc_macct \${TRUS_JIDN} | grep -m1 \"\${TRUS_JIDN}.0\"      | awk '{printf \"%d Go\n\", \$7; exit}'" 
     26 
     27TRUS_CMPV='ifort' 
     28TRUS_CDOR='netcdf-utils-' 
     29TRUS_MPIR='bullxmpi/' 
     30TRUS_CDFR='netcdf-' 
     31 
     32PATH='/usr/local/netcdf-utils-4.3.3.1_hdf5/bin':$PATH 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/martin.cfg

    r5935 r8780  
    1414 
    1515[ -z "${TRUS_TARF}" ] && TRUS_TARF='ORCA2_LIM_nemo_v3.6.tar' 
    16 [ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V6.tar' 
     16[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_TARF='INPUTS_ORCA1_LIM3_PISCES_V10.tar' 
    1717[ ${TRUS_REFE} == 'AMM12'             ] && TRUS_TARF='AMM12_v3.6.tar' 
    1818 
     
    2424##--------------------------------------------------- 
    2525TRUS_WORK=$CCCWORKDIR/NEMO 
    26 TRUS_SCRA=$SCRATCHDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${DATE} 
     26TRUS_SCRA=$CCCSCRATCHDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${TRUS_DATE} 
    2727TRUS_STOR=$CCCSTOREDIR/NEMO/trusting_sav/${TRUS_REFE}/${TRUS_BRAN} 
    2828TRUS_FORC=$CCCWORKDIR/NEMO/FORC 
    2929TRUS_XIOS=$CCCWORKDIR/XIOS/xios-1.0 
    3030 
     31[ ${TRUS_BRAN} == 'trunk'             ] && TRUS_XIOS=$CCCWORKDIR/XIOS/trunk 
    3132[ ${TRUS_REFE} == 'ORCA2_LIM_PISCES'  ] && TRUS_CONF='O2LP_trust' 
    32 [ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_CONF='O1L3P_trust' 
     33[ ${TRUS_REFE} == 'ORCA1_LIM3_PISCES' ] && TRUS_CONF='O1L3P_trust' && TRUS_XIOS=${TRUS_WORK}/XIOS/XIOS_DEV_CMIP6 
    3334[ ${TRUS_REFE} == 'ORCA2_LIM'         ] && TRUS_CONF='O2LA_trust' 
    3435 
    35 [ -z "${TRUS_MAIL}" ] && TRUS_MAIL='ntmlod@locean-ipsl.upmc.fr' 
     36[ -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

    r5929 r8780  
    2424##--------------------------------------------------- 
    2525TRUS_WORK=$WORKDIR/NEMO 
    26 TRUS_SCRA=$WORKDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${DATE} 
     26TRUS_SCRA=$WORKDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${TRUS_DATE} 
    2727TRUS_STOR=$WORKDIR/NEMO/trusting_sav/${TRUS_REFE}/${TRUS_BRAN} 
    2828TRUS_FORC=$WORKDIR/NEMO/FORC 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cfg/user_template.cfg

    r5929 r8780  
    3737TRUS_WORK=     ## Testing folder for compilation (branches checkouts & configuration compilation) 
    3838TRUS_SCRA=     ##   " "     ""   " " computation 
    39                  ## ...../${TRUS_REFE}/${TRUS_BRAN}/${DATE} recommended 
     39                 ## ...../${TRUS_REFE}/${TRUS_BRAN}/${TRUS_DATE} recommended 
    4040TRUS_STOR=     ## Benchmark folder where target files for comparison have been stored, ie: 
    4141               ## Inputs  (all) : CPP_*, namelist_*, *.xml et inputs_list.txt (created by initial test) 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting.env

    r5929 r8780  
    55##-------------------------------------- 
    66dat=$( date ) 
    7 export DATE=$( date -ud "$dat" +"%Y%m%d%Z%H%M" ) 
    8 export PATTERNAME=${TRUS_USER}'_'${TRUS_HPCC} 
     7export TRUS_DATE=$( date -ud "$dat" +"%Y%m%d%Z%H%M" ) 
     8export TRUS_NAME=${TRUS_USER}'_'${TRUS_HPCC} 
    99export TRUS_SVNH='https://forge.ipsl.jussieu.fr/nemo/svn' 
    1010 
     
    1212## Source user configuration 
    1313##--------------------------------------------------- 
    14 . ./config/${TRUS_USER}.cfg 
     14. ./cfg/${TRUS_USER}.cfg 
    1515export TRUS_WORK TRUS_SCRA TRUS_STOR TRUS_XIOS TRUS_FORC 
    1616export TRUS_BRAN TRUS_REFE 
     
    2121## Source (super)computer configuration 
    2222##--------------------------------------------------- 
    23 . ./config/${TRUS_HPCC}.cfg 
     23. ./cfg/${TRUS_HPCC}.cfg 
    2424export TRUS_ENVI TRUS_CDOD TRUS_NPRO TRUS_TOUT 
    2525export TRUS_JSPT TRUS_JSUB TRUS_JSTA TRUS_JKIL 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting_func.sh

    r5988 r8780  
    33 
    44## Messenger filenames 
    5 FILE_DATE=mesg_01_date_$PATTERNAME.txt  ; FILE_RSLT=mesg_02_result_$PATTERNAME.txt 
    6 FILE_STAT=mesg_03_state_$PATTERNAME.txt ; FILE_NEMO=mesg_04_nemo_$PATTERNAME.txt 
    7 FILE_XIOS=mesg_05_xios_$PATTERNAME.txt  ; FILE_CMPF=mesg_06_compiler_$PATTERNAME.txt 
    8 FILE_LMPI=mesg_07_mpi_$PATTERNAME.txt   ; FILE_NCDF=mesg_08_netcdf_$PATTERNAME.txt 
    9 FILE_INPT=mesg_09_inputs_$PATTERNAME.txt; FILE_TIME=mesg_10_time_$PATTERNAME.txt 
    10 FILE_MEMY=mesg_11_memory_$PATTERNAME.txt; FILE_NOTE=mesg_12_comments_$PATTERNAME.txt 
     5file_date=mesg_01_date.txt  ; file_rslt=mesg_02_result.txt 
     6file_stat=mesg_03_state.txt ; file_nemo=mesg_04_nemo.txt 
     7file_xios=mesg_05_xios.txt  ; file_cmpf=mesg_06_compiler.txt 
     8file_lmpi=mesg_07_mpi.txt   ; file_ncdf=mesg_08_netcdf.txt 
     9file_inpt=mesg_09_inputs.txt; file_time=mesg_10_time.txt 
     10file_memy=mesg_11_memory.txt; file_note=mesg_12_comments.txt 
    1111 
    1212## Trusting timestamped logfile & archive 
    13 TRUS_FILE=trusting_${DATE}_$PATTERNAME.txt; TRUS_ARCH=trusting_${DATE}_$PATTERNAME.tgz 
     13TRUS_FILE=trusting_${TRUS_DATE}_$TRUS_NAME.txt; TRUS_ARCH=trusting_${TRUS_DATE}_$TRUS_NAME.tgz 
    1414 
    1515 
     
    2323 
    2424init_files() { 
    25     echo 'Date'               > ${FILE_DATE}; echo 'Result'           > ${FILE_RSLT} 
    26     echo 'State'              > ${FILE_STAT}; echo 'NEMOGCM rev.'     > ${FILE_NEMO} 
    27     echo 'XIOS rev.'          > ${FILE_XIOS}; echo 'Fortran compiler' > ${FILE_CMPF} 
    28     echo 'MPI libs'           > ${FILE_LMPI}; echo 'NetCDF libs'      > ${FILE_NCDF} 
    29     echo 'Input files'        > ${FILE_INPT}; echo 'Elapsed time'     > ${FILE_TIME} 
    30     echo 'Memory usage (P/V)' > ${FILE_MEMY}; echo 'Comments'         > ${FILE_NOTE} 
     25    echo 'Date'               > ${file_date}; echo 'Result'           > ${file_rslt} 
     26    echo 'State'              > ${file_stat}; echo 'NEMOGCM rev.'     > ${file_nemo} 
     27    echo 'XIOS rev.'          > ${file_xios}; echo 'Fortran compiler' > ${file_cmpf} 
     28    echo 'MPI libs'           > ${file_lmpi}; echo 'NetCDF libs'      > ${file_ncdf} 
     29    echo 'Input files'        > ${file_inpt}; echo 'Elapsed time'     > ${file_time} 
     30    echo 'Memory usage (P/V)' > ${file_memy}; echo 'Comments'         > ${file_note} 
    3131 
    3232    ## 'Failed' status with 'Unknown error' by default 
    3333    echo ${TRUS_RSLT}      \ 
    34    >> ${FILE_RSLT} 
     34   >> ${file_rslt} 
    3535    echo 'Unknown error' \ 
    36    >> ${FILE_STAT} 
     36   >> ${file_stat} 
    3737} 
    3838 
    3939get_date() { 
    4040    ## UTC time zone for timestamping 
    41     local dat=$( date -ud "${DATE}" +"%F %R %Z" ) 
     41    local dat=$( date -ud "${TRUS_DATE}" +"%F %R %Z" ) 
    4242 
    4343    echo $dat           \ 
    44    >> ${FILE_DATE} 
     44   >> ${file_date} 
    4545} 
    4646 
     
    5858      >> model.log 
    5959       echo "<a href=\"https://forge.ipsl.jussieu.fr/ioserver/changeset/${rev_loc}\" target=\"_blank\">${rev_loc}</a>" \ 
    60       >> ${FILE_XIOS} 
     60      >> ${file_xios} 
    6161       continue 
    6262   fi 
     
    7272   >> model.log 
    7373    echo "<a href=\"https://forge.ipsl.jussieu.fr/nemo/changeset/$rev\" target=\"_blank\">$rev</a>" \ 
    74    >> ${FILE_NEMO} 
     74   >> ${file_nemo} 
    7575} 
    7676 
     
    110110 
    111111    sed -n 3p model.log \ 
    112    >> ${FILE_CMPF} 
     112   >> ${file_cmpf} 
    113113    sed -n 4p model.log \ 
    114    >> ${FILE_LMPI} 
     114   >> ${file_lmpi} 
    115115    sed -n 5p model.log \ 
    116    >> ${FILE_NCDF} 
     116   >> ${file_ncdf} 
    117117} 
    118118 
     
    145145    [ $mesg == 'Same' ] && echo $mesg 
    146146    echo $mesg          \ 
    147    >> ${FILE_INPT} 
     147   >> ${file_inpt} 
    148148 
    149149    ## List different files for web comment 
    150150    [ -n "${files_list}" ] && echo 'Inputs  : '${files_list}'differ<br>' \ 
    151    >> temp_${FILE_NOTE} 
     151   >> temp_${file_note} 
    152152} 
    153153 
     
    161161   printf "\n%s\n" ${outline// /#}          \ 
    162162       >> computation.log 
    163    [ -n "${TRUS_JINF}" ] && eval ${JOB_INFO} \ 
     163   [ -n "${TRUS_JINF}" ] && eval ${TRUS_JINF} \ 
    164164       >> computation.log 
    165165   sleep ${time_increment} 
     
    170170 
    171171    ## Kill remaining job & stop the test if it's too long 
    172     [ ${time_elapsed} -eq ${TRUS_TOUT} ] && { eval ${JOB_DELE} &> /dev/null; get_out 6; } 
     172    [ ${time_elapsed} -eq ${TRUS_TOUT} ] && { eval ${TRUS_JKIL} &> /dev/null; get_out 6; } 
    173173} 
    174174 
     
    192192    ## List different files for web comment 
    193193    [ -n "${files_list}" ] && echo 'Results : '${files_list}'differ<br>' \ 
    194    >> temp_${FILE_NOTE} 
     194   >> temp_${file_note} 
    195195} 
    196196 
     
    263263   if [ ${dif_sum} -ne 0 ]; then 
    264264       echo 'Restarts: '${files_list}${dif_sum}' record(s) differ<br>' \ 
    265       >> temp_${FILE_NOTE} 
     265      >> temp_${file_note} 
    266266   else 
    267267       echo 'Same' 
     
    281281 
    282282    printf "Elapsed time: " 
    283     echo ${time_cpu} | tee -a ${FILE_TIME} 
     283    echo ${time_cpu} | tee -a ${file_time} 
    284284} 
    285285 
     
    291291 
    292292    printf "Memory max usage (physical/virtual): " 
    293     echo ${memory_pmax}' / '${memory_vmax} | tee -a ${FILE_MEMY} 
     293    echo ${memory_pmax}' / '${memory_vmax} | tee -a ${file_memy} 
    294294} 
    295295 
     
    308308 
    309309    [ -n "$line" ] && ( echo $line; printf "$line<br>" \ 
    310    >> temp_${FILE_NOTE} ) 
     310   >> temp_${file_note} ) 
    311311} 
    312312 
    313313log_make() { 
    314314    ## Format comments for web 
    315     [ -e temp_${FILE_NOTE} ] && cat temp_${FILE_NOTE} | tr -d '\n' | sed 's/<br>$//' \ 
    316    >> ${FILE_NOTE} 
     315    [ -e temp_${file_note} ] && cat temp_${file_note} | tr -d '\n' | sed 's/<br>$//' \ 
     316   >> ${file_note} 
    317317 
    318318    ## Construct txt file with all messenger files 
     
    328328 
    329329   ## Create or append trusting logfile 
    330    if [ -f ${TRUS_STOR}/trusting_$PATTERNAME.txt ]; then cmd='tail -1'; else cmd='cat'; fi 
     330   if [ -f ${TRUS_STOR}/trusting_$TRUS_NAME.txt ]; then cmd='tail -1'; else cmd='cat'; fi 
    331331 
    332332   $cmd ${TRUS_FILE}                            \ 
    333        >> ${TRUS_STOR}/trusting_$PATTERNAME.txt 
     333       >> ${TRUS_STOR}/trusting_$TRUS_NAME.txt 
    334334 
    335335        ## Send mail only when FAILED 
     
    409409    ## Last messenger files 
    410410    #export TRUS_RORR 
    411     sed -i "2 s/.*/$TRUS_RSLT/" ${FILE_RSLT}; sed -i "2 s/.*/$TRUS_RORR/" ${FILE_STAT} 
     411    sed -i "2 s/.*/$TRUS_RSLT/" ${file_rslt}; sed -i "2 s/.*/$TRUS_RORR/" ${file_stat} 
    412412 
    413413    ## Save tested configuration if trusting failed in production mode (-p|--prod) 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/install_new_branch.sh

    r5929 r8780  
    2222## Initialization (HPC & user environment) 
    2323##--------------------------------------------------- 
    24 if [[ ! -e config/${TRUS_USER}.cfg || ! -e config/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then 
     24if [[ ! -e cfg/${TRUS_USER}.cfg || ! -e cfg/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then 
    2525    cat ./inc/trusting_help.txt 
    2626 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh

    r5988 r8780  
    3232## Initialization (HPC & user environment) 
    3333##--------------------------------------------------- 
    34 if [[ ! -e config/${TRUS_USER}.cfg || ! -e config/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then 
     34if [[ ! -e cfg/${TRUS_USER}.cfg || ! -e cfg/${TRUS_HPCC}.cfg || ${TRUS_HELP} -eq 1 ]]; then 
    3535    cat ./inc/trusting_help.txt 
    3636 
Note: See TracChangeset for help on using the changeset viewer.