Ignore:
Timestamp:
Sep 11, 2013, 11:45:01 AM (11 years ago)
Author:
Laurent Fairhead
Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:
LMDZ5/branches/testing
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/arch/arch-X64_ADA.fcm

    r1795 r1864  
    1111%MPI_FFLAGS
    1212%OMP_FFLAGS          -openmp
    13 %BASE_LD             -shared-intel  -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -L/smplocal/pub/FFTW/3.3.3_dyn/lib -lfftw3 -Wl,-rpath=/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib:/smplocal/pub/FFTW/3.3.3_dyn/lib
     13%BASE_LD             -L/smplocal/pub/FFTW/3.3.3_dyn/lib -lfftw3 -shared-intel  -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -Wl,-rpath=/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib:/smplocal/pub/FFTW/3.3.3_dyn/lib
    1414%MPI_LD
    1515%OMP_LD              -openmp

  • LMDZ5/branches/testing/arch/arch-gfortran.fcm

    r1492 r1864  
    44%MAKE                make
    55%FPP_FLAGS           -P -traditional
    6 %FPP_DEF             PLOUF
    7 %BASE_FFLAGS         -c
     6%FPP_DEF             NC_DOUBLE
     7%BASE_FFLAGS         -c -fdefault-real-8
    88%PROD_FFLAGS         -O3
    99%DEV_FFLAGS          -O

  • LMDZ5/branches/testing/arch/arch-gfortran.path

    r1492 r1864  
    1 NETCDF_LIBDIR=...
    2 NETCDF_INCDIR=...
    3 IOIPSL_INCDIR=...
    4 IOIPSL_LIBDIR=...
    5 ORCH_INCDIR=...
    6 ORCH_LIBDIR=...
     1NETCDF_LIBDIR="-L/usr/local/lib -lnetcdf"
     2NETCDF_INCDIR=-I/usr/local/include
     3IOIPSL_INCDIR=$LMDGCM/../../lib
     4IOIPSL_LIBDIR=$LMDGCM/../../lib
     5ORCH_INCDIR=$LMDGCM/../../lib
     6ORCH_LIBDIR=$LMDGCM/../../lib
Note: See TracChangeset for help on using the changeset viewer.