Changeset 5432


Ignore:
Timestamp:
2015-06-17T14:21:35+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE Ping pong updates between Curie & Ada to finalize

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

Legend:

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

    r5292 r5432  
    1 #  
     1# Ada super-computer configuration 
     2 
     3# Available softwares: 
     4CDO=cdo 
    25COMPILER=ifort 
    3 MPI_NAME=intel 
     6MPI=intel 
     7NETCDF=netcdf 
    48 
    59# Job commands: LoadLeveler 
     
    913JOB_DELE=llcancel                           
    1014 
    11 # Directories ($HOME/$WORKDIR/$COMMONDIR/$TMPDIR/ergon) 
    12 DIR_WORK=$WORKDIR 
    13 DIR_SCRA=$TMPDIR/trusting 
    14 DIR_STOR=trusting_sav 
     15# Compiling & computing settings 
     16[ -z "$NPROC"       ] && NPROC=32 
     17[ -z "${TIME_LIMI}" ] && TIME_LIMI=10800 # 3h 
    1518 
    16 # Loading environment architecture 
    17 . ${DIR_XIOS}/arch/arch-${ARCH}.env 
     19# Architecture environment (be careful with compliance with XIOS) 
     20ARCH_ENV=${DIR_XIOS}/arch/arch-${CFG_ARCH}.env 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

    r5424 r5432  
    105105[ $? -ne 0 ] && get_out 
    106106[ $( find . -name '*.gz' -print -quit ) ] && gunzip *.gz 
    107  
     107exit 0 
    108108 
    109109# Job submission & computing 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5424 r5432  
    3232 
    3333    if [ $( find ${TEST_DIR} -name "*${last_time_step}_restart*.nc" -print -quit ) ]; then 
    34    file_base=$( find ${TEST_DIR} -name "*${last_time_step}_restart*.nc" -print -quit | \ 
    35                 sed "s/^\(.*\)0*$last_time_step.*/\1/"                                 ) 
     34   basename=$( find ${TEST_DIR} -name "*${last_time_step}_restart*.nc" -print -quit \ 
     35                | sed "s/^\(.*\)$last_time_step\_.*/\1$last_time_step/"               ) 
    3636 
    37    for file in restart restart_ice restart_trc; do 
    38        printf "${TEST_DIR}/*${last_time_step}_${file}*.nc: " 
     37   for comp in restart restart_ice restart_trc; do 
     38       printf "${TEST_DIR}/${basename}_${comp}*.nc: " 
    3939 
    40        nb_dom=$( find ${TEST_DIR} -name "*${last_time_step}_${file}_[0-9]*.nc" | wc -l | awk '{print $1}' ) 
     40       nb_dom=$( find ${TEST_DIR} -name "${basename}_${comp}_[0-9]*.nc" | wc -l | awk '{print $1}' ) 
    4141       if [ ${nb_dom} -gt 1 ]; then 
    42       ${NEMO_TRBD}/rebuild_nemo -t $NPROC ${file_base}${last_time_step}_$file ${nb_dom} >/dev/null 
     42      ${NEMO_TRBD}/rebuild_nemo -t $NPROC ${basename}_$comp ${nb_dom} >/dev/null 
    4343       fi 
    4444 
    45 #      result=$( diff_nc ${TEST_DIR}/*${last_time_step}_$file.nc ${REFE_DIR}/*${last_time_step}_$file.nc ) 
    46        result=$( diff_nc ${file_base}${last_time_step}_$file.nc ${REFE_DIR}/*${last_time_step}_$file.nc ) 
    47        printf "$CDO diffv $result\n" 
    48 #      \rm *${last_time_step}_${file}_[0-9]*.nc 
     45       cmp ${TEST_DIR}/${basename}_$comp.nc ${REFE_DIR}/${basename}_$comp.nc 
     46       if [ $? -ne 0 ]; then 
     47      result=$( diff_nc ${TEST_DIR}/${basename}_$comp.nc ${REFE_DIR}/${basename}_$comp.nc ) 
     48      printf "$CDO diffv $result\n" 
     49       else 
     50      printf "identical\n" 
     51       fi 
     52#      \rm *${last_time_step}_${comp}_[0-9]*.nc 
    4953   done 
    5054 
     
    5660get_soft_rel() { 
    5761    for rel in $CDO $COMPILER $MPI $NETCDF; do 
    58                                 arch_rel=$( echo $LOADEDMODULES | sed "s#.*$rel/\([^:]*\).*#\1#" ) 
    59    [ -z "${arch_rel}" ] && arch_rel=$( echo $PATH          | sed "s#.*$rel/\([^/]*\).*#\1#" ) 
    60    [ $( echo $rel | grep $COMPILER ) ] && arch_rel=$( $rel --version | grep -m1 -o ' [0-9.]* ' ) 
     62                                 arch_rel=$( echo $LOADEDMODULES | sed "s#.*$rel/\([^:]*\).*#\1#" ) 
     63   [ -z "${arch_rel}"  ] && arch_rel=$( echo $PATH          | sed "s#.*$rel/\([^/]*\).*#\1#" ) 
     64   [ $rel == $COMPILER ] && arch_rel=$( $rel --version | grep -m1 -o ' [0-9.]* ' ) 
    6165   echo $rel ${arch_rel} >> model.log 
    6266    done 
     
    7175   [ $dir == ${DIR_XIOS} ] && echo 'XIOS '$( svn info $dir | awk '(NR == 9) {print $NF}' ) >> model.log && continue 
    7276   ${SVN_CMD} $dir 
    73    rev_loc=$( svn info $dir | awk '(NR == 9) {print $NF}' ) 
     77   rev_loc=$( svn info $dir | awk '(NR == 5) {print $NF}' ) 
    7478   (( ${rev_loc} >= $rev )) && rev=${rev_loc} 
    7579    done 
Note: See TracChangeset for help on using the changeset viewer.