Changeset 1910 for LMDZ5/branches/testing/arch

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (2 props)
• arch (modified) (1 prop)
• arch/arch-AMD64_CICLAD.fcm (modified) (1 prop)
• arch/arch-AMD64_CICLAD.path (modified) (1 prop)
• arch/arch-CICLADifort-seq.fcm (modified) (1 prop)
• arch/arch-CICLADifort-seq.path (modified) (1 prop)
• arch/arch-CICLADifort.fcm (modified) (1 prop)
• arch/arch-CICLADifort.path (modified) (1 prop)
• arch/arch-ES_MOON.fcm (modified) (1 prop)
• arch/arch-ES_MOON.path (modified) (1 prop)
• arch/arch-IA64_PLATINE.fcm (modified) (1 prop)
• arch/arch-IA64_PLATINE.path (modified) (1 prop)
• arch/arch-PW6_VARGAS.fcm (modified) (1 prop)
• arch/arch-PW6_VARGAS.path (modified) (1 prop)
• arch/arch-SX8_BRODIE.fcm (modified) (1 prop)
• arch/arch-SX8_BRODIE.opt (modified) (1 prop)
• arch/arch-SX8_BRODIE.path (modified) (1 prop)
• arch/arch-SX8_MERCURE.fcm (modified) (1 prop)
• arch/arch-SX8_MERCURE.opt (modified) (1 prop)
• arch/arch-SX8_MERCURE.path (modified) (1 prop)
• arch/arch-SX9_MERCURE.fcm (modified) (1 prop)
• arch/arch-SX9_MERCURE.opt (modified) (1 prop)
• arch/arch-SX9_MERCURE.path (modified) (1 prop)
• arch/arch-X64_ADA.fcm (modified) (1 diff, 1 prop)
• arch/arch-X64_ADA.path (modified) (1 diff, 1 prop)
• arch/arch-X64_CURIE.fcm (modified) (2 diffs, 1 prop)
• arch/arch-X64_CURIE.path (modified) (1 prop)
• arch/arch-X64_TITANE.fcm (modified) (1 prop)
• arch/arch-X64_TITANE.path (modified) (1 prop)
• arch/arch-g95.fcm (modified) (1 prop)
• arch/arch-g95.path (modified) (1 prop)
• arch/arch-gfortran.fcm (modified) (1 prop)
• arch/arch-gfortran.path (modified) (1 prop)
• arch/arch-ifort_LSCE.fcm (copied) (copied from LMDZ5/trunk/arch/arch-ifort_LSCE.fcm)
• arch/arch-ifort_LSCE.path (copied) (copied from LMDZ5/trunk/arch/arch-ifort_LSCE.path)
• arch/arch-linux-32bit.fcm (modified) (1 prop)
• arch/arch-linux-32bit.path (modified) (1 prop)

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

@@ -11 +11 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp
-%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
-%MPI_LD
+%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
+%MPI_LD              -L/smplocal/pub/IdrMemMPI/1.3/lib -lidrmem
 %OMP_LD              -openmp
 

LMDZ5/branches/testing/arch/arch-X64_ADA.path

@@ -1 @@
-NETCDF_LIBDIR="${NETCDF_LDFLAGS:--L/smplocal/pub/NetCDF/4.1.3/lib -lnetcdff -lnetcdf -L/smplocal/pub/HDF5/1.8.9/seq/lib -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -lz}"
-NETCDF_INCDIR="${NETCDF_FFLAGS:--I/smplocal/pub/HDF5/1.8.9/seq/include -I/smplocal/pub/NetCDF/4.1.3/include}"
+NETCDF_LIBDIR="${NETCDF_LDFLAGS:--L/smplocal/pub/NetCDF/4.1.3/mpi/lib -lnetcdff -lnetcdf -L/smplocal/pub/HDF5/1.8.9/par/lib -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -lz}"
+NETCDF_INCDIR="${NETCDF_FFLAGS:--I/smplocal/pub/HDF5/1.8.9/par/include -I/smplocal/pub/NetCDF/4.1.3/mpi/include}"
 IOIPSL_INCDIR=$LMDGCM/../../lib
 IOIPSL_LIBDIR=$LMDGCM/../../lib
+XIOS_INCDIR=$LMDGCM/../XIOS/inc
+XIOS_LIBDIR=$LMDGCM/../XIOS/lib
 ORCH_INCDIR=$LMDGCM/../../lib
 ORCH_LIBDIR=$LMDGCM/../../lib

LMDZ5/branches/testing/arch/arch-X64_CURIE.fcm

@@ -5 +5 @@
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MKL
-%BASE_FFLAGS         -i4 -r8 -auto -align all -I${MKLROOT}/include
+%BASE_FFLAGS         -i4 -r8 -auto -mcmodel=large -align all -I${MKLROOT}/include
 %PROD_FFLAGS         -O3
 %DEV_FFLAGS          -p -g -O2 -traceback -fp-stack-check
@@ -11 +11 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp
-%BASE_LD             -i4 -r8 -auto $MKL_LIBS
+%BASE_LD             -shared-intel -i4 -r8 -auto $MKL_LIBS
 %MPI_LD
 %OMP_LD              -openmp