[21726] | 1 | Index: ../trunk-jpl/jenkins/macosx_pine-island_examples
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/jenkins/macosx_pine-island_examples (revision 21693)
|
---|
| 4 | +++ ../trunk-jpl/jenkins/macosx_pine-island_examples (revision 21694)
|
---|
| 5 | @@ -11,7 +11,7 @@
|
---|
| 6 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 7 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 8 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 9 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich -lmpich -lmpl" \
|
---|
| 10 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 11 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 12 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 13 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 14 | @@ -33,9 +33,9 @@
|
---|
| 15 | #List of external pakages to be installed and their installation scripts
|
---|
| 16 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 17 | cmake install.sh
|
---|
| 18 | - mpich install-3.0-macosx64.sh
|
---|
| 19 | + mpich install-3.2-macosx64.sh
|
---|
| 20 | m1qn3 install.sh
|
---|
| 21 | - petsc install-3.6-macosx64.sh
|
---|
| 22 | + petsc install-3.7-macosx64.sh
|
---|
| 23 | triangle install-macosx64.sh
|
---|
| 24 | shell2junit install.sh"
|
---|
| 25 |
|
---|
| 26 | Index: ../trunk-jpl/jenkins/linux64_caladan
|
---|
| 27 | ===================================================================
|
---|
| 28 | --- ../trunk-jpl/jenkins/linux64_caladan (revision 21693)
|
---|
| 29 | +++ ../trunk-jpl/jenkins/linux64_caladan (revision 21694)
|
---|
| 30 | @@ -12,7 +12,7 @@
|
---|
| 31 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 32 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 33 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 34 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 35 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 36 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 37 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 38 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 39 | @@ -39,8 +39,8 @@
|
---|
| 40 |
|
---|
| 41 | #List of external pakages to be installed and their installation scripts
|
---|
| 42 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 43 | - mpich install-3.0-linux64.sh
|
---|
| 44 | - petsc install-3.6-linux64.sh
|
---|
| 45 | + mpich install-3.2-linux64.sh
|
---|
| 46 | + petsc install-3.7-linux64.sh
|
---|
| 47 | triangle install-linux64.sh
|
---|
| 48 | boost install.sh
|
---|
| 49 | dakota install-6.2-linux64.sh
|
---|
| 50 | Index: ../trunk-jpl/jenkins/macosx_pine-island
|
---|
| 51 | ===================================================================
|
---|
| 52 | --- ../trunk-jpl/jenkins/macosx_pine-island (revision 21693)
|
---|
| 53 | +++ ../trunk-jpl/jenkins/macosx_pine-island (revision 21694)
|
---|
| 54 | @@ -11,7 +11,7 @@
|
---|
| 55 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 56 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 57 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 58 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich -lmpich -lmpl" \
|
---|
| 59 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 60 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 61 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 62 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 63 | @@ -32,9 +32,9 @@
|
---|
| 64 | #List of external pakages to be installed and their installation scripts
|
---|
| 65 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 66 | cmake install.sh
|
---|
| 67 | - mpich install-3.0-macosx64.sh
|
---|
| 68 | + mpich install-3.2-macosx64.sh
|
---|
| 69 | m1qn3 install.sh
|
---|
| 70 | - petsc install-3.6-macosx64.sh
|
---|
| 71 | + petsc install-3.7-macosx64.sh
|
---|
| 72 | triangle install-macosx64.sh
|
---|
| 73 | shell2junit install.sh"
|
---|
| 74 |
|
---|
| 75 | Index: ../trunk-jpl/jenkins/linux64_ross_test
|
---|
| 76 | ===================================================================
|
---|
| 77 | --- ../trunk-jpl/jenkins/linux64_ross_test (revision 21693)
|
---|
| 78 | +++ ../trunk-jpl/jenkins/linux64_ross_test (revision 21694)
|
---|
| 79 | @@ -12,7 +12,7 @@
|
---|
| 80 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 81 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 82 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 83 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 84 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 85 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 86 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 87 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 88 | @@ -39,8 +39,8 @@
|
---|
| 89 |
|
---|
| 90 | #List of external pakages to be installed and their installation scripts
|
---|
| 91 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 92 | - mpich install-3.0-linux64.sh
|
---|
| 93 | - petsc install-3.6-linux64.sh
|
---|
| 94 | + mpich install-3.2-linux64.sh
|
---|
| 95 | + petsc install-3.7-linux64.sh
|
---|
| 96 | triangle install-linux64.sh
|
---|
| 97 | boost install.sh
|
---|
| 98 | dakota install-6.2-linux64.sh
|
---|
| 99 | Index: ../trunk-jpl/jenkins/linux64_ross
|
---|
| 100 | ===================================================================
|
---|
| 101 | --- ../trunk-jpl/jenkins/linux64_ross (revision 21693)
|
---|
| 102 | +++ ../trunk-jpl/jenkins/linux64_ross (revision 21694)
|
---|
| 103 | @@ -12,7 +12,7 @@
|
---|
| 104 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 105 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 106 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 107 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 108 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 109 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 110 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 111 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 112 | @@ -37,7 +37,7 @@
|
---|
| 113 |
|
---|
| 114 | #List of external pakages to be installed and their installation scripts
|
---|
| 115 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 116 | - mpich install-3.0-linux64.sh
|
---|
| 117 | + mpich install-3.2-linux64.sh
|
---|
| 118 | petsc install-3.7-linux64.sh
|
---|
| 119 | triangle install-linux64.sh
|
---|
| 120 | chaco install.sh
|
---|
| 121 | Index: ../trunk-jpl/jenkins/linux64_caladan_ad
|
---|
| 122 | ===================================================================
|
---|
| 123 | --- ../trunk-jpl/jenkins/linux64_caladan_ad (revision 21693)
|
---|
| 124 | +++ ../trunk-jpl/jenkins/linux64_caladan_ad (revision 21694)
|
---|
| 125 | @@ -28,8 +28,8 @@
|
---|
| 126 |
|
---|
| 127 | #List of external pakages to be installed and their installation scripts
|
---|
| 128 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 129 | - mpich install-3.0-linux64.sh
|
---|
| 130 | - petsc install-3.6-linux64.sh
|
---|
| 131 | + mpich install-3.2-linux64.sh
|
---|
| 132 | + petsc install-3.7-linux64.sh
|
---|
| 133 | metis install-5.0.1-linux64.sh
|
---|
| 134 | triangle install-linux64.sh
|
---|
| 135 | gsl install-linux64.sh
|
---|
| 136 | Index: ../trunk-jpl/jenkins/linux64_ross_python
|
---|
| 137 | ===================================================================
|
---|
| 138 | --- ../trunk-jpl/jenkins/linux64_ross_python (revision 21693)
|
---|
| 139 | +++ ../trunk-jpl/jenkins/linux64_ross_python (revision 21694)
|
---|
| 140 | @@ -11,7 +11,7 @@
|
---|
| 141 | --disable-static \
|
---|
| 142 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 143 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 144 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 145 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 146 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 147 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 148 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 149 | @@ -35,7 +35,7 @@
|
---|
| 150 | #-----------------------------------#
|
---|
| 151 |
|
---|
| 152 | #List of external pakages to be installed and their installation scripts
|
---|
| 153 | -EXTERNALPACKAGES="mpich install-3.0-linux64.sh
|
---|
| 154 | +EXTERNALPACKAGES="mpich install-3.2-linux64.sh
|
---|
| 155 | petsc install-3.7-linux64.sh
|
---|
| 156 | triangle install-linux64.sh
|
---|
| 157 | chaco install.sh
|
---|
| 158 | Index: ../trunk-jpl/jenkins/linux64_caladan_ampi
|
---|
| 159 | ===================================================================
|
---|
| 160 | --- ../trunk-jpl/jenkins/linux64_caladan_ampi (revision 21693)
|
---|
| 161 | +++ ../trunk-jpl/jenkins/linux64_caladan_ampi (revision 21694)
|
---|
| 162 | @@ -18,7 +18,7 @@
|
---|
| 163 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 164 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 165 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 166 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 167 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 168 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 169 | --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 170 | --with-numthreads=4 \
|
---|
| 171 | @@ -37,8 +37,8 @@
|
---|
| 172 |
|
---|
| 173 | #List of external pakages to be installed and their installation scripts
|
---|
| 174 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 175 | - mpich install-3.0-linux64.sh
|
---|
| 176 | - petsc install-3.6-linux64.sh
|
---|
| 177 | + mpich install-3.2-linux64.sh
|
---|
| 178 | + petsc install-3.7-linux64.sh
|
---|
| 179 | metis install-5.0.1-linux64.sh
|
---|
| 180 | triangle install-linux64.sh
|
---|
| 181 | gsl install-linux64.sh
|
---|
| 182 | Index: ../trunk-jpl/jenkins/linux64_ross_ad
|
---|
| 183 | ===================================================================
|
---|
| 184 | --- ../trunk-jpl/jenkins/linux64_ross_ad (revision 21693)
|
---|
| 185 | +++ ../trunk-jpl/jenkins/linux64_ross_ad (revision 21694)
|
---|
| 186 | @@ -32,7 +32,7 @@
|
---|
| 187 |
|
---|
| 188 | #List of external pakages to be installed and their installation scripts
|
---|
| 189 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 190 | - mpich install-3.0-linux64.sh
|
---|
| 191 | + mpich install-3.2-linux64.sh
|
---|
| 192 | petsc install-3.7-linux64.sh
|
---|
| 193 | metis install-5.0.1-linux64.sh
|
---|
| 194 | triangle install-linux64.sh
|
---|
| 195 | Index: ../trunk-jpl/jenkins/macosx_pine-island_static
|
---|
| 196 | ===================================================================
|
---|
| 197 | --- ../trunk-jpl/jenkins/macosx_pine-island_static (revision 21693)
|
---|
| 198 | +++ ../trunk-jpl/jenkins/macosx_pine-island_static (revision 21694)
|
---|
| 199 | @@ -14,7 +14,7 @@
|
---|
| 200 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 201 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 202 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 203 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich -lmpich -lmpl" \
|
---|
| 204 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 205 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 206 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 207 | --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 208 | @@ -35,9 +35,9 @@
|
---|
| 209 | #List of external pakages to be installed and their installation scripts
|
---|
| 210 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 211 | cmake install.sh
|
---|
| 212 | - mpich install-3.0-macosx64-static.sh
|
---|
| 213 | + mpich install-3.2-macosx64-static.sh
|
---|
| 214 | m1qn3 install.sh
|
---|
| 215 | - petsc install-3.6-macosx64-static.sh
|
---|
| 216 | + petsc install-3.7-macosx64-static.sh
|
---|
| 217 | triangle install-macosx64.sh
|
---|
| 218 | shell2junit install.sh"
|
---|
| 219 |
|
---|
| 220 | Index: ../trunk-jpl/jenkins/linux64_ross_ampi
|
---|
| 221 | ===================================================================
|
---|
| 222 | --- ../trunk-jpl/jenkins/linux64_ross_ampi (revision 21693)
|
---|
| 223 | +++ ../trunk-jpl/jenkins/linux64_ross_ampi (revision 21694)
|
---|
| 224 | @@ -20,7 +20,7 @@
|
---|
| 225 | --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
|
---|
| 226 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 227 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 228 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 229 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 230 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 231 | --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 232 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 233 | @@ -40,7 +40,7 @@
|
---|
| 234 |
|
---|
| 235 | #List of external pakages to be installed and their installation scripts
|
---|
| 236 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 237 | - mpich install-3.0-linux64.sh
|
---|
| 238 | + mpich install-3.2-linux64.sh
|
---|
| 239 | petsc install-3.7-linux64.sh
|
---|
| 240 | metis install-5.0.1-linux64.sh
|
---|
| 241 | triangle install-linux64.sh
|
---|
| 242 | Index: ../trunk-jpl/jenkins/linux64_ross_static
|
---|
| 243 | ===================================================================
|
---|
| 244 | --- ../trunk-jpl/jenkins/linux64_ross_static (revision 21693)
|
---|
| 245 | +++ ../trunk-jpl/jenkins/linux64_ross_static (revision 21694)
|
---|
| 246 | @@ -14,7 +14,7 @@
|
---|
| 247 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 248 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 249 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 250 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 251 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 252 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 253 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 254 | --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 255 | @@ -35,9 +35,9 @@
|
---|
| 256 | #List of external pakages to be installed and their installation scripts
|
---|
| 257 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 258 | cmake install.sh
|
---|
| 259 | - mpich install-3.0-linux64-static.sh
|
---|
| 260 | + mpich install-3.2-linux64-static.sh
|
---|
| 261 | m1qn3 install.sh
|
---|
| 262 | - petsc install-3.6-linux64-static.sh
|
---|
| 263 | + petsc install-3.7-linux64-static.sh
|
---|
| 264 | triangle install-linux64.sh
|
---|
| 265 | shell2junit install.sh"
|
---|
| 266 |
|
---|
| 267 | Index: ../trunk-jpl/jenkins/linux64_ross_gia
|
---|
| 268 | ===================================================================
|
---|
| 269 | --- ../trunk-jpl/jenkins/linux64_ross_gia (revision 21693)
|
---|
| 270 | +++ ../trunk-jpl/jenkins/linux64_ross_gia (revision 21694)
|
---|
| 271 | @@ -12,7 +12,7 @@
|
---|
| 272 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 273 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 274 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 275 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 276 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 277 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 278 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 279 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 280 | @@ -37,8 +37,8 @@
|
---|
| 281 |
|
---|
| 282 | #List of external pakages to be installed and their installation scripts
|
---|
| 283 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 284 | - mpich install-3.0-linux64.sh
|
---|
| 285 | - petsc install-3.6-linux64.sh
|
---|
| 286 | + mpich install-3.2-linux64.sh
|
---|
| 287 | + petsc install-3.7-linux64.sh
|
---|
| 288 | triangle install-linux64.sh
|
---|
| 289 | math77 install.sh
|
---|
| 290 | gmsh install.sh
|
---|
| 291 | Index: ../trunk-jpl/jenkins/macosx_pine-island_dakota
|
---|
| 292 | ===================================================================
|
---|
| 293 | --- ../trunk-jpl/jenkins/macosx_pine-island_dakota (revision 21693)
|
---|
| 294 | +++ ../trunk-jpl/jenkins/macosx_pine-island_dakota (revision 21694)
|
---|
| 295 | @@ -11,7 +11,7 @@
|
---|
| 296 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 297 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 298 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 299 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich -lmpich -lmpl" \
|
---|
| 300 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 301 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 302 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 303 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 304 | @@ -35,10 +35,10 @@
|
---|
| 305 | #List of external pakages to be installed and their installation scripts
|
---|
| 306 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 307 | cmake install.sh
|
---|
| 308 | - mpich install-3.0-macosx64.sh
|
---|
| 309 | + mpich install-3.2-macosx64.sh
|
---|
| 310 | chaco install-macosx64.sh
|
---|
| 311 | m1qn3 install.sh
|
---|
| 312 | - petsc install-3.5-macosx64.sh
|
---|
| 313 | + petsc install-3.7-macosx64.sh
|
---|
| 314 | triangle install-macosx64.sh
|
---|
| 315 | boost install-1.55-macosx-el_capitan.sh
|
---|
| 316 | dakota install-6.2-macosx64.sh
|
---|
| 317 | Index: ../trunk-jpl/jenkins/linux64_ross_dakota
|
---|
| 318 | ===================================================================
|
---|
| 319 | --- ../trunk-jpl/jenkins/linux64_ross_dakota (revision 21693)
|
---|
| 320 | +++ ../trunk-jpl/jenkins/linux64_ross_dakota (revision 21694)
|
---|
| 321 | @@ -12,7 +12,7 @@
|
---|
| 322 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 323 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 324 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 325 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 326 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 327 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 328 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 329 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 330 | @@ -37,7 +37,7 @@
|
---|
| 331 |
|
---|
| 332 | #List of external pakages to be installed and their installation scripts
|
---|
| 333 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 334 | - mpich install-3.0-linux64.sh
|
---|
| 335 | + mpich install-3.2-linux64.sh
|
---|
| 336 | petsc install-3.7-linux64.sh
|
---|
| 337 | triangle install-linux64.sh
|
---|
| 338 | boost install-1.55-linux.sh
|
---|
| 339 | Index: ../trunk-jpl/jenkins/linux64_ross_iceocean
|
---|
| 340 | ===================================================================
|
---|
| 341 | --- ../trunk-jpl/jenkins/linux64_ross_iceocean (revision 21693)
|
---|
| 342 | +++ ../trunk-jpl/jenkins/linux64_ross_iceocean (revision 21694)
|
---|
| 343 | @@ -12,7 +12,7 @@
|
---|
| 344 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 345 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 346 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 347 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 348 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 349 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 350 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 351 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 352 | @@ -33,9 +33,9 @@
|
---|
| 353 |
|
---|
| 354 | #List of external pakages to be installed and their installation scripts
|
---|
| 355 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 356 | - mpich install-3.0-linux64.sh
|
---|
| 357 | + mpich install-3.2-linux64.sh
|
---|
| 358 | cmake install.sh
|
---|
| 359 | - petsc install-3.6-linux64.sh
|
---|
| 360 | + petsc install-3.7-linux64.sh
|
---|
| 361 | triangle install-linux64.sh
|
---|
| 362 | shell2junit install.sh"
|
---|
| 363 |
|
---|
| 364 | Index: ../trunk-jpl/jenkins/linux64_ross_se
|
---|
| 365 | ===================================================================
|
---|
| 366 | --- ../trunk-jpl/jenkins/linux64_ross_se (revision 21693)
|
---|
| 367 | +++ ../trunk-jpl/jenkins/linux64_ross_se (revision 21694)
|
---|
| 368 | @@ -14,7 +14,7 @@
|
---|
| 369 | --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy \
|
---|
| 370 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 371 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 372 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
|
---|
| 373 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
|
---|
| 374 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 375 | --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 376 | --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 377 | @@ -36,9 +36,9 @@
|
---|
| 378 |
|
---|
| 379 | #List of external pakages to be installed and their installation scripts
|
---|
| 380 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 381 | - mpich install-3.0-linux64.sh
|
---|
| 382 | + mpich install-3.2-linux64.sh
|
---|
| 383 | cmake install.sh
|
---|
| 384 | - petsc install-3.6-linux64.sh
|
---|
| 385 | + petsc install-3.7-linux64.sh
|
---|
| 386 | triangle install-linux64.sh
|
---|
| 387 | boost install.sh
|
---|
| 388 | python install-2.7.3-linux64.sh
|
---|
| 389 | Index: ../trunk-jpl/jenkins/macosx_pine-island_dakota_static
|
---|
| 390 | ===================================================================
|
---|
| 391 | --- ../trunk-jpl/jenkins/macosx_pine-island_dakota_static (revision 21693)
|
---|
| 392 | +++ ../trunk-jpl/jenkins/macosx_pine-island_dakota_static (revision 21694)
|
---|
| 393 | @@ -13,7 +13,7 @@
|
---|
| 394 | --with-matlab-dir=$MATLAB_PATH \
|
---|
| 395 | --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
|
---|
| 396 | --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
|
---|
| 397 | - --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich -lmpich -lmpl" \
|
---|
| 398 | + --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi " \
|
---|
| 399 | --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
|
---|
| 400 | --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 401 | --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
|
---|
| 402 | @@ -38,9 +38,9 @@
|
---|
| 403 | EXTERNALPACKAGES="autotools install.sh
|
---|
| 404 | cmake install.sh
|
---|
| 405 | chaco install-macosx64.sh
|
---|
| 406 | - mpich install-3.0-macosx64-static.sh
|
---|
| 407 | + mpich install-3.2-macosx64-static.sh
|
---|
| 408 | m1qn3 install.sh
|
---|
| 409 | - petsc install-3.6-macosx64-static.sh
|
---|
| 410 | + petsc install-3.7-macosx64-static.sh
|
---|
| 411 | triangle install-macosx64.sh
|
---|
| 412 | boost install-1.55-macosx-el_capitan.sh
|
---|
| 413 | dakota install-6.2-macosx64.sh
|
---|