Changeset 3798 for LMDZ6/branches/Ocean_skin/arch

Timestamp:

Jan 11, 2021, 11:24:08 PM (4 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• arch/arch-X64_IRENE-AMD.fcm (copied) (copied from LMDZ6/trunk/arch/arch-X64_IRENE-AMD.fcm)
• arch/arch-X64_IRENE-AMD.path (copied) (copied from LMDZ6/trunk/arch/arch-X64_IRENE-AMD.path)
• arch/arch-X64_IRENE.path (modified) (2 diffs)
• arch/arch-X64_JEANZAY.path (modified) (2 diffs)
• arch/arch-ifort_CICLAD.path (modified) (1 diff)
• arch/arch-ifort_LSCE.path (modified) (1 diff)

LMDZ6/branches/Ocean_skin/arch/arch-X64_IRENE.path

@@ -1 +1 @@
 NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR -lnetcdf -lnetcdff"
 NETCDF_INCDIR=-I$NETCDFFORTRAN_INCDIR
-IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
-IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
+IOIPSL_INCDIR=$CCCWORKDIR/build/IOIPSL/src
+IOIPSL_LIBDIR=$CCCWORKDIR/build/IOIPSL/src
 ORCH_INCDIR=$LMDGCM/../../lib
 ORCH_LIBDIR=$LMDGCM/../../lib
@@ -9 +9 @@
 INCA_LIBDIR=$LMDGCM/../INCA/build/lib
 INCA_INCDIR=$LMDGCM/../INCA/build/inc
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+XIOS_INCDIR=$CCCWORKDIR/include/XIOS
+XIOS_LIBDIR=$CCCWORKDIR/lib

LMDZ6/branches/Ocean_skin/arch/arch-X64_JEANZAY.path

@@ -4 +4 @@
 NETCDF_LIBDIR="-lnetcdf -lnetcdff"
 NETCDF_INCDIR=
-IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
-IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
+IOIPSL_INCDIR=$WORK/build/IOIPSL_debug/src
+IOIPSL_LIBDIR=$WORK/build/IOIPSL_debug/src
 ORCH_INCDIR=$LMDGCM/../../lib
 ORCH_LIBDIR=$LMDGCM/../../lib
@@ -12 +12 @@
 INCA_LIBDIR=$LMDGCM/../INCA/build/lib
 INCA_INCDIR=$LMDGCM/../INCA/build/inc
-XIOS_INCDIR=$LMDGCM/../XIOS/inc
-XIOS_LIBDIR=$LMDGCM/../XIOS/lib
+XIOS_INCDIR=$WORK/include/XIOS
+XIOS_LIBDIR=$WORK/lib

LMDZ6/branches/Ocean_skin/arch/arch-ifort_CICLAD.path

@@ -1 +1 @@
 NETCDF_LIBDIR="-L${NETCDF_HOME}/lib -lnetcdf -lnetcdff"
 NETCDF_INCDIR=-I${NETCDF_HOME}/include
-IOIPSL_INCDIR=$LMDGCM/../../lib
-IOIPSL_LIBDIR=$LMDGCM/../../lib
+IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
+IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib" 
 ORCH_INCDIR=$LMDGCM/../../lib
 ORCH_LIBDIR=$LMDGCM/../../lib

LMDZ6/branches/Ocean_skin/arch/arch-ifort_LSCE.path

@@ -1 +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"
 NETCDF_INCDIR=-I/usr/local/install/netcdf-4.3.2p/include
-IOIPSL_INCDIR=$LMDGCM/../../lib
-IOIPSL_LIBDIR=$LMDGCM/../../lib
+IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
+IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib" 
 ORCH_INCDIR=$LMDGCM/../../lib
 ORCH_LIBDIR=$LMDGCM/../../lib