Ignore:
Timestamp:
Mar 18, 2016, 12:09:23 PM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2434:2457 into testing branch

Location:
LMDZ5/branches/testing
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2298 r2471  
    88%PROD_FFLAGS         -O2 -ip -fp-model strict -axAVX,SSE4.2
    99%DEV_FFLAGS          -p -g -O0 -fpe0 -traceback
    10 %DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check all -debug
     10%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug
    1111#%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -debug
    1212%MPI_FFLAGS
  • LMDZ5/branches/testing/arch/arch-X64_OCCIGEN.fcm

    r2408 r2471  
    88%PROD_FFLAGS         -O2 -ip
    99%DEV_FFLAGS          -p -g -O1 -fpe0 -traceback
    10 %DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -ftz -ftrapuv -fp-stack-check -check all -debug -traceback
     10%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -ftz -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug -traceback
    1111%MPI_FFLAGS
    1212%OMP_FFLAGS          -openmp -openmp-threadprivate compat
  • LMDZ5/branches/testing/arch/arch-gfortran_CICLAD.path

    r2160 r2471  
    77OASIS_INCDIR=$LMDGCM/../../prism/SX/build/lib/psmile.$couple
    88OASIS_LIBDIR=$LMDGCM/../../prism/SX/lib
    9 INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
    10 INCA_INCDIR=$LMDGCM/../INCA3/config/lib
     9INCA_LIBDIR=$LMDGCM/../INCA/config/lib
     10INCA_INCDIR=$LMDGCM/../INCA/config/lib
     11XIOS_INCDIR=$LMDGCM/../XIOS/inc
     12XIOS_LIBDIR=$LMDGCM/../XIOS/lib
  • LMDZ5/branches/testing/arch/arch-ifort_CICLAD.fcm

    r2160 r2471  
    88%PROD_FFLAGS         -O2 -ip
    99%DEV_FFLAGS          -p -g -O1 -fpe0 -traceback
    10 %DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check all -debug
     10%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug
    1111%MPI_FFLAGS          -I/usr/lib64/openmpi/1.4.5-ifort/include
    1212%OMP_FFLAGS          -openmp
  • LMDZ5/branches/testing/arch/arch-ifort_CICLAD.path

    r2160 r2471  
    77OASIS_INCDIR=$LMDGCM/../../prism/SX/build/lib/psmile.$couple
    88OASIS_LIBDIR=$LMDGCM/../../prism/SX/lib
    9 INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
    10 INCA_INCDIR=$LMDGCM/../INCA3/config/lib
     9INCA_LIBDIR=$LMDGCM/../INCA/config/lib
     10INCA_INCDIR=$LMDGCM/../INCA/config/lib
     11XIOS_INCDIR=$LMDGCM/../XIOS/inc
     12XIOS_LIBDIR=$LMDGCM/../XIOS/lib
Note: See TracChangeset for help on using the changeset viewer.