[issm-svn] r18312 - issm/trunk/configs

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2014-07-31 11:10:53 -0700 (Thu, 31 Jul 2014)
New Revision: 18312

Modified:
   issm/trunk/configs/config-macosx64.sh
   issm/trunk/configs/configure.sh
Log:
CHG: updating some configuration scripts

Modified: issm/trunk/configs/config-macosx64.sh
===================================================================
--- issm/trunk/configs/config-macosx64.sh	2014-07-31 17:33:05 UTC (rev 18311)
+++ issm/trunk/configs/config-macosx64.sh	2014-07-31 18:10:53 UTC (rev 18312)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#petsc 3.4
+#petsc 3.5
 #mpich 3.0.4
 
 ./configure \
@@ -11,14 +11,8 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--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

Modified: issm/trunk/configs/configure.sh
===================================================================
--- issm/trunk/configs/configure.sh	2014-07-31 17:33:05 UTC (rev 18311)
+++ issm/trunk/configs/configure.sh	2014-07-31 18:10:53 UTC (rev 18312)
@@ -11,9 +11,7 @@
 	--with-mpi-include="$ISSM_DIR/externalpackages/mpich/install/include"  \
 	--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/" \
 	--with-numthreads=2