Ignore:
Timestamp:
Nov 21, 2019, 4:43:45 PM (5 years ago)
Author:
lguez
Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:
LMDZ6/branches/Ocean_skin
Files:
6 edited
3 copied

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Ocean_skin

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_ADA.fcm

    r3045 r3605  
    1111%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug -ftz
    1212%MPI_FFLAGS
    13 %OMP_FFLAGS          -openmp
    14 %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/mpi/lib:/smplocal/pub/HDF5/1.8.9/par/lib:/smplocal/pub/FFTW/3.3.3_dyn/lib
    15 %MPI_LD             
    16 %OMP_LD              -openmp
     13%OMP_FFLAGS          -qopenmp
     14%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/FFTW/3.3.3_dyn/lib
     15%MPI_LD              -L/smplocal/pub/IdrMemMPI/1.4/lib -lidrmem
     16%OMP_LD              -qopenmp
    1717

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_ADA.path

    r2123 r3605  
    11NETCDF_LIBDIR="${NETCDF_LDFLAGS:--L/smplocal/pub/NetCDF/4.1.3/mpi/lib -lnetcdff -lnetcdf -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz}"
    22NETCDF_INCDIR="${NETCDF_FFLAGS:--I/smplocal/pub/HDF5/1.8.9/par/include -I/smplocal/pub/NetCDF/4.1.3/mpi/include}"
    3 IOIPSL_INCDIR=$LMDGCM/../../lib
    4 IOIPSL_LIBDIR=$LMDGCM/../../lib
     3IOIPSL_INCDIR=${workdir}/build/IOIPSL_trunk_ifort_fast
     4IOIPSL_LIBDIR=${workdir}/build/IOIPSL_trunk_ifort_fast
    55XIOS_INCDIR=$LMDGCM/../XIOS/inc
    66XIOS_LIBDIR=$LMDGCM/../XIOS/lib

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_IRENE.fcm

    r3304 r3605  
    1111%DEV_FFLAGS          -fp-model strict -p -g -O2 -traceback -fp-stack-check
    1212%DEBUG_FFLAGS        -fp-model strict -p -g -traceback -fp-stack-check -ftrapuv
     13#%DEBUG_FFLAGS        -fp-model strict -p -g -traceback -fp-stack-check -ftrapuv -check bounds,noarg_temp_created,pointers,stack,uninit -debug full -init=arrays -init=snan
    1314%MPI_FFLAGS
    1415%OMP_FFLAGS          -qopenmp

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_IRENE.path

    r3304 r3605  
    11NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR -lnetcdf -lnetcdff"
    22NETCDF_INCDIR=-I$NETCDFFORTRAN_INCDIR
    3 IOIPSL_INCDIR=$LMDGCM/../../lib
    4 IOIPSL_LIBDIR=$LMDGCM/../../lib
     3IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
     4IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
    55ORCH_INCDIR=$LMDGCM/../../lib
    66ORCH_LIBDIR=$LMDGCM/../../lib
    77OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
    88OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
    9 INCA_LIBDIR=$LMDGCM/../INCA/config/lib
    10 INCA_INCDIR=$LMDGCM/../INCA/config/inc
     9INCA_LIBDIR=$LMDGCM/../INCA/build/lib
     10INCA_INCDIR=$LMDGCM/../INCA/build/inc
    1111XIOS_INCDIR=$LMDGCM/../XIOS/inc
    1212XIOS_LIBDIR=$LMDGCM/../XIOS/lib

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_JEANZAY.path

    r3600 r3605  
    44NETCDF_LIBDIR="-lnetcdf -lnetcdff"
    55NETCDF_INCDIR=
    6 IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
    7 IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
     6IOIPSL_INCDIR=$WORK/build/IOIPSL_trunk
     7IOIPSL_LIBDIR=$WORK/build/IOIPSL_trunk
    88ORCH_INCDIR=$LMDGCM/../../lib
    99ORCH_LIBDIR=$LMDGCM/../../lib

  • LMDZ6/branches/Ocean_skin/arch/arch-gfortran.path

    r1907 r3605  
    1 NETCDF_LIBDIR="-L/usr/local/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/usr/local/include
    3 IOIPSL_INCDIR=$LMDGCM/../../lib
    4 IOIPSL_LIBDIR=$LMDGCM/../../lib
     1NETCDF_LIBDIR="-lnetcdff -lnetcdf"
     2NETCDF_INCDIR=-I/usr/include
     3IOIPSL_INCDIR=/home/guez/Downloads/Compil_prod/IOIPSL
     4IOIPSL_LIBDIR=/home/guez/Downloads/Compil_prod/IOIPSL
    55ORCH_INCDIR=$LMDGCM/../../lib
    66ORCH_LIBDIR=$LMDGCM/../../lib
Note: See TracChangeset for help on using the changeset viewer.