Changeset 9971

Timestamp:

09/30/11 08:15:33 (14 years ago)

Author:

Mathieu Morlighem

Message:

Fixed large array for mac 64 bits

File:

• issm/trunk/m4/issm_options.m4 (modified) (4 diffs)

issm/trunk/m4/issm_options.m4

@@ -82 +82 @@
                                 fi
 
-                                MEXLIB=" mexversion.o -L$MATLAB_ROOT/bin/maci/ -lmx -lmex -lmat -lstdc++"
+                                MEXLIB=" mexversion.o -L$MATLAB_ROOT/bin/maci/ -lmx -lmex -lmat -lstdc++ -largeArrayDims"
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext`
                                 MEXEXT=".$MEXEXT"
@@ -120 +120 @@
                 
                 dnl  if matlab version is 7.5 and more, and if platform is x86_64, then compile with largearray
-                dnl   default is no 
+                dnl  default is no 
                 largearrays=no
                 if test $MATLAB_MAJOR -ge 7; then 
                         if test $MATLAB_MINOR -ge 5; then 
-                                if test "${host_cpu}" = "x86_64"; then
-                                        largearrays=yes
-                                fi
+                                case "${host_os}" in
+                                        *linux*)
+                                                if test "${host_cpu}" = "x86_64"; then
+                                                        largearrays=yes 
+                                                fi
+                                        ;;
+                                        *darwin*)
+                                                if test $MATLAB_MAJOR -ge 7; then 
+                                                        if test $MATLAB_MINOR -ge 10; then
+                                                                largearrays=yes
+                                                        fi
+                                                fi
+                                        ;;
+                                esac
                         fi
                 fi
@@ -424 +435 @@
                         if test "$PETSC_VERSION" = "3.1" ; then
                          PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
-                                fi
+                        fi
                         if test "$PETSC_VERSION" = "3.2" ; then
                          PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
@@ -430 +441 @@
                         ;;
                         *darwin*)
-                        if test "$PETSC_VERSION" = "2" ; then
+                        if test "$PETSC_VERSION" = "2.3" ; then
                         PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetscksp -lpetscdm -lpetscmat -lpetscvec -lpetscsnes -lpetscts -lpetsc"
                         fi
                         if test "$PETSC_VERSION" = "3" ; then
                         PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
-                        dnl PETSCLIB="-L$PETSC_ROOT/lib -lpetsc"
+                        fi
+                        if test "$PETSC_VERSION" = "3.1" ; then
+                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
+                        fi
+                        if test "$PETSC_VERSION" = "3.2" ; then
+                        PETSCLIB="-L$PETSC_ROOT/$PETSC_ARCH/lib -L$PETSC_ROOT/lib/$PETSC_ARCH/ -L$PETSC_ROOT/lib -L$PETSC_ROOT/lib/$PETSC_ARCH -lpetsc"
                         fi
                         ;;