source: issm/oecreview/Archive/22819-23185/ISSM-23105-23106.diff

Last change on this file was 23186, checked in by Mathieu Morlighem, 7 years ago

CHG: added Archive/22819-23185
File size: 6.1 KB
RevLine 
[23186]1Index: ../trunk-jpl/jenkins/linux64_ross
2===================================================================
3--- ../trunk-jpl/jenkins/linux64_ross (revision 23105)
4+++ ../trunk-jpl/jenkins/linux64_ross (revision 23106)
5@@ -7,9 +7,11 @@
6 MATLAB_PATH="/usr/local/MATLAB/R2015a"
7
8 #ISSM CONFIGURATION
9-ISSM_CONFIG='--prefix=$ISSM_DIR\
10+ISSM_CONFIG='--prefix=$ISSM_DIR \
11 --disable-static \
12 --with-matlab-dir=$MATLAB_PATH \
13+ --with-python-dir=/usr \
14+ --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
15 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
16 --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
17 --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
18@@ -16,12 +18,10 @@
19 --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
20 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
21 --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
22- --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
23+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
24 --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
25- --with-python-dir=/usr \
26- --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
27 --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
28- --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
29+ --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
30 --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
31 --with-numthreads=4 \
32 --enable-development \
33@@ -35,7 +35,7 @@
34 # 3: External packages installation #
35 #-----------------------------------#
36
37-#List of external pakages to be installed and their installation scripts
38+#List of external packages to be installed and their installation scripts
39 EXTERNALPACKAGES="autotools install.sh
40 cmake install.sh
41 mpich install-3.2-linux64.sh
42@@ -43,6 +43,8 @@
43 triangle install-linux64.sh
44 chaco install.sh
45 m1qn3 install.sh
46+ hdf5 install.sh
47+ netcdf install.sh
48 shell2junit install.sh"
49
50 #-----------------#
51Index: ../trunk-jpl/jenkins/linux64_ross_python
52===================================================================
53--- ../trunk-jpl/jenkins/linux64_ross_python (revision 23105)
54+++ ../trunk-jpl/jenkins/linux64_ross_python (revision 23106)
55@@ -7,8 +7,10 @@
56 MATLAB_PATH="/usr/local/MATLAB/R2015a"
57
58 #ISSM CONFIGURATION
59-ISSM_CONFIG='--prefix=$ISSM_DIR\
60+ISSM_CONFIG='--prefix=$ISSM_DIR \
61 --disable-static \
62+ --with-python-dir=/usr \
63+ --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
64 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
65 --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
66 --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpifort" \
67@@ -15,10 +17,8 @@
68 --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
69 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
70 --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
71- --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
72+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
73 --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
74- --with-python-dir=/usr \
75- --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
76 --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
77 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
78 --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
79@@ -34,7 +34,7 @@
80 # 3: External packages installation #
81 #-----------------------------------#
82
83-#List of external pakages to be installed and their installation scripts
84+#List of external packages to be installed and their installation scripts
85 EXTERNALPACKAGES="mpich install-3.2-linux64.sh
86 cmake install.sh
87 petsc install-3.7-linux64.sh
88Index: ../trunk-jpl/jenkins/linux64_ross_se
89===================================================================
90--- ../trunk-jpl/jenkins/linux64_ross_se (revision 23105)
91+++ ../trunk-jpl/jenkins/linux64_ross_se (revision 23106)
92@@ -7,10 +7,11 @@
93 MATLAB_PATH="/usr/local/MATLAB/R2015a"
94
95 #ISSM CONFIGURATION
96-ISSM_CONFIG='--prefix=$ISSM_DIR\
97+ISSM_CONFIG='--prefix=$ISSM_DIR \
98 --disable-static \
99 --with-matlab-dir=$MATLAB_PATH \
100 --with-python-dir=/usr \
101+ --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
102 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
103 --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
104 --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
105@@ -17,12 +18,10 @@
106 --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
107 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
108 --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
109- --with-python-dir=/usr \
110- --with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy \
111 --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
112- --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
113- --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
114- --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
115+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
116+ --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
117+ --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
118 --with-numthreads=4 \
119 --enable-development \
120 --enable-debugging '
121@@ -35,7 +34,7 @@
122 # 3: External packages installation #
123 #-----------------------------------#
124
125-#List of external pakages to be installed and their installation scripts
126+#List of external packages to be installed and their installation scripts
127 EXTERNALPACKAGES="autotools install.sh
128 cmake install.sh
129 mpich install-3.2-linux64.sh
130@@ -44,6 +43,8 @@
131 boost install-1.55-linux.sh
132 gshhg install.sh
133 gdal install-1.10-linux64.sh
134+ hdf5 install.sh
135+ netcdf install.sh
136 gmt install.sh
137 gmsh install.sh
138 shell2junit install.sh"
Note: See TracBrowser for help on using the repository browser.