Changeset 5934


Ignore:
Timestamp:
2015-11-26T21:22:57+01:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS18_TRUST Last commits before merging to trunk

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

Legend:

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

    r5929 r5934  
    3131 
    3232PATH='/smplocal/pub/cdo/1.5.9/bin':$PATH 
    33 #WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem' 
     33## Not working with module delimiter ':' 
     34#WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem '${WRAPPER_LDFLAGS} 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/config/martin.cfg

    r5929 r5934  
    2626TRUS_SCRA=$SCRATCHDIR/NEMO/trusting/${TRUS_REFE}/${TRUS_BRAN}/${DATE} 
    2727TRUS_STOR=$CCCSTOREDIR/NEMO/trusting_sav/${TRUS_REFE}/${TRUS_BRAN} 
    28 TRUS_FORC=$CCCWORKDIR/NEMO/FORC_tmp 
     28TRUS_FORC=$CCCWORKDIR/NEMO/FORC 
    2929TRUS_XIOS=$CCCWORKDIR/XIOS/xios-1.0 
    3030 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cron/ada.env

    r5929 r5934  
    22 
    33## Equivalent of source arch-X64_ADA.env with module commands 
    4 PATH='/smplocal/intel/composer_xe_2013.1.117/bin/intel64:/smplocal/intel/composer_xe_2013.1.117/bin/intel64_mic:/smplocal/intel/composer_xe_2013.1.117/debugger/gui/intel64:/smplocal/intel/composer_xe_2013.1.117/bin/intel64:/smplocal/intel/composer_xe_2013.1.117/mpirt/bin/intel64:/smplocal/intel/impi/4.1.0.024/intel64/bin:/smplocal/pub/cdo/1.5.9/bin:/smplocal/pub/Modules/IDRIS/wrappers:/smplocal/pub/NetCDF/4.1.3/mpi/bin':$PATH 
     4PATH='/smplocal/intel/composer_xe_2013.1.117/bin/intel64:/smplocal/intel/composer_xe_2013.1.117/bin/intel64_mic:/smplocal/intel/composer_xe_2013.1.117/debugger/gui/intel64:/smplocal/intel/composer_xe_2013.1.117/bin/intel64:/smplocal/intel/composer_xe_2013.1.117/mpirt/bin/intel64:/smplocal/intel/impi/4.1.0.024/intel64/bin:/smplocal/pub/Modules/IDRIS/wrappers:/smplocal/pub/NetCDF/4.1.3/mpi/bin':$PATH 
    55LD_LIBRARY_PATH='/smplocal/intel/composer_xe_2013.1.117/compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/mkl/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/mpirt/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/ipp/../compiler/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/ipp/lib/intel64:/smplocal/intel/composer_xe_2013.1.117/tbb/lib/intel64:/smplocal/intel/impi/4.1.0.024/intel64/lib':${LD_LIBRARY_PATH} 
    66INCLUDE='/smplocal/intel/composer_xe_2013.1.117/mkl/include':$INCLUDE 
     
    99WRAPPER_CXXFLAGS='-I/smplocal/pub/NetCDF/4.1.3/mpi/include' 
    1010WRAPPER_FFLAGS='-I/smplocal/pub/NetCDF/4.1.3/mpi/include' 
    11 WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem -L/smplocal/pub/NetCDF/4.1.3/mpi/lib -Bstatic -lnetcdff -lnetcdf -lnetcdf_c++ -Bdynamic -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz' 
     11WRAPPER_LDFLAGS='-L/smplocal/pub/NetCDF/4.1.3/mpi/lib -Bstatic -lnetcdff -lnetcdf -lnetcdf_c++ -Bdynamic -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz' 
    1212 
    1313## IDRIS files systems (no need with `at`) 
     
    5252#prepend-path   WRAPPER_LDFLAGS    -L/smplocal/pub/NetCDF/4.1.3/mpi/lib -Bstatic -lnetcdff -lnetcdf -lnetcdf_c++ -Bdynamic -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz 
    5353#------------------------------------------------------------------- 
    54 #------------------------------------------------------------------- 
    55 #/smplocal/pub/Modules/IDRIS/modulefiles/outils/idrmemmpi/1.4: 
    56 #prepend-path   PATH               /smplocal/pub/Modules/IDRIS/wrappers  
    57 #prepend-path   WRAPPER_LDFLAGS    -L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem  
    58 #------------------------------------------------------------------- 
    59 #------------------------------------------------------------------- 
    60 #/smplocal/pub/Modules/IDRIS/modulefiles/outils/cdo/1.5.9: 
    61 #prepend-path   PATH               /smplocal/pub/cdo/1.5.9/bin  
    62 #prepend-path   PATH               /smplocal/pub/Modules/IDRIS/wrappers  
    63 #------------------------------------------------------------------- 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/cron/curie.env

    r5929 r5934  
    22 
    33## Equivalent of source arch-X64_CURIE.env with module commands 
    4 PATH='/usr/local/ccc_users_env/bin:/opt/intel/14.0.3.174/bin/intel64:/opt/mpi/bullxmpi/1.2.8.2/bin:/usr/local/netcdf-utils-4.3.3.1_hdf5/bin:/usr/local/netcdf-4.3.3.1_hdf5_parallel/bin:/ccc/cont003/home/dsm/p86ipsl/bin':$PATH 
     4PATH='/usr/local/ccc_users_env/bin:/opt/intel/14.0.3.174/bin/intel64:/opt/mpi/bullxmpi/1.2.8.2/bin:/usr/local/netcdf-4.3.3.1_hdf5_parallel/bin:/ccc/cont003/home/dsm/p86ipsl/bin':$PATH 
    55LD_LIBRARY_PATH='/lib64:/lib:/usr/lib64:/usr/lib:/opt/intel/14.0.3.174/compiler/lib/intel64:/usr/local/intel-14.0.3.174/14.0.3.174/mkl/lib/intel64:/opt/intel/14.0.3.174/debugger/lib/intel64:/opt/mpi/bullxmpi/1.2.8.2/lib:/usr/local/netcdf-4.3.3.1_hdf5_parallel/lib':${LD_LIBRARY_PATH} 
    66 
     
    7373#setenv     NETCDF_LDFLAGS -L/usr/local/netcdf-4.3.3.1_hdf5_parallel/lib -lnetcdf 
    7474#------------------------------------------------------------------- 
    75 #------------------------------------------------------------------- 
    76 #/opt/Modules/default/modulefiles/applications/cdo/1.6.7: 
    77 #append-path   PATH     /usr/local/netcdf-utils-4.3.3.1_hdf5/bin 
    78 #------------------------------------------------------------------- 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/inc/trusting_func.sh

    r5929 r5934  
    7878    local soft_rel str 
    7979 
     80    ## Sourcing environment 
    8081    if [ -n "${TRUS_ENVI}" ]; then 
    81         ## Sourcing environment modulefile (.env) only if module function is set 
    8282   if [[  -e ${TRUS_ENVI}.env && $( declare -F | grep ' module' ) ]]; then 
     83            ## .env file if module function is available 
    8384       . ${TRUS_ENVI}.env 
    8485   else 
     86            ## .path file if existing, if not the given file 
    8587       [ -e ${TRUS_ENVI}.path ] && . ${TRUS_ENVI}.path || . ${TRUS_ENVI} 
    8688   fi 
    8789    fi 
    8890 
    89     ## Problem with `prepend-path` of modulefile that use ':' instead of ' ' as delimiter on LDFLAGS variables 
     91    ## Problem with `prepend-path` of modulefile that use ':' instead of ' ' as delimiter 
    9092    [ $TRUS_HPCC == 'X64_ADA' ] && WRAPPER_LDFLAGS='-L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem '${WRAPPER_LDFLAGS} 
    9193 
     
    195197diff_restart() { 
    196198    local base_name comp dif file list_comp list_tmsp nb_dom time_step tmsp 
    197     local files_list='' dift=0 
     199    local files_list='' dif_sum=0 
    198200 
    199201    ## Stop if no benchmark files (ie time.step) 
     
    204206    if [ $( find -regex ".*_restart.*[0-9]\.nc" -print -quit ) ]; then 
    205207   base_name=$( find -regex ".*_restart.*[0-9]\.nc"                       \ 
    206                 | sed "s#^\./\(.*\)_[0-9]*_restart.*#\1#"       | sort -u  ) 
     208                | sed "s#^\./\(.*\)_[0-9]*_restart.*#\1#"       | sort -u   ) 
    207209   list_comp=$( find -regex ".*_restart.*[0-9]\.nc"                       \ 
    208                 | sed "s#^.*\(restart[a-z_]*\)_[0-9].*\.nc#\1#" | sort -u  ) 
     210                | sed "s#^.*\(restart[a-z_]*\)_[0-9].*\.nc#\1#" | sort -u   ) 
    209211   list_tmsp=$( find -regex ".*_restart.*[0-9]\.nc"                       \ 
    210                 | sed "s#^.*\([0-9]\{8\}\)_restart.*#\1#"       | sort -u  ) 
     212                | sed "s#^.*\([0-9]\{8\}\)_restart.*#\1#"       | sort -u   ) 
    211213 
    212214   ## Loop on each time step 
     
    220222          ${TRUS_NGCM}/TOOLS/REBUILD_NEMO/rebuild_nemo -t ${TRUS_NPRO} $file ${nb_dom} \ 
    221223         > /dev/null 
     224 
     225           ## Possibility of remaining decomposed restarts (even after rebuild) 
     226          [ $? -eq 0 ] && rm -f ${file}_[0-9]*.nc \ 
     227                        > /dev/null 
     228 
    222229      elif [ ${nb_dom} -eq 0 ]; then 
    223230          TRUS_RSLT='FAILED' && get_out 8 
     
    253260   done 
    254261 
    255         ## List different files for web comment with sum of different parameters 
     262        ## List different files for web comment with sum of different records 
    256263   if [ ${dif_sum} -ne 0 ]; then 
    257264       echo 'Restarts: '${files_list}${dif_sum}' record(s) differ<br>' \ 
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh

    r5929 r5934  
    136136cd ${TRUS_SCRA} 
    137137get_inputs 
    138 [ $? -ne 0 ] && get_out 3 || echo 'Success' 
    139138cp   ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/cpp_* . 
    140139find ${TRUS_NGCM}/CONFIG/${TRUS_CONF}/EXP00 -regex '.*\(_cfg\|.in\|opa\|_ref\|.xml\)' \ 
Note: See TracChangeset for help on using the changeset viewer.