Changeset 4275

Timestamp:

06/28/10 15:37:03 (15 years ago)

Author:

Eric.Larour

Message:

Some changes to make max osx compilable

Location:

issm/trunk

Files:

• configs/macosx64/macosx64.sh.petsc2 (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)
• src/c/toolkits/metis/metisincludes.h (modified) (1 diff)

issm/trunk/configs/macosx64/macosx64.sh.petsc2

@@ -1 +1 @@
 #!/bin/sh
 
-./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  --with-petsc-version=2 --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-fortran-lib="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-cxxoptflags="-march=opteron -O2" --with-numthreads=8
+./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  --with-petsc-version=2 --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  --with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3 --with-fortran-lib="/usr/local/lib/libgfortran.a" --with-math-lib="/usr/lib/libm.dylib" --with-graphics-lib="/usr/X11/lib/libX11.dylib" --with-cxxoptflags="-march=opteron -O2 -w" --with-numthreads=8

issm/trunk/m4/issm_options.m4

@@ -704 +704 @@
         MULTITHREADINLIB=""
         if test "$NUMTHREADS_VALUE" != "1"; then
+                
                 MULTITHREADINGLIB="-lpthread -lrt"
+                case "${host_os}" in
+                *cygwin*)
+                MULTITHREADINGLIB="-lpthread -lrt"
+                ;;
+                *linux*)
+                MULTITHREADINGLIB="-lpthread -lrt"
+                ;;
+                *darwin*)
+                MULTITHREADINGLIB="-lpthread"
+                ;;
+                esac
+
                 AC_DEFINE([_MULTITHREADING_],[1],[with numthreads enabled])
                 AC_DEFINE_UNQUOTED([_NUMTHREADS_],[$NUMTHREADS_VALUE],[number of threads])

issm/trunk/src/c/toolkits/metis/metisincludes.h

@@ -9 +9 @@
 #include <metis.h>
 
-void METIS_PartMeshNodal(int *, int *, idxtype *, int *, int *, int *, int *, idxtype *, idxtype *);
+extern "C" void METIS_PartMeshNodal(int *, int *, idxtype *, int *, int *, int *, int *, idxtype *, idxtype *);
 
 #endif