Changeset 1641 for trunk/LMDZ.COMMON/arch

Timestamp:

Dec 8, 2016, 11:13:59 AM (8 years ago)

Author:

emillour

Message:

Update Occigen arch files and IOIPSL install script to follow up with recent changesof Occigen settings.
EM

Location:

trunk/LMDZ.COMMON/arch

Files:

• arch-X64_OCCIGEN.fcm (modified) (1 diff)
• arch-X64_OCCIGEN.path (modified) (1 diff)

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

@@ -11 +11 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp -openmp-threadprivate compat
-%BASE_LD             -i4 -r8 -auto -shared-intel -Wl,-rpath=/opt/software/libraries/netcdf/bullxmpi/netcdf-4.3.3-rc2/lib:/opt/software/libraries/netcdf/bullxmpi/netcdf-fortran-4.4.1-4.3.3-rc2/lib:/opt/software/libraries/hdf5/hdf5_with_bullxmpi/1.8.14/lib $MKL_LIBS
+%BASE_LD             -i4 -r8 -auto -shared-intel -Wl,-rpath=${NETCDFF_LIBDIR} $MKL_LIBS
 %MPI_LD
 %OMP_LD              -openmp

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

@@ -1 @@
-NETCDF_LIBDIR="-L/opt/software/libraries/netcdf/bullxmpi/netcdf-fortran-4.4.1-4.3.3-rc2/lib -lnetcdff -L/opt/software/libraries/netcdf/bullxmpi/netcdf-4.3.3-rc2/lib -lnetcdf -L/opt/software/libraries/hdf5/hdf5_with_bullxmpi/1.8.14/lib -lhdf5_hl -lhdf5 -lz"
-NETCDF_INCDIR="-I/opt/software/libraries/hdf5/hdf5_with_bullxmpi/1.8.14/include -I/opt/software/libraries/netcdf/bullxmpi/netcdf-fortran-4.4.1-4.3.3-rc2/include"
+NETCDF_LIBDIR="-L${NETCDFF_LIBDIR} -lnetcdff"
+NETCDF_INCDIR="-I${NETCDF_INCDIR}"
 IOIPSL_INCDIR=$LMDGCM/ioipsl/modipsl/lib
 IOIPSL_LIBDIR=$LMDGCM/ioipsl/modipsl/lib