Changeset 1454 for LMDZ5/trunk/arch

Timestamp:

Nov 18, 2010, 1:01:24 PM (14 years ago)

Author:

Laurent Fairhead

Message:

Merge of LMDZ5V1.0-dev branch r1453 into LMDZ5 trunk r1434

---

Fusion entre la version r1453 de la branche de développement LMDZ5V1.0-dev
et le tronc LMDZ5 (r1434)

Location:

LMDZ5/trunk

Files:

• . (modified) (1 prop)
• arch/arch-IA64_PLATINE.fcm (modified) (2 diffs)
• arch/arch-X64_TITANE.fcm (modified) (1 diff)

LMDZ5/trunk/arch/arch-IA64_PLATINE.fcm

@@ -5 +5 @@
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MKL
-%BASE_FFLAGS         -i4 -r8 -automatic -align all -I/applications/intel/mkl/10.0.1.014/include
+%BASE_FFLAGS         -i4 -r8 -automatic -align all -I${MKLROOT}/include
 %PROD_FFLAGS         -O3
 %DEV_FFLAGS          -p -g -O3 -traceback
@@ -11 +11 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp
-%BASE_LD             -p -i4 -r8 -automatic -L/applications/intel/mkl/10.0.1.014/lib/64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lguide
+%BASE_LD             -p -i4 -r8 -automatic $MKL_LIBS
 %MPI_LD
 %OMP_LD              -openmp

LMDZ5/trunk/arch/arch-X64_TITANE.fcm

@@ -11 +11 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp
-%BASE_LD             -p -i4 -r8 -automatic -L/applications/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lguide
+%BASE_LD             -p -i4 -r8 -automatic $MKL_LIBS
 %MPI_LD
 %OMP_LD              -openmp