source: issm/oecreview/Archive/24684-25833/ISSM-25658-25659.diff

Last change on this file was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833
File size: 9.2 KB
RevLine 
[25834]1Index: ../trunk-jpl/externalpackages/petsc/install-3.12-linux-solid_earth.sh
2===================================================================
3--- ../trunk-jpl/externalpackages/petsc/install-3.12-linux-solid_earth.sh (revision 25658)
4+++ ../trunk-jpl/externalpackages/petsc/install-3.12-linux-solid_earth.sh (nonexistent)
5@@ -1,50 +0,0 @@
6-#!/bin/bash
7-set -eu
8-
9-
10-# NOTE: There is a single difference between the Linux and macOS
11-# configurations, which is the addition of the -static-libgfortran
12-# option to FFLAGS on the macOS static configurations. For the sake of
13-# consistency, we maintain separate files for each, respective Linux and
14-# macOS configuration.
15-
16-## Constants
17-#
18-VER="3.12.3"
19-
20-# Download source
21-$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/petsc-lite-${VER}.tar.gz" "petsc-${VER}.tar.gz"
22-
23-# Unpack source
24-tar -zxvf petsc-${VER}.tar.gz
25-
26-# Cleanup
27-rm -rf install src
28-mkdir install src
29-
30-# Move source to 'src' directory
31-mv petsc-${VER}/* src/
32-rm -rf petsc-${VER}
33-
34-# Configure
35-cd src
36-./config/configure.py \
37- --prefix="${ISSM_DIR}/externalpackages/petsc/install" \
38- --PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/src" \
39- --with-debugging=0 \
40- --with-valgrind=0 \
41- --with-x=0 \
42- --with-ssl=0 \
43- --with-pic=1 \
44- --download-fblaslapack=1 \
45- --download-mpich=1 \
46- --download-metis=1 \
47- --download-parmetis=1 \
48- --download-scalapack=1 \
49- --download-mumps=1 \
50- --download-zlib=1 \
51- --download-hdf5=1
52-
53-# Compile and install
54-make
55-make install
56
57Property changes on: ../trunk-jpl/externalpackages/petsc/install-3.12-linux-solid_earth.sh
58___________________________________________________________________
59Deleted: svn:executable
60## -1 +0,0 ##
61-*
62\ No newline at end of property
63Index: ../trunk-jpl/externalpackages/petsc/install-3.12-linux.sh
64===================================================================
65--- ../trunk-jpl/externalpackages/petsc/install-3.12-linux.sh (revision 25658)
66+++ ../trunk-jpl/externalpackages/petsc/install-3.12-linux.sh (revision 25659)
67@@ -2,12 +2,6 @@
68 set -eu
69
70
71-# NOTE: There is a single difference between the Linux and macOS
72-# configurations, which is the addition of the -static-libgfortran
73-# option to FFLAGS on the macOS static configurations. For the sake of
74-# consistency, we maintain separate files for each, respective Linux and
75-# macOS configuration.
76-
77 ## Constants
78 #
79 VER="3.12.3"
80@@ -41,8 +35,11 @@
81 --download-metis=1 \
82 --download-parmetis=1 \
83 --download-scalapack=1 \
84- --download-mumps=1
85+ --download-mumps=1 \
86+ --download-zlib=1 \
87+ --download-hdf5=1
88
89+
90 # Compile and install
91 make
92 make install
93Index: ../trunk-jpl/jenkins/ross-debian_linux-python
94===================================================================
95--- ../trunk-jpl/jenkins/ross-debian_linux-python (revision 25658)
96+++ ../trunk-jpl/jenkins/ross-debian_linux-python (revision 25659)
97@@ -17,7 +17,11 @@
98 --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
99 --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
100 --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
101+ --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
102 --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
103+ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
104+ --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
105+ --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
106 --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
107 --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
108 --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
109@@ -32,6 +36,16 @@
110 autotools install-debian-linux.sh
111 cmake install.sh
112 petsc install-3.12-linux.sh
113+ gsl install.sh
114+ boost install-1.7-linux.sh
115+ dakota install-6.2-linux.sh
116+ curl install-7.67.sh
117+ netcdf install-4.7-parallel.sh
118+ proj install-6.2.sh
119+ gdal install-3-python-netcdf.sh
120+ gshhg install.sh
121+ gmt install-6.0-linux.sh
122+ gmsh install-4.sh
123 triangle install-linux.sh
124 chaco install.sh
125 m1qn3 install.sh
126@@ -63,5 +77,11 @@
127 #
128 # See documentation in test/NightlyRun/runme.* for more information.
129 #
130+# NOTE:
131+# - Errors are large for tests 234, 418, and 420 under Python
132+# - Tests 2002, 2003, 2010, 2101, and 2021 are excluded as Gmsh produces
133+# different-sized meshes on macOS and Linux for 3d objects (archives are
134+# generated on macOS).
135+#
136 MATLAB_NROPTIONS=""
137-PYTHON_NROPTIONS="--exclude_name 'Dakota'"
138+PYTHON_NROPTIONS="--exclude 234 418 420 2002 2003 2010 2021 2101"
139Index: ../trunk-jpl/jenkins/pine_island-mac-matlab
140===================================================================
141--- ../trunk-jpl/jenkins/pine_island-mac-matlab (revision 25658)
142+++ ../trunk-jpl/jenkins/pine_island-mac-matlab (revision 25659)
143@@ -2,10 +2,8 @@
144 # ISSM Configuration #
145 #--------------------#
146
147-# MATLAB path
148 MATLAB_PATH="/Applications/MATLAB_R2018a.app"
149
150-# ISSM CONFIGURATION
151 ISSM_CONFIG='\
152 --prefix=${ISSM_DIR} \
153 --disable-static \
154Index: ../trunk-jpl/jenkins/ross-debian_linux-dakota
155===================================================================
156--- ../trunk-jpl/jenkins/ross-debian_linux-dakota (revision 25658)
157+++ ../trunk-jpl/jenkins/ross-debian_linux-dakota (revision 25659)
158@@ -3,6 +3,7 @@
159 #--------------------#
160
161 MATLAB_PATH="/usr/local/MATLAB/R2019b"
162+
163 ISSM_CONFIG='\
164 --prefix=${ISSM_DIR} \
165 --disable-static \
166Index: ../trunk-jpl/jenkins/pine_island-mac-python
167===================================================================
168--- ../trunk-jpl/jenkins/pine_island-mac-python (revision 25658)
169+++ ../trunk-jpl/jenkins/pine_island-mac-python (revision 25659)
170@@ -2,7 +2,6 @@
171 # ISSM Configuration #
172 #--------------------#
173
174-# ISSM CONFIGURATION
175 ISSM_CONFIG='\
176 --prefix=${ISSM_DIR} \
177 --disable-static \
178Index: ../trunk-jpl/jenkins/ross-debian_linux-solid_earth
179===================================================================
180--- ../trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 25658)
181+++ ../trunk-jpl/jenkins/ross-debian_linux-solid_earth (revision 25659)
182@@ -3,6 +3,7 @@
183 #--------------------#
184
185 MATLAB_PATH="/usr/local/MATLAB/R2019b"
186+
187 ISSM_CONFIG='\
188 --prefix=${ISSM_DIR} \
189 --disable-static \
190Index: ../trunk-jpl/jenkins/ross-debian_linux-matlab
191===================================================================
192--- ../trunk-jpl/jenkins/ross-debian_linux-matlab (nonexistent)
193+++ ../trunk-jpl/jenkins/ross-debian_linux-matlab (revision 25659)
194@@ -0,0 +1,87 @@
195+#--------------------#
196+# ISSM Configuration #
197+#--------------------#
198+
199+MATLAB_PATH="/usr/local/MATLAB/R2019b"
200+
201+ISSM_CONFIG='\
202+ --prefix=${ISSM_DIR} \
203+ --disable-static \
204+ --enable-development \
205+ --enable-debugging \
206+ --with-numthreads=4 \
207+ --with-matlab-dir=${MATLAB_PATH} \
208+ --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
209+ --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
210+ --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
211+ --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
212+ --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
213+ --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
214+ --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
215+ --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
216+ --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
217+ --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
218+ --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
219+ --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
220+ --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
221+ --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
222+ --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
223+ --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
224+'
225+
226+#-------------------#
227+# External Packages #
228+#-------------------#
229+
230+EXTERNALPACKAGES="
231+ autotools install-debian-linux.sh
232+ cmake install.sh
233+ petsc install-3.12-linux.sh
234+ gsl install.sh
235+ boost install-1.7-linux.sh
236+ dakota install-6.2-linux.sh
237+ curl install-7.67.sh
238+ netcdf install-4.7-parallel.sh
239+ proj install-6.2.sh
240+ gdal install-3-netcdf.sh
241+ gshhg install.sh
242+ gmt install-6.0-linux.sh
243+ gmsh install-4.sh
244+ triangle install-linux.sh
245+ chaco install.sh
246+ m1qn3 install.sh
247+ semic install.sh
248+ shell2junit install.sh
249+"
250+
251+#---------#
252+# Testing #
253+#---------#
254+
255+# Test suites
256+MATLAB_TEST=1
257+PYTHON_TEST=0
258+JAVASCRIPT_TEST=0
259+EXAMPLES_TEST=0
260+
261+# Number of CPUs used in ISSM compilation
262+#
263+# NOTE: One is usually safer as some packages are very sensitive to parallel
264+# compilation.
265+#
266+NUMCPUS_INSTALL=8
267+
268+# Number of CPUs used in the nightly runs
269+NUMCPUS_RUN=2
270+
271+# Nightly run options
272+#
273+# See documentation in test/NightlyRun/runme.* for more information.
274+#
275+# NOTE:
276+# - Tests 2002, 2003, 2010, 2101, and 2021 are excluded as Gmsh produces
277+# different-sized meshes on macOS and Linux for 3d objects (archives are
278+# generated on macOS).
279+#
280+MATLAB_NROPTIONS="'exclude',[2002 2003 2010 2021 2101]"
281+PYTHON_NROPTIONS=""
282
283Property changes on: ../trunk-jpl/jenkins/ross-debian_linux-matlab
284___________________________________________________________________
285Added: svn:executable
286## -0,0 +1 ##
287+*
288\ No newline at end of property
Note: See TracBrowser for help on using the repository browser.