Changeset 5836

Timestamp:

2019-03-21T14:04:31+01:00 (5 years ago)

Author:

josefine.ghattas

Message:

Integrated changeset [5834] (remove -qopenmp-threadprivate compat) and changeset [5835] (adaptation of arch.path syntax) previously done on the trunk.

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• arch/arch-X64_ADA.path (modified) (1 diff)
• arch/arch-X64_IRENE.path (modified) (1 diff)
• arch/arch-X64_OCCIGEN.path (modified) (1 diff)
• arch/arch-gfortran.path (modified) (1 diff)
• arch/arch-ifort_CICLAD.path (modified) (1 diff)
• arch/arch-ifort_LSCE.path (modified) (1 diff)
• makeorchidee_fcm (modified) (2 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_ADA.path

@@ -1 @@
-NETCDF_LIBDIR="${NETCDF_LDFLAGS:--L/smplocal/pub/NetCDF/4.1.3/mpi/lib -lnetcdff -lnetcdf -lstdc++ -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -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}"
+NETCDF_INCDIR="-I/smplocal/pub/HDF5/1.8.9/par/include -I/smplocal/pub/NetCDF/4.1.3/mpi/include"
+NETCDF_LIBDIR="-L/smplocal/pub/NetCDF/4.1.3/mpi/lib -L/smplocal/pub/HDF5/1.8.9/par/lib"
+NETCDF_LIB="-lnetcdff -lnetcdf -lstdc++ -Bstatic -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz"
+
 IOIPSL_INCDIR="-I${ORCHDIR}/../../lib -I${ORCHDIR}/../IOIPSL/inc"
-IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -lioipsl -L${ORCHDIR}/../IOIPSL/lib"
-XIOS_INCDIR=-I${ORCHDIR}/../XIOS/inc
-XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib -lxios"
+IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -L${ORCHDIR}/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
 
+XIOS_INCDIR="-I${ORCHDIR}/../XIOS/inc"
+XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib"
+XIOS_LIB="-lxios"
+

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_IRENE.path

@@ -1 @@
-NETCDF_LIBDIR="-L$NETCDF_LIBDIR -lnetcdf -L$NETCDFFORTRAN_LIBDIR -lnetcdff -lstdc++"
 NETCDF_INCDIR="-I$NETCDF_INCDIR -I$NETCDFFORTRAN_INCDIR"
+NETCDF_LIBDIR="-L$NETCDF_LIBDIR -L$NETCDFFORTRAN_LIBDIR"
+NETCDF_LIB="-lnetcdf -lnetcdff -lstdc++"
+
 IOIPSL_INCDIR="-I${ORCHDIR}/../../lib -I${ORCHDIR}/../IOIPSL/inc"
-IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -lioipsl -L${ORCHDIR}/../IOIPSL/lib"
-XIOS_INCDIR=-I${ORCHDIR}/../XIOS/inc
-XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib -lxios"
+IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -L${ORCHDIR}/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
 
+XIOS_INCDIR="-I${ORCHDIR}/../XIOS/inc"
+XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib"
+XIOS_LIB="-lxios"
+

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_OCCIGEN.path

@@ -1 @@
-NETCDF_LIBDIR="-L$NETCDF_LIB_DIR $NETCDFF_LIBDIR -lnetcdff -lnetcdf -lstdc++"
 NETCDF_INCDIR="-I$NETCDF_INC_DIR -I$NETCDFF_INCDIR"
+NETCDF_LIBDIR="-L$NETCDF_LIB_DIR $NETCDFF_LIBDIR"
+NETCDF_LIB="-lnetcdff -lnetcdf -lstdc++"
+
 IOIPSL_INCDIR="-I${ORCHDIR}/../../lib -I${ORCHDIR}/../IOIPSL/inc"
-IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -lioipsl -L${ORCHDIR}/../IOIPSL/lib"
-XIOS_INCDIR=-I${ORCHDIR}/../XIOS/inc
-XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib -lxios"
+IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -L${ORCHDIR}/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
 
+XIOS_INCDIR="-I${ORCHDIR}/../XIOS/inc"
+XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib"
+XIOS_LIB="-lxios"

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-gfortran.path

@@ -1 @@
-NETCDF_LIBDIR="-L/usr/local/lib -lnetcdf -lnetcdff"
-NETCDF_INCDIR=-I/usr/local/include
+NETCDF_INCDIR="-I/usr/local/include"
+NETCDF_LIBDIR="-L/usr/local/lib"
+NETCDF_LIB="-lnetcdf -lnetcdff"
+
 IOIPSL_INCDIR="-I${ORCHDIR}/../../lib -I${ORCHDIR}/../IOIPSL/inc"
-IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -lioipsl -L${ORCHDIR}/../IOIPSL/lib"
-XIOS_INCDIR=-I${ORCHDIR}/../XIOS/inc
-XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib -lxios"
+IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -L${ORCHDIR}/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
 
+XIOS_INCDIR="-I${ORCHDIR}/../XIOS/inc"
+XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib"
+XIOS_LIB="-lxios"

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-ifort_CICLAD.path

@@ -1 @@
-NETCDF_LIBDIR="-L/opt/netcdf42/ifort/lib -lnetcdf -lnetcdff -lstdc++"
-NETCDF_INCDIR=-I/opt/netcdf42/ifort/include
+NETCDF_INCDIR="-I/opt/netcdf42/ifort/include"
+NETCDF_LIBDIR="-L/opt/netcdf42/ifort/lib"
+NETCDF_LIB="-lnetcdf -lnetcdff -lstdc++"
+
 IOIPSL_INCDIR="-I${ORCHDIR}/../../lib -I${ORCHDIR}/../IOIPSL/inc"
-IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -lioipsl -L${ORCHDIR}/../IOIPSL/lib"
-XIOS_INCDIR=-I${ORCHDIR}/../XIOS/inc
-XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib -lxios"
+IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -L${ORCHDIR}/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
+
+XIOS_INCDIR="-I${ORCHDIR}/../XIOS/inc"
+XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib"
+XIOS_LIB="-lxios"

branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-ifort_LSCE.path

@@ -1 @@
-NETCDF_LIBDIR="-L/usr/local/install/netcdf-4.3.2p/lib -lnetcdff -lnetcdf -L/usr/local/install/hdf5-1.8.9p/lib -lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl -lstdc++"
-NETCDF_INCDIR=-I/usr/local/install/netcdf-4.3.2p/include
+NETCDF_INCDIR="-I/usr/local/install/netcdf-4.3.2p/include"
+NETCDF_LIBDIR="-L/usr/local/install/netcdf-4.3.2p/lib -L/usr/local/install/hdf5-1.8.9p/lib"
+NETCDF_LIB="-lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl -lstdc++"
+
 IOIPSL_INCDIR="-I${ORCHDIR}/../../lib -I${ORCHDIR}/../IOIPSL/inc"
-IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -lioipsl -L${ORCHDIR}/../IOIPSL/lib"
-XIOS_INCDIR=-I${ORCHDIR}/../XIOS/inc
-XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib -lxios"
+IOIPSL_LIBDIR="-L${ORCHDIR}/../../lib -L${ORCHDIR}/../IOIPSL/lib"
+IOIPSL_LIB="-lioipsl"
 
+XIOS_INCDIR="-I${ORCHDIR}/../XIOS/inc"
+XIOS_LIBDIR="-L${ORCHDIR}/../XIOS/lib"
+XIOS_LIB="-lxios"
+

branches/ORCHIDEE_2_2/ORCHIDEE/makeorchidee_fcm

@@ -447 +447 @@
 #
 INCDIR="$NETCDF_INCDIR $IOIPSL_INCDIR"
-LIBDIR="$NETCDF_LIBDIR $IOIPSL_LIBDIR"
+LIBDIR="$NETCDF_LIBDIR $NETCDF_LIB $IOIPSL_LIBDIR $IOIPSL_LIB"
 
 # Do we need to link with XIOS
@@ -454 +454 @@
     CPP_KEY="XIOS ${CPP_KEY}"
     INCDIR="${INCDIR} $XIOS_INCDIR"
-    LIBDIR="${LIBDIR} $XIOS_LIBDIR"
+    LIBDIR="${LIBDIR} $XIOS_LIBDIR $XIOS_LIB"
 fi