Context Navigation

← Previous Change
Next Change →

Changeset 3605 for LMDZ6/branches/Ocean_skin/arch/arch-X64_JEANZAY.path

Timestamp:

Nov 21, 2019, 4:43:45 PM (5 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

: 1 edited
: 1 copied

. (modified) (1 prop)
arch/arch-X64_JEANZAY.path (copied) (copied from LMDZ6/trunk/arch/arch-X64_JEANZAY.path) (1 diff)

Legend:

: Unmodified
: Added
: Removed

LMDZ6/branches/Ocean_skin

Property svn:mergeinfo changed

/LMDZ6/trunk (added)

merged: 3430,3435-3457,3459-3462,3464-3477,3479-3480,3484,3486,3488-3500,3502-3509,3511-3513,3515-3518,3520,3522-3524,3526-3528,3531-3544,3546-3553,3559,3562-3563,3565,3567-3572,3574-3575,3577-3581,3583-3590,3592-3600

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

-                      r3600
+                      r3605
 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_trunk
+IOIPSL_LIBDIR=$WORK/build/IOIPSL_trunk
 ORCH_INCDIR=$LMDGCM/../../lib
 ORCH_LIBDIR=$LMDGCM/../../lib

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

Download in other formats: