[13980] | 1 | Index: ../trunk-jpl/configs/config-macosx64-larour.sh
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/configs/config-macosx64-larour.sh (revision 13653)
|
---|
| 4 | +++ ../trunk-jpl/configs/config-macosx64-larour.sh (revision 13654)
|
---|
| 5 | @@ -18,9 +18,8 @@
|
---|
| 6 | --with-numthreads=8 \
|
---|
| 7 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 8 | --with-petsc-arch=$ISSM_ARCH \
|
---|
| 9 | + --with-cxxoptflags="-L/usr/lib -lbundle1.o"\
|
---|
| 10 | --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 11 | - --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
|
---|
| 12 | - --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
|
---|
| 13 | --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 14 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 15 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 16 | Index: ../trunk-jpl/configs/config-pleiades-petsc2.sh
|
---|
| 17 | ===================================================================
|
---|
| 18 | --- ../trunk-jpl/configs/config-pleiades-petsc2.sh (revision 13653)
|
---|
| 19 | +++ ../trunk-jpl/configs/config-pleiades-petsc2.sh (revision 13654)
|
---|
| 20 | @@ -2,7 +2,7 @@
|
---|
| 21 |
|
---|
| 22 | ./configure \
|
---|
| 23 | --prefix=$ISSM_DIR \
|
---|
| 24 | - --with-modules=no \
|
---|
| 25 | + --with-wrappers=no \
|
---|
| 26 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 27 | --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
|
---|
| 28 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 29 | Index: ../trunk-jpl/configs/config-linux64-ad.sh
|
---|
| 30 | ===================================================================
|
---|
| 31 | --- ../trunk-jpl/configs/config-linux64-ad.sh (revision 13653)
|
---|
| 32 | +++ ../trunk-jpl/configs/config-linux64-ad.sh (revision 13654)
|
---|
| 33 | @@ -2,7 +2,7 @@
|
---|
| 34 |
|
---|
| 35 | ./configure \
|
---|
| 36 | --prefix=$ISSM_DIR \
|
---|
| 37 | - --without-modules\
|
---|
| 38 | + --without-wrappers\
|
---|
| 39 | --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install\
|
---|
| 40 | --without-thermal \
|
---|
| 41 | --without-control \
|
---|
| 42 | Index: ../trunk-jpl/configs/config-pleiades-petscdev.sh
|
---|
| 43 | ===================================================================
|
---|
| 44 | --- ../trunk-jpl/configs/config-pleiades-petscdev.sh (revision 13653)
|
---|
| 45 | +++ ../trunk-jpl/configs/config-pleiades-petscdev.sh (revision 13654)
|
---|
| 46 | @@ -2,7 +2,7 @@
|
---|
| 47 |
|
---|
| 48 | ./configure \
|
---|
| 49 | --prefix=$ISSM_DIR \
|
---|
| 50 | - --with-modules=no \
|
---|
| 51 | + --with-wrappers=no \
|
---|
| 52 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 53 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/src/externalpackages/metis-5.0.2-p3 \
|
---|
| 54 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 55 | Index: ../trunk-jpl/configs/config-greenplanet.sh
|
---|
| 56 | ===================================================================
|
---|
| 57 | --- ../trunk-jpl/configs/config-greenplanet.sh (revision 13653)
|
---|
| 58 | +++ ../trunk-jpl/configs/config-greenplanet.sh (revision 13654)
|
---|
| 59 | @@ -5,7 +5,7 @@
|
---|
| 60 |
|
---|
| 61 | ./configure \
|
---|
| 62 | --prefix=$ISSM_DIR \
|
---|
| 63 | - --with-modules=no \
|
---|
| 64 | + --with-wrappers=no \
|
---|
| 65 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 66 | --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
|
---|
| 67 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 68 | Index: ../trunk-jpl/configs/config-arm-linux.sh
|
---|
| 69 | ===================================================================
|
---|
| 70 | --- ../trunk-jpl/configs/config-arm-linux.sh (revision 13653)
|
---|
| 71 | +++ ../trunk-jpl/configs/config-arm-linux.sh (revision 13654)
|
---|
| 72 | @@ -6,7 +6,7 @@
|
---|
| 73 | --host="arm-linux-androideabi" \
|
---|
| 74 | --enable-shared \
|
---|
| 75 | --without-fortran \
|
---|
| 76 | - --without-modules \
|
---|
| 77 | + --without-wrappers \
|
---|
| 78 | --without-kriging \
|
---|
| 79 | --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
|
---|
| 80 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 81 | Index: ../trunk-jpl/configs/config-macosx64-ad.sh
|
---|
| 82 | ===================================================================
|
---|
| 83 | --- ../trunk-jpl/configs/config-macosx64-ad.sh (revision 13653)
|
---|
| 84 | +++ ../trunk-jpl/configs/config-macosx64-ad.sh (revision 13654)
|
---|
| 85 | @@ -2,7 +2,7 @@
|
---|
| 86 |
|
---|
| 87 | ./configure \
|
---|
| 88 | --prefix=$ISSM_DIR \
|
---|
| 89 | - --without-modules\
|
---|
| 90 | + --without-wrappers\
|
---|
| 91 | --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install\
|
---|
| 92 | --without-thermal \
|
---|
| 93 | --without-control \
|
---|
| 94 | Index: ../trunk-jpl/configs/config-pleiades.sh
|
---|
| 95 | ===================================================================
|
---|
| 96 | --- ../trunk-jpl/configs/config-pleiades.sh (revision 13653)
|
---|
| 97 | +++ ../trunk-jpl/configs/config-pleiades.sh (revision 13654)
|
---|
| 98 | @@ -2,7 +2,7 @@
|
---|
| 99 |
|
---|
| 100 | ./configure \
|
---|
| 101 | --prefix=$ISSM_DIR \
|
---|
| 102 | - --with-modules=no \
|
---|
| 103 | + --with-wrappers=no \
|
---|
| 104 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 105 | --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
|
---|
| 106 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 107 | Index: ../trunk-jpl/configs/config-macosx64-gsl.sh
|
---|
| 108 | ===================================================================
|
---|
| 109 | --- ../trunk-jpl/configs/config-macosx64-gsl.sh (revision 13653)
|
---|
| 110 | +++ ../trunk-jpl/configs/config-macosx64-gsl.sh (revision 13654)
|
---|
| 111 | @@ -2,7 +2,7 @@
|
---|
| 112 |
|
---|
| 113 | ./configure \
|
---|
| 114 | --prefix=$ISSM_DIR \
|
---|
| 115 | - --without-modules\
|
---|
| 116 | + --without-wrappers\
|
---|
| 117 | --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install
|
---|
| 118 | #--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install
|
---|
| 119 | #--without-fortran-lib
|
---|