Changeset 13256

Timestamp:

09/04/12 17:50:54 (13 years ago)

Author:

Eric.Larour

Message:

CHG: missing Adolc libraries in matlab modules.
Homogeneized configuration files for ad.
In lib: get svn to ignore some files.

Location:

issm/trunk-jpl

Files:

• configs/config-linux64-ad.sh (modified) (1 diff)
• configs/config-linux64-astrid-ad.sh (modified) (1 diff)
• lib (modified) (1 prop)
• src/modules/matlab/Makefile.am (modified) (1 diff)

issm/trunk-jpl/configs/config-linux64-ad.sh

@@ -18 +18 @@
         --without-groundingline \
         --without-kriging  \
-        --with-adolc-dir=$ADOLC_DIR 
+        --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install

issm/trunk-jpl/configs/config-linux64-astrid-ad.sh

@@ -2 +2 @@
 
 ./configure \
- --prefix=$ISSM_DIR \
- --with-serial=no\
- --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
- --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
- --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
- --with-petsc-arch=$ISSM_ARCH \
- --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
- --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
- --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" \
- --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
- --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
- --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
- --with-graphics-lib=/usr/lib64/libX11.so \
- --with-cxxoptflags="-march=opteron -O2" \
- --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" \
- --with-rose-dir=$ISSM_DIR/externalpackages/rose/install/ \
- --with-adic2-dir=$ISSM_DIR/externalpackages/adic/install/ \
- --with-numthreads=24 \
- --without-thermal \
- --without-control \
- --without-hydrology \
- --without-diagnostic \
- --without-balanced \
- --without-responses \
- --without-slope \
- --without-rifts \
- --without-steadystate \
- --without-transient \
- --without-3d \
- --without-groundingline
- 
-#--without-prognostic \
+        --prefix=$ISSM_DIR \
+        --without-kriging  \
+        --without-kml  \
+        --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+        --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
+        --with-matlab-dir=$MATLAB_DIR \
+        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \

issm/trunk-jpl/src/modules/matlab/Makefile.am

@@ -89 +89 @@
 deps +=
 else
-deps += ../../c/libISSMModules.a ../../c/libISSMCore.a
+deps += ../../c/libISSMModules.a ../../c/libISSMCore.a  
+if ADOLC
+deps += $(ADOLCLIB)
+endif
 endif