Context Navigation

← Previous Change
Next Change →

arch

Timestamp:

Jun 29, 2018, 12:31:11 PM (7 years ago)

Author:

Laurent Fairhead

Message:

First attempt at merging with trunk

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

: 2 deleted
: 19 edited
: 7 copied

. (modified) (1 prop)
arch/arch-AMD64_CICLAD.fcm (deleted)
arch/arch-AMD64_CICLAD.path (deleted)
arch/arch-ES_MOON.fcm (modified) (1 diff)
arch/arch-IA64_PLATINE.fcm (modified) (1 diff)
arch/arch-PW6_VARGAS.fcm (modified) (1 diff)
arch/arch-SX8_BRODIE.fcm (modified) (1 diff)
arch/arch-SX8_MERCURE.fcm (modified) (1 diff)
arch/arch-SX9_MERCURE.fcm (modified) (1 diff)
arch/arch-X64_ADA.fcm (modified) (1 diff)
arch/arch-X64_CURIE.fcm (modified) (1 diff)
arch/arch-X64_IRENE.fcm (copied) (copied from LMDZ6/trunk/arch/arch-X64_IRENE.fcm)
arch/arch-X64_IRENE.path (copied) (copied from LMDZ6/trunk/arch/arch-X64_IRENE.path)
arch/arch-X64_OCCIGEN.fcm (modified) (1 diff)
arch/arch-X64_TITANE.fcm (modified) (1 diff)
arch/arch-g95.fcm (modified) (1 diff)
arch/arch-gfortran.fcm (modified) (1 diff)
arch/arch-gfortran_CICLAD.env (copied) (copied from LMDZ6/trunk/arch/arch-gfortran_CICLAD.env)
arch/arch-gfortran_CICLAD.fcm (modified) (1 diff)
arch/arch-gfortran_CICLAD.path (modified) (1 diff)
arch/arch-ifort_CICLAD.env (copied) (copied from LMDZ6/trunk/arch/arch-ifort_CICLAD.env)
arch/arch-ifort_CICLAD.fcm (modified) (2 diffs)
arch/arch-ifort_CICLAD.path (modified) (1 diff)
arch/arch-ifort_LSCE.fcm (modified) (1 diff)
arch/arch-linux-32bit.fcm (modified) (1 diff)
arch/arch-pgf_CICLAD.env (copied) (copied from LMDZ6/trunk/arch/arch-pgf_CICLAD.env)
arch/arch-pgf_CICLAD.fcm (copied) (copied from LMDZ6/trunk/arch/arch-pgf_CICLAD.fcm)
arch/arch-pgf_CICLAD.path (copied) (copied from LMDZ6/trunk/arch/arch-pgf_CICLAD.path)

Legend:

: Unmodified
: Added
: Removed

LMDZ6/branches/DYNAMICO-conv

Property svn:mergeinfo changed

/LMDZ6/trunk (added)

merged: 3025-3027,3029,3031,3033-3039,3041,3043,3045,3047-3048,3051,3053,3057,3059-3060,3066,3068-3075,3078,3080,3082-3084,3086-3087,3090,3094-3117,3119,3121-3126,3129-3132,3134,3136-3137,3141-3144,3146,3148-3156,3159,3161-3163,3165,3167-3169,3171-3172,3174,3178-3182,3184,3186,3188,3192,3194-3199,3202,3206,3208-3211,3214,3216-3217,3219,3221,3223,3225-3226,3228,3231-3234,3237-3239,3241,3244-3245,3247,3252-3254,3257-3258,3260,3262,3264-3269,3274,3278-3281,3286-3288,3290-3291,3295-3298,3303-3304,3308-3309,3316-3317,3319,3327,3332-3333

LMDZ6/branches/DYNAMICO-conv/arch/arch-ES_MOON.fcm

r1907	r3356
2	2	%LINK esmpif90
3	3	%AR esar
	4	%ARFLAGS rs
4	5	%MAKE gmake
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-IA64_PLATINE.fcm

r1907	r3356
2	2	%LINK mpif90
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE gmake
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-PW6_VARGAS.fcm

r1907	r3356
2	2	%LINK mpxlf_r
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE gmake
5	6	%FPP_FLAGS -P -I/usr/local/pub/FFTW/3.2/include

LMDZ6/branches/DYNAMICO-conv/arch/arch-SX8_BRODIE.fcm

r1907	r3356
2	2	%LINK sxmpif90
3	3	%AR sxar
	4	%ARFLAGS rs
4	5	%MAKE sxgmake
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-SX8_MERCURE.fcm

r1907	r3356
2	2	%LINK sxmpif90
3	3	%AR sxar
	4	%ARFLAGS rs
4	5	%MAKE make
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-SX9_MERCURE.fcm

r1907	r3356
2	2	%LINK sxmpif90
3	3	%AR sxar
	4	%ARFLAGS rs
4	5	%MAKE make
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-X64_ADA.fcm

r2774	r3356
2	2	%LINK mpiifort
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE gmake
5	6	%FPP_FLAGS -P -traditional -I/smplocal/pub/FFTW/3.3.3_dyn/include/

LMDZ6/branches/DYNAMICO-conv/arch/arch-X64_CURIE.fcm

-                      r2270
+                      r3356
 %LINK                mpif90
 %AR                  ar
+%ARFLAGS             rs
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE FFT_MKL
 #%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
 %DEV_FFLAGS          -p -g -O2 -traceback -fp-stack-check
 %DEBUG_FFLAGS        -p -g -traceback -fp-stack-check -ftrapuv
+%BASE_FFLAGS         -i4 -r8 -auto -align all -I$(MKL_INC_DIR) -I$(MKL_INC_DIR)/intel64/lp64
+%PROD_FFLAGS         -O3 -axAVX,SSE4.2 -fp-model fast=2
+%DEV_FFLAGS          -fp-model strict -p -g -O2 -traceback -fp-stack-check
+%DEBUG_FFLAGS        -fp-model strict -p -g -traceback -fp-stack-check -ftrapuv
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp

LMDZ6/branches/DYNAMICO-conv/arch/arch-X64_OCCIGEN.fcm

r2439	r3356
2	2	%LINK mpif90
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE gmake
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-X64_TITANE.fcm

r1907	r3356
2	2	%LINK mpif90
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE gmake
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-g95.fcm

r1907	r3356
2	2	%LINK g95
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE make
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-gfortran.fcm

r2270	r3356
2	2	%LINK gfortran
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE make
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-gfortran_CICLAD.fcm

-                      r2270
+                      r3356
 %COMPILER            /usr/lib64/openmpi/1.4.5-gfortran/bin/mpif90
 %LINK                /usr/lib64/openmpi/1.4.5-gfortran/bin/mpif90
+%COMPILER            $MPI_BIN/mpif90
+%LINK                $MPI_BIN/mpif90
 %AR                  ar
+%ARFLAGS             rs
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE
 %BASE_FFLAGS         -c -fdefault-real-8 -fcray-pointer -frecursive
+%BASE_FFLAGS         -c -fdefault-real-8 -fcray-pointer -frecursive -ffree-line-length-0 -fno-align-commons
 %PROD_FFLAGS         -O3
 %DEV_FFLAGS          -O -Wall -fbounds-check
 %DEBUG_FFLAGS        -ffpe-trap=invalid,zero,overflow -Wall -fbounds-check -g3 -O0 -fstack-protector-all
+%DEBUG_FFLAGS        -ffpe-trap=invalid,zero,overflow -Wall -fbounds-check -g3 -O0 -fstack-protector-all -fbacktrace
 %MPI_FFLAGS
 %OMP_FFLAGS          -fopenmp
 %BASE_LD             -Wl,-rpath=/opt/netcdf42/gfortran/lib
+%BASE_LD             -Wl,-rpath=$NETCDF_HOME/lib
 %MPI_LD
 %OMP_LD              -fopenmp

LMDZ6/branches/DYNAMICO-conv/arch/arch-gfortran_CICLAD.path

r2437	r3356
1		NETCDF_LIBDIR="-L~~/opt/netcdf42/gfortran~~/lib -lnetcdf -lnetcdff"
2		NETCDF_INCDIR=-I~~/opt/netcdf42/gfortran~~/include
	1	NETCDF_LIBDIR="-L${NETCDF_HOME}/lib -lnetcdf -lnetcdff"
	2	NETCDF_INCDIR=-I${NETCDF_HOME}/include
3	3	IOIPSL_INCDIR=$LMDGCM/../../lib
4	4	IOIPSL_LIBDIR=$LMDGCM/../../lib

LMDZ6/branches/DYNAMICO-conv/arch/arch-ifort_CICLAD.fcm

-                      r2439
+                      r3356
 %COMPILER            /usr/lib64/openmpi/1.4.5-ifort/bin/mpif90
 %LINK                /usr/lib64/openmpi/1.4.5-ifort/bin/mpif90
+%COMPILER            $MPI_BIN/mpif90
+%LINK                $MPI_BIN/mpif90
 %AR                  ar
+%ARFLAGS             rs
 %MAKE                make
 %FPP_FLAGS           -P -traditional
 …
 %DEV_FFLAGS          -p -g -O1 -fpe0 -traceback
 %DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug
 %MPI_FFLAGS          -I/usr/lib64/openmpi/1.4.5-ifort/include
+%MPI_FFLAGS
 %OMP_FFLAGS          -openmp
 %BASE_LD             -Wl,-rpath=/opt/netcdf42/ifort/lib
 %MPI_LD              -L/usr/lib64/openmpi/1.4.5-ifort/lib -lmpi -L/opt/intel/composer_xe_2011_sp1.9.293/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core
+%BASE_LD             -Wl,-rpath=$NETCDF_HOME/lib -L/opt/intel/composer_xe_2011_sp1.9.293/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core
+%MPI_LD
 %OMP_LD              -openmp

LMDZ6/branches/DYNAMICO-conv/arch/arch-ifort_CICLAD.path

r2437	r3356
1		NETCDF_LIBDIR="-L~~/opt/netcdf42/ifort~~/lib -lnetcdf -lnetcdff"
2		NETCDF_INCDIR=-I~~/opt/netcdf42/ifort~~/include
	1	NETCDF_LIBDIR="-L${NETCDF_HOME}/lib -lnetcdf -lnetcdff"
	2	NETCDF_INCDIR=-I${NETCDF_HOME}/include
3	3	IOIPSL_INCDIR=$LMDGCM/../../lib
4	4	IOIPSL_LIBDIR=$LMDGCM/../../lib

LMDZ6/branches/DYNAMICO-conv/arch/arch-ifort_LSCE.fcm

r1907	r3356
2	2	%LINK mpif90
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE gmake
5	6	%FPP_FLAGS -P -traditional

LMDZ6/branches/DYNAMICO-conv/arch/arch-linux-32bit.fcm

r1907	r3356
2	2	%LINK pgf95
3	3	%AR ar
	4	%ARFLAGS rs
4	5	%MAKE make
5	6	%FPP_FLAGS -P -traditional

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 3356 for LMDZ6/branches/DYNAMICO-conv/arch

Legend:

Download in other formats: