Changeset 18312

Timestamp:

07/31/14 11:10:53 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: updating some configuration scripts

Location:

issm/trunk/configs

Files:

• config-macosx64.sh (modified) (2 diffs)
• configure.sh (modified) (1 diff)

issm/trunk/configs/config-macosx64.sh

@@ -1 +1 @@
 #!/bin/sh
 
-#petsc 3.4
+#petsc 3.5
 #mpich 3.0.4
 
@@ -12 +12 @@
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
         --with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpl.a " \
-        --with-petsc-arch=$ISSM_ARCH \
-        --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
-        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
-        --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-        --with-fortran-lib="/usr/lib/gcc/i686-apple-darwin10/4.2.1/x86_64/libgfortran.a" \
-        --with-math-lib="/usr/lib/libm.dylib" \
+        --with-fortran-lib="-L/usr/local/gfortran/lib/ -lgcc_s.1"\
         --with-graphics-lib="/usr/X11/lib/libX11.dylib" \
-        --with-cxxoptflags=" -fno-common -no-cpp-precomp -fexceptions -arch x86_64 -mmacosx-version-min=10.5  -O3 -DNDEBUG -w "\
-        --with-numthreads=8
+        --with-numthreads=4

issm/trunk/configs/configure.sh

@@ -12 +12 @@
         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
         --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-petsc-arch="$ISSM_ARCH" \
         --with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \
-        --with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
         --with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install/" \
         --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install/" \