Changeset 1695 for trunk/LMDZ.COMMON/arch

Timestamp:

Apr 17, 2017, 4:10:07 PM (8 years ago)

Author:

emillour

Message:

Common dynamics/framework:
Removed some obsolete arch files.
Reorganization of the way paths to external libraries are handles by makelmdz_fcm and makelmdz. This will ease interfacing with Dynamico which follows simillar rules with respect to a given external library ,e.g. for SOMELIBRARY, in the arch.path file:
SOMELIBRARY_LIBDIR="-L/path/to/the/library/libdir -L/possible/other/required/path"
SOMELIBRARY_LIB"-lsomelib -lsomeotherrequiredlib"
SOMELIBRARY_INCDIR"-I/path/to/the/library/incdir -I/possible/other/required/include/path"
EM

Location:

trunk/LMDZ.COMMON/arch

Files:

• arch-AMD64_CICLAD.path (modified) (1 diff)
• arch-CICLADifort.path (modified) (1 diff)
• arch-ES_MOON.fcm (deleted)
• arch-ES_MOON.path (deleted)
• arch-GNOMEp_large.path (modified) (1 diff)
• arch-GNOMEs.path (modified) (1 diff)
• arch-IA64_PLATINE.fcm (deleted)
• arch-IA64_PLATINE.path (deleted)
• arch-PW6_VARGAS.fcm (deleted)
• arch-PW6_VARGAS.path (deleted)
• arch-SX8_BRODIE.fcm (deleted)
• arch-SX8_BRODIE.opt (deleted)
• arch-SX8_BRODIE.path (deleted)
• arch-SX8_MERCURE.fcm (deleted)
• arch-SX8_MERCURE.opt (deleted)
• arch-SX8_MERCURE.path (deleted)
• arch-SX9_MERCURE.fcm (deleted)
• arch-SX9_MERCURE.opt (deleted)
• arch-SX9_MERCURE.path (deleted)
• arch-X64_ADA.env (added)
• arch-X64_ADA.fcm (modified) (1 diff)
• arch-X64_ADA.path (modified) (1 diff)
• arch-X64_MESU.path (modified) (1 diff)
• arch-X64_OCCIGEN.path (modified) (1 diff)
• arch-X64_TITANE.fcm (deleted)
• arch-X64_TITANE.path (deleted)
• arch-g95.fcm (deleted)
• arch-g95.path (deleted)
• arch-gfortran.path (modified) (1 diff)
• arch-linux-32bit.fcm (deleted)
• arch-linux-32bit.path (deleted)
• arch-linux-64bit-para.path (modified) (1 diff)
• arch-linux-64bit.path (modified) (1 diff)
• arch-linux-ifort-para.path (modified) (1 diff)
• arch-linux-ifort.path (modified) (1 diff)

trunk/LMDZ.COMMON/arch/arch-AMD64_CICLAD.path

@@ -1 @@
-NETCDF_LIBDIR="-L/opt/netcdf/pgf/lib -lnetcdf"
-NETCDF_INCDIR=-I/opt/netcdf/pgf/include
-IOIPSL_INCDIR=/home/spiga/IOIPSL_SVN/modipsl/lib
-IOIPSL_LIBDIR=/home/spiga/IOIPSL_SVN/modipsl/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L/opt/netcdf/pgf/lib"
+NETCDF_LIB="-lnetcdf"
+NETCDF_INCDIR="-I/opt/netcdf/pgf/include"
+
+IOIPSL_INCDIR="-I/home/spiga/IOIPSL_SVN/modipsl/lib"
+IOIPSL_LIBDIR="-L/home/spiga/IOIPSL_SVN/modipsl/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-CICLADifort.path

@@ -1 @@
-NETCDF_LIBDIR="-L/opt/netcdf3/ifort/lib -lnetcdf"
-NETCDF_INCDIR=-I/opt/netcdf3/ifort/include
-IOIPSL_INCDIR=$LMDGCM/ioipsl/modipsl/lib
-IOIPSL_LIBDIR=$LMDGCM/ioipsl/modipsl/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L/opt/netcdf3/ifort/lib"
+NETCDF_LIB="-lnetcdf"
+NETCDF_INCDIR="-I/opt/netcdf3/ifort/include"
+
+IOIPSL_INCDIR="-I$ROOT/ioipsl/modipsl/lib"
+IOIPSL_LIBDIR="-L$ROOT/ioipsl/modipsl/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-GNOMEp_large.path

@@ -1 @@
-NETCDF_LIBDIR="-Wl,-rpath -Wl,/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/lib -L/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/lib -lnetcdf -lnetcdff" 
-NETCDF_INCDIR=-I/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/include
-IOIPSL_INCDIR=/san/common/umr8539/bigDATA_ioipsl_aymeric/modipsl/lib
-IOIPSL_LIBDIR=/san/common/umr8539/bigDATA_ioipsl_aymeric/modipsl/lib
+NETCDF_LIBDIR="-Wl,-rpath -Wl,/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/lib -L/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/lib"
+NETCDF_LIB="-lnetcdf -lnetcdff" 
+NETCDF_INCDIR="-I/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/include"
+
+IOIPSL_INCDIR="-I/san/common/umr8539/bigDATA_ioipsl_aymeric/modipsl/lib"
+IOIPSL_LIBDIR="-L/san/common/umr8539/bigDATA_ioipsl_aymeric/modipsl/lib"
+IOIPSL_LIB="-lioipsl"

trunk/LMDZ.COMMON/arch/arch-GNOMEs.path

@@ -1 @@
-NETCDF_LIBDIR="-L/usr/local/lib -lnetcdf"
-NETCDF_INCDIR=-I/usr/local/include
-IOIPSL_INCDIR=/san/home/millour/Planeto/work_dyn_830/trunk/LMDZ.COMMON/ioipsl/modipsl/lib
-IOIPSL_LIBDIR=/san/home/millour/Planeto/work_dyn_830/trunk/LMDZ.COMMON/ioipsl/modipsl/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L/usr/local/lib"
+NETCDF_LIB="-lnetcdf"
+NETCDF_INCDIR="-I/usr/local/include"
+
+IOIPSL_INCDIR="-I/san/home/millour/Planeto/work_dyn_830/trunk/LMDZ.COMMON/ioipsl/modipsl/lib"
+IOIPSL_LIBDIR="-L/san/home/millour/Planeto/work_dyn_830/trunk/LMDZ.COMMON/ioipsl/modipsl/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-X64_ADA.fcm

@@ -6 +6 @@
 %CPP_FLAGS           -P
 %FPP_DEF             NC_DOUBLE LAPACK BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_FFTW
-%BASE_FFLAGS         -integer-size 32 -real-size 64 -align all -mcmodel=large -auto
+%BASE_FFLAGS         -integer-size 32 -real-size 64 -align all -auto
 %PROD_FFLAGS         -O2 -ip -fp-model strict -axAVX,SSE4.2
 %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
+%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug -ftz
 %C_COMPILER          gcc
 %C_OPTIM             -O3
 %MPI_FFLAGS
-%OMP_FFLAGS          -openmp
-%BASE_LD             -shared-intel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -L/smplocal/pub/FFTW/3.3.3_dyn/lib -lfftw3 -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
+%OMP_FFLAGS          -openmp -openmp-threadprivate=compat
+%BASE_LD             -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -L/smplocal/pub/FFTW/3.3.3_dyn/lib -lfftw3 -Wl,-rpath=/smplocal/pub/FFTW/3.3.3_dyn/lib
 %MPI_LD
-%OMP_LD              -openmp
+%OMP_LD              -openmp -openmp-threadprivate=compat
 

trunk/LMDZ.COMMON/arch/arch-X64_ADA.path

@@ -1 @@
-NETCDF_LIBDIR="${NETCDF_LDFLAGS:--L/smplocal/pub/NetCDF/4.1.3/mpi/lib -lnetcdff -lnetcdf -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -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=/smphome/rech/psl/rpsl035/IOIPSL_PLUS/modipsl/lib
-IOIPSL_LIBDIR=/smphome/rech/psl/rpsl035/IOIPSL_PLUS/modipsl/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
-ORCH_INCDIR=$LMDGCM/../../lib
-ORCH_LIBDIR=$LMDGCM/../../lib
-OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
-OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
-INCA_LIBDIR=$LMDGCM/../INCA/config/lib
-INCA_INCDIR=$LMDGCM/../INCA/config/lib
+ROOT=$PWD
+NETCDF_INCDIR="-I $NETCDF_INC_DIR"
+#NETCDF_LIBDIR="-L $NETCDF_LIB_DIR"
+#NETCDF_LIB="-lnetcdff -lnetcdf"
 
+MPI_INCDIR=""
+MPI_LIBDIR=""
+MPI_LIB=""
+
+#HDF5_INCDIR="-I $HDF5_INC_DIR"
+#HDF5_LIBDIR="-L $HDF5_LIB_DIR"
+#HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz"
+
+IOIPSL_INCDIR="-I/smphome/rech/psl/rpsl035/IOIPSL_PLUS/modipsl/lib"
+IOIPSL_LIBDIR="-L/smphome/rech/psl/rpsl035/IOIPSL_PLUS/modipsl/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+
+ORCHIDEE_INCDIR="-I$ROOT/../ORCHIDEE/lib"
+ORCHIDEE_LIBDIR="-L$ROOT/../ORCHIDEE/lib"
+ORCHIDEE_LIB="-lorchidee "
+
+OASIS_INCDIR="-I$ROOT/../oasis3-mct/BLD/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$ROOT/../oasis3-mct/BLD/lib"
+OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
+
+INCA_INCDIR="-I$ROOT/../INCA/config/lib"
+INCA_LIBDIR="-I$ROOT/../INCA/config/lib"
+INCA_LIB="-lchimie"
+

trunk/LMDZ.COMMON/arch/arch-X64_MESU.path

@@ -1 @@
-NETCDF_LIBDIR="-L${NETCDF_FORT_ROOT}/lib -lnetcdff"
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L${NETCDF_FORT_ROOT}/lib"
+NETCDF_LIB="-lnetcdff"
 NETCDF_INCDIR="-I${NETCDF_FORT_ROOT}/include"
-IOIPSL_INCDIR=$LMDGCM/ioipsl/modipsl/lib
-IOIPSL_LIBDIR=$LMDGCM/ioipsl/modipsl/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
 
+IOIPSL_INCDIR="-I$ROOT/ioipsl/modipsl/lib"
+IOIPSL_LIBDIR="-L$ROOT/ioipsl/modipsl/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-X64_OCCIGEN.path

@@ -1 @@
-NETCDF_LIBDIR="-L${NETCDFF_LIBDIR} -lnetcdff -lnetcdf"
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L${NETCDFF_LIBDIR}"
+NETCDF_LIB="-lnetcdff -lnetcdf"
 NETCDF_INCDIR="-I${NETCDF_INCDIR}"
-IOIPSL_INCDIR=$LMDGCM/ioipsl/modipsl/lib
-IOIPSL_LIBDIR=$LMDGCM/ioipsl/modipsl/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+
+IOIPSL_INCDIR="-I$ROOT/ioipsl/modipsl/lib"
+IOIPSL_LIBDIR="-L$ROOT/ioipsl/modipsl/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-gfortran.path

@@ -1 @@
-NETCDF_LIBDIR="-L/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1/lib -lnetcdf"
-NETCDF_INCDIR=-I/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1/include
-IOIPSL_INCDIR=/home/aymeric/Science/MODELES/LMDZ.COMMON/ioipsl/modipsl/lib
-IOIPSL_LIBDIR=/home/aymeric/Science/MODELES/LMDZ.COMMON/ioipsl/modipsl/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1/lib"
+NETCDF_LIB="-lnetcdf"
+NETCDF_INCDIR="-I/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1/include"
+
+IOIPSL_INCDIR="-I/home/aymeric/Science/MODELES/LMDZ.COMMON/ioipsl/modipsl/lib"
+IOIPSL_LIBDIR="-L/home/aymeric/Science/MODELES/LMDZ.COMMON/ioipsl/modipsl/lib"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-linux-64bit-para.path

@@ -1 @@
-NETCDF_LIBDIR="-L/donnees/emlmd/netcdf64-4.0.1_ifort/lib -lnetcdf"
-NETCDF_INCDIR=-I/donnees/emlmd/netcdf64-4.0.1_ifort/include
-IOIPSL_INCDIR=/donnees/sllmd/ioipsl/modipsl/ifortpara/lib
-IOIPSL_LIBDIR=/donnees/sllmd/ioipsl/modipsl/ifortpara/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L/donnees/emlmd/netcdf64-4.0.1_ifort/lib""
+NETCDF_LIB="-lnetcdf"
+NETCDF_INCDIR="-I/donnees/emlmd/netcdf64-4.0.1_ifort/include"
+
+IOIPSL_INCDIR="-I/donnees/sllmd/ioipsl/modipsl/ifortpara/lib"
+IOIPSL_LIBDIR="-L/donnees/sllmd/ioipsl/modipsl/ifortpara/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-linux-64bit.path

@@ -1 @@
-NETCDF_LIBDIR="-L/donnees/emlmd/netcdf64-4.0.1_pgi/lib -lnetcdf"
-NETCDF_INCDIR=-I/donnees/emlmd/netcdf64-4.0.1_pgi/include
-IOIPSL_INCDIR=/donnees/emlmd/modipsl64_pgi/modipsl/lib
-IOIPSL_LIBDIR=/donnees/emlmd/modipsl64_pgi/modipsl/lib
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
-ORCH_INCDIR=/u/fairhead/modipsl_ioipsl_3/lib
-ORCH_LIBDIR=/u/fairhead/modipsl_ioipsl_3/lib
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L/donnees/emlmd/netcdf64-4.0.1_pgi/lib"
+NETCDF_LIB="-lnetcdf"
+NETCDF_INCDIR="-I/donnees/emlmd/netcdf64-4.0.1_pgi/include"
+
+IOIPSL_INCDIR="-I/donnees/emlmd/modipsl64_pgi/modipsl/lib"
+IOIPSL_LIBDIR="-L/donnees/emlmd/modipsl64_pgi/modipsl/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-linux-ifort-para.path

@@ -1 @@
-NETCDF_LIBDIR="-L/d2/emlmd/netcdf64-4.0.1_ifort/lib -lnetcdf"
-NETCDF_INCDIR=-I/d2/emlmd/netcdf64-4.0.1_ifort/include
-IOIPSL_INCDIR=/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort
-IOIPSL_LIBDIR=/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L/d2/emlmd/netcdf64-4.0.1_ifort/lib"
+NETCDF_LIB="-lnetcdf"
+NETCDF_INCDIR="-I/d2/emlmd/netcdf64-4.0.1_ifort/include"
+
+IOIPSL_INCDIR="-I/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort"
+IOIPSL_LIBDIR="-L/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+

trunk/LMDZ.COMMON/arch/arch-linux-ifort.path

@@ -1 @@
-NETCDF_LIBDIR="-L/d2/emlmd/netcdf64-4.0.1_ifort/lib -lnetcdf"
-NETCDF_INCDIR=-I/d2/emlmd/netcdf64-4.0.1_ifort/include
-IOIPSL_INCDIR=/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort
-IOIPSL_LIBDIR=/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+ROOT=$PWD
+
+NETCDF_LIBDIR="-L/d2/emlmd/netcdf64-4.0.1_ifort/lib"
+NETCDF_LIB="-lnetcdf"
+NETCDF_INCDIR="-I/d2/emlmd/netcdf64-4.0.1_ifort/include"
+
+IOIPSL_INCDIR="-I/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort"
+IOIPSL_LIBDIR="-L/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I$ROOT/../XIOS/inc"
+XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
+XIOS_LIB="-lxios -lstdc++"
+