Changeset 2298 for LMDZ5/branches/testing/arch

Timestamp:

Jun 14, 2015, 9:13:32 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• arch/arch-X64_ADA.fcm (modified) (1 diff)
• arch/arch-X64_CURIE.fcm (modified) (1 diff)
• arch/arch-gfortran.fcm (modified) (1 diff)
• arch/arch-gfortran_CICLAD.fcm (modified) (1 diff)

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

@@ -5 +5 @@
 %FPP_FLAGS           -P -traditional -I/smplocal/pub/FFTW/3.3.3_dyn/include/
 %FPP_DEF             NC_DOUBLE FFT_FFTW
-%BASE_FFLAGS         -auto -mcmodel=large -integer-size 32 -real-size 64 -align all 
+%BASE_FFLAGS         -auto -recursive -mcmodel=large -integer-size 32 -real-size 64 -align all 
 %PROD_FFLAGS         -O2 -ip -fp-model strict -axAVX,SSE4.2
 %DEV_FFLAGS          -p -g -O0 -fpe0 -traceback

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

@@ -5 +5 @@
 %FPP_FLAGS           -P -traditional
 %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        -recursive -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 -fp-model strict
 %PROD_FFLAGS         -O2

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

@@ -5 +5 @@
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE 
-%BASE_FFLAGS         -c -fdefault-real-8
+%BASE_FFLAGS         -c -fdefault-real-8 -frecursive
 %PROD_FFLAGS         -O3
 %DEV_FFLAGS          -O

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

@@ -5 +5 @@
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE 
-%BASE_FFLAGS         -c -fdefault-real-8 -fcray-pointer
+%BASE_FFLAGS         -c -fdefault-real-8 -fcray-pointer -frecursive
 %PROD_FFLAGS         -O3
 %DEV_FFLAGS          -O -Wall -fbounds-check