Changeset 5636


Ignore:
Timestamp:
2015-07-27T18:28:56+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE Trusting release for scheduling tests ( 'crontab'/'at')

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

Legend:

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

    r5543 r5636  
    22 
    33# Available softwares: 
    4 CDO=cdo 
    5 COMPILER=ifort 
    6 MPI=intel 
    7 NETCDF=netcdf 
     4CDO='cdo\/' 
     5COMPILER='ifort' 
     6MPI='intel\/impi\/' 
     7NETCDF='netcdf\/' 
    88 
    99# Job commands: LoadLeveler 
     
    1515 
    1616# Compiling & computing settings 
    17 [ -z "$NPROC"       ] && NPROC=32 
     17[ -z "$NPROC"       ] && NPROC=16 
    1818[ -z "${TIME_LIMI}" ] && TIME_LIMI=10800 # 3h 
    1919 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5635 r5636  
    101101get_soft_rel() { 
    102102    for soft in $CDO $COMPILER $MPI $NETCDF; do 
    103                                      soft_rel=$( echo $LOADEDMODULES | grep -o "$soft[^:]*"  | sort -u ) 
    104    [ -z "${soft_rel}"  ]     && soft_rel=$( echo $PATH          | grep -o "$soft/[^/]*" | sort -u ) 
    105    ## Not working inside CURIE cron (no modules command && cdo embedded in netcdf-*) 
    106    #[ "$soft" == "$COMPILER" ] && soft_rel=$( $soft --version      | grep -m1 -o ' [0-9.]* '         ) 
    107    [[ "$soft" == "$CDO"    && -z "${soft_rel}" ]] && soft_rel=$( echo $PATH | grep -o "netcdf-utils[^/]*" ) 
    108    [[ "$soft" == "$NETCDF" && -z "${soft_rel}" ]] && soft_rel=$( echo $PATH | grep -o "netcdf[^/]*"  | sort | head -1 ) 
    109    echo ${soft_rel} >> model.log 
     103                                 soft_rel=$( echo $LOADEDMODULES | sed "s/.*$soft\([0-9.a-z_]*\).*/\1/i" ) 
     104   [ -z "${soft_rel}"  ] && soft_rel=$( echo $PATH          | sed "s/.*$soft\([0-9.a-z_]*\).*/\1/i" ) 
     105   [ "$soft" == "$COMPILER" ] && soft_rel=$( $soft --version | grep -m1 -oe '\<[0-9. ]*\>' ) 
     106   ## Not working inside CURIE cron (cdo embedded in netcdf-*) 
     107#  [[ "$soft" == "$CDO"    && -z "${soft_rel}" ]] && soft_rel=$( echo $PATH | grep -o "netcdf-utils[^/]*" ) 
     108#  [[ "$soft" == "$NETCDF" && -z "${soft_rel}" ]] && soft_rel=$( echo $PATH | grep -o "netcdf[^/]*"  | sort -u | head -1 ) 
     109   echo $( echo $soft | tr -d '\\' ) ${soft_rel} >> model.log 
    110110    done 
    111111 
Note: See TracChangeset for help on using the changeset viewer.