Changeset 2160 for LMDZ5/branches/testing/arch

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• arch/arch-CICLADifort-seq.fcm (deleted)
• arch/arch-CICLADifort-seq.path (deleted)
• arch/arch-CICLADifort.fcm (deleted)
• arch/arch-CICLADifort.path (deleted)
• arch/arch-X64_ADA.fcm (modified) (1 diff)
• arch/arch-X64_ADA.path (modified) (1 diff)
• arch/arch-X64_CURIE.fcm (modified) (1 diff)
• arch/arch-X64_CURIE.path (modified) (1 diff)
• arch/arch-gfortran_CICLAD.fcm (copied) (copied from LMDZ5/trunk/arch/arch-gfortran_CICLAD.fcm)
• arch/arch-gfortran_CICLAD.path (copied) (copied from LMDZ5/trunk/arch/arch-gfortran_CICLAD.path)
• arch/arch-ifort_CICLAD.fcm (copied) (copied from LMDZ5/trunk/arch/arch-ifort_CICLAD.fcm)
• arch/arch-ifort_CICLAD.path (copied) (copied from LMDZ5/trunk/arch/arch-ifort_CICLAD.path)

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

@@ -4 +4 @@
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional -I/smplocal/pub/FFTW/3.3.3_dyn/include/
-%FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_FFTW
+%FPP_DEF             NC_DOUBLE FFT_FFTW
 %BASE_FFLAGS         -auto -mcmodel=large -integer-size 32 -real-size 64 -align all 
 %PROD_FFLAGS         -O2 -ip -fp-model strict -axAVX,SSE4.2

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

@@ -10 +10 @@
 OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
 INCA_LIBDIR=$LMDGCM/../INCA/config/lib
-INCA_INCDIR=$LMDGCM/../INCA/config/lib
+INCA_INCDIR=$LMDGCM/../INCA/config/inc
 

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

@@ -4 +4 @@
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional
-%FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MKL
+%FPP_DEF             NC_DOUBLE FFT_MKL
 #%BASE_FFLAGS         -xHost -i4 -r8 -auto -align all -I$(MKL_INC_DIR) -I$(MKL_INC_DIR)/intel64/lp64
-%BASE_FFLAGS         -i4 -r8 -auto -align all -I$(MKL_INC_DIR) -I$(MKL_INC_DIR)/intel64/lp64
-%PROD_FFLAGS         -O3
+%BASE_FFLAGS         -i4 -r8 -auto -align all -I$(MKL_INC_DIR) -I$(MKL_INC_DIR)/intel64/lp64 -fp-model strict
+%PROD_FFLAGS         -O2
 %DEV_FFLAGS          -p -g -O2 -traceback -fp-stack-check
 %DEBUG_FFLAGS        -p -g -traceback -fp-stack-check -ftrapuv

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

@@ -8 +8 @@
 OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
 INCA_LIBDIR=$LMDGCM/../INCA/config/lib
-INCA_INCDIR=$LMDGCM/../INCA/config/lib
+INCA_INCDIR=$LMDGCM/../INCA/config/inc
 XIOS_INCDIR=$LMDGCM/../XIOS/inc
 XIOS_LIBDIR=$LMDGCM/../XIOS/lib