Changeset 9813

Timestamp:

09/15/11 08:53:08 (14 years ago)

Author:

Eric.Larour

Message:

Changed adic to adic2 for options and Makefiles
Added config file to astrid.

Location:

issm/trunk

Files:

• configs/astrid/configure.sh.ad (added)
• configs/murdo/configure.sh.ad (modified) (3 diffs)
• configs/murdo/configure.sh.parallel (modified) (2 diffs)
• configs/murdo/configure.sh.serial (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ad/Makefile.am (modified) (4 diffs)
• src/c/Makefile.am (modified) (1 diff)

issm/trunk/configs/murdo/configure.sh.ad

@@ -3 +3 @@
 ./configure \
  --prefix=$ISSM_TIER \
- --with-matlab-dir=$MATLAB_DIR \
- --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
+ --with-serial=no\
  --with-metis-dir=$ISSM_TIER/externalpackages/metis/install \
  --with-petsc-dir=$ISSM_TIER/externalpackages/petsc/install \
@@ -19 +18 @@
  --with-ml-dir=$ISSM_TIER/externalpackages/petsc/install/ \
  --with-mumps-dir=$ISSM_TIER/externalpackages/petsc/install/ \
- --with-scotch-dir="$ISSM_TIER/externalpackages/scotch/install" \
- --with-chaco-dir="$ISSM_TIER/externalpackages/chaco/install" \
  --with-graphics-lib=/usr/lib64/libX11.so \
  --with-cxxoptflags="-mtune=barcelona -ffast-math -O3 -msse4.2 -Wno-write-strings "\
  --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/3.4.6/ -lg2c  /usr/lib/gcc/x86_64-redhat-linux/4.1.1/libgfortran.a" \
- --with-numthreads=24 \
- --with-adic-dir=$ISSM_TIER/externalpackages/adic/install/ \
+ --with-adic2-dir=$ISSM_TIER/externalpackages/adic/install/ \
+--with-numthreads=24 \
  --without-thermal \
  --without-control \
@@ -40 +37 @@
  
 #--without-prognostic \
-#--with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
-
- 

issm/trunk/configs/murdo/configure.sh.parallel

@@ -11 +11 @@
  --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" \
  --with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
  --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
  --with-plapack-lib="-L $ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
@@ -26 +25 @@
  --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/3.4.6/ -lg2c  /usr/lib/gcc/x86_64-redhat-linux/4.1.1/libgfortran.a" \
  --with-numthreads=24 \
- --with-adic-dir=$ISSM_TIER/externalpackages/adic/install/ \
   --enable-debugging
+
+ #--with-adic-dir=$ISSM_TIER/externalpackages/adic/install/ \
+# --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
  

issm/trunk/configs/murdo/configure.sh.serial

@@ -11 +11 @@
  --with-mpi-lib="-L$ISSM_TIER/externalpackages/mpich2/install/lib/ -lmpich" \
  --with-petsc-arch=$ISSM_ARCH \
- --with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \
  --with-blas-lapack-dir=$ISSM_TIER/externalpackages/petsc/install \
  --with-plapack-lib="-L $ISSM_TIER/externalpackages/petsc/install/ -lPLAPACK" \
@@ -26 +25 @@
  --with-numthreads=18 \
  --enable-debugging
+ 
+ #--with-dakota-dir=$ISSM_TIER/externalpackages/dakota/install \

issm/trunk/configure.ac

@@ -15 +15 @@
                         src/Makefile
                         src/c/Makefile
+                        src/ad/Makefile
                         src/mex/Makefile
                         bin/Makefile])

issm/trunk/src/Makefile.am

@@ -2 +2 @@
 SUBDIRS = c mex
 
-if AD
+if ADIC2
 SUBDIRS += ad
 endif

issm/trunk/src/ad/Makefile.am

@@ -1 @@
-INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@  @ADICINCL@
+INCLUDES = @DAKOTAINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@  @ADIC2INCL@
 
 #This Makefile.am is for automatic differentiation of the parallel version of ISSM.
@@ -14 +14 @@
 endif
 
-if AD
+if ADIC2
 lib_LIBRARIES += libAD.a 
 endif
@@ -586 +586 @@
 #}}}
 
-#AD library, for automatic differentiation {{{1
-if AD
+#ADIC2 library, for automatic differentiation {{{1
+if ADIC2
 #libAD_a_SOURCES = ./mini1.ad.c
 libAD_a_SOURCES = 
@@ -609 +609 @@
 LDADD =      ./libpISSM.a ./libOverload.a
 
-if AD
+if ADIC2
 LDADD +=    ./libAD.a
 endif
 
 #External packages
-LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADICLIB) 
+LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADIC2LIB) 
 
 

issm/trunk/src/c/Makefile.am

@@ -1305 +1305 @@
 LDADD =      ./libpISSM.a ./libOverload.a
 
-if AD
-LDADD +=    ./libAD.a
-endif
-
 #External packages
-LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADICLIB) 
+LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADIC2LIB)