source: issm/oecreview/Archive/19101-20495/ISSM-20401-20402.diff@ 20498

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495
File size: 39.0 KB
RevLine 
[20498]1Index: ../trunk-jpl/jenkins/linux64_murdo
2===================================================================
3--- ../trunk-jpl/jenkins/linux64_murdo (revision 20401)
4+++ ../trunk-jpl/jenkins/linux64_murdo (revision 20402)
5@@ -1,85 +0,0 @@
6-
7-#-------------------------------#
8-# 1: ISSM general configuration #
9-#-------------------------------#
10-
11-#MATLAB path
12-MATLAB_PATH="/usr/local/matlab80/"
13-
14-#ISSM CONFIGURATION
15-ISSM_CONFIG='--prefix=$ISSM_DIR\
16- --with-matlab-dir=$MATLAB_PATH \
17- --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
18- --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
19- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
20- --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
21- --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
22- --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
23- --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
24- --with-python-dir=$ISSM_DIR/externalpackages/python/install\
25- --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy\
26- --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
27- --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
28- --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
29- --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
30- --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
31- --with-numthreads=18 \
32- --enable-development \
33- --enable-debugging '
34-
35-#PYTHON and MATLAB testing
36-MATLAB_TEST=1
37-PYTHON_TEST=1
38-
39-#-----------------------------------#
40-# 3: External packages installation #
41-#-----------------------------------#
42-
43-#List of external pakages to be installed and their installation scripts
44-EXTERNALPACKAGES="autotools install.sh
45- mpich install-3.0-linux64.sh
46- cmake install.sh
47- petsc install-3.5-linux64.sh
48- triangle install-linux64.sh
49- boost install.sh
50- dakota install-5.3.1-linux64.sh
51- chaco install.sh
52- python install-2.7.3-linux64.sh
53- nose install-linux64-python2.sh
54- blas install-linux64.sh
55- lapack install-linux64.sh
56- git install.sh
57- m1qn3 install.sh
58- numpy install-linux64.sh
59- scipy install-linux64.sh
60- hdf5 install.sh
61- netcdf install.sh
62- netcdf-python install.sh
63- shell2junit install.sh"
64-
65-#---------------------#
66-# 4: ISSM Compilation #
67-#---------------------#
68-
69-#ISSM_COMPILATION can have 2 values:
70-# - "yes" compile ISSM
71-# - "no" do not compile ISSM
72-ISSM_COMPILATION="yes"
73-
74-#------------------------#
75-# 5: Nightly run options #
76-#------------------------#
77-
78-#number of cpus used in ISSM installation and compilation (one is usually
79-#safer as some packages are very sensitive to parallel compilation)
80-NUMCPUS_INSTALL=8
81-
82-#number of cpus used in the nightly runs.
83-NUMCPUS_RUN=8
84-
85-#Nightly run options. The matlab routine runme.m will be called
86-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
87-#by Matlab and runme.m
88-#ex: "'id',[101 102 103]"
89-MATLAB_NROPTIONS="'exclude',[119,514,701,702,435]"
90-PYTHON_NROPTIONS="--exclude 119 514 701 702 435"
91Index: ../trunk-jpl/jenkins/linux64_murdo_python
92===================================================================
93--- ../trunk-jpl/jenkins/linux64_murdo_python (revision 20401)
94+++ ../trunk-jpl/jenkins/linux64_murdo_python (revision 20402)
95@@ -1,91 +0,0 @@
96-
97-#-------------------------------#
98-# 1: ISSM general configuration #
99-#-------------------------------#
100-
101-#ISSM CONFIGURATION
102-ISSM_CONFIG='--prefix=$ISSM_DIR\
103- --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
104- --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
105- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
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-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
110- --with-python-dir=$ISSM_DIR/externalpackages/python/install\
111- --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy\
112- --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
113- --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
114- --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
115- --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
116- --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
117- --with-numthreads=18 \
118- --enable-development \
119- --enable-debugging '
120-
121-#MATLAB path
122-MATLAB_PATH=''
123-
124-#PYTHON and MATLAB testing
125-MATLAB_TEST=0
126-PYTHON_TEST=1
127-
128-#execution path used for parallel runs
129-EXECUTION_PATH=$ISSM_DIR/execution
130-
131-#repo:
132-#We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use.
133-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
134-
135-#-----------------------------------#
136-# 3: External packages installation #
137-#-----------------------------------#
138-
139-#List of external pakages to be installed and their installation scripts
140-EXTERNALPACKAGES="autotools install.sh
141- mpich install-3.0-linux64.sh
142- cmake install.sh
143- petsc install-3.5-linux64.sh
144- triangle install-linux64.sh
145- boost install.sh
146- dakota install-5.3.1-linux64.sh
147- chaco install.sh
148- python install-2.7.3-linux64.sh
149- nose install-linux64-python2.sh
150- blas install-linux64.sh
151- lapack install-linux64.sh
152- git install.sh
153- m1qn3 install.sh
154- numpy install-linux64.sh
155- scipy install-linux64.sh
156- hdf5 install.sh
157- netcdf install.sh
158- netcdf-python install.sh
159- shell2junit install.sh"
160-
161-
162-#---------------------#
163-# 4: ISSM Compilation #
164-#---------------------#
165-
166-#ISSM_COMPILATION can have 2 values:
167-# - "yes" compile ISSM
168-# - "no" do not compile ISSM
169-ISSM_COMPILATION="yes"
170-
171-#------------------------#
172-# 5: Nightly run options #
173-#------------------------#
174-
175-#number of cpus used in ISSM installation and compilation (one is usually
176-#safer as some packages are very sensitive to parallel compilation)
177-NUMCPUS_INSTALL=8
178-
179-#number of cpus used in the nightly runs.
180-NUMCPUS_RUN=8
181-
182-#Nightly run options. The matlab routine runme.m will be called
183-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
184-#by Matlab and runme.m
185-#ex: "'id',[101 102 103]"
186-PYTHON_NROPTIONS="--exclude 119 514 701 702 435"
187Index: ../trunk-jpl/jenkins/linux64_murdo_ad
188===================================================================
189--- ../trunk-jpl/jenkins/linux64_murdo_ad (revision 20401)
190+++ ../trunk-jpl/jenkins/linux64_murdo_ad (revision 20402)
191@@ -1,70 +0,0 @@
192-#
193-#-------------------------------#
194-# 1: ISSM general configuration #
195-#-------------------------------#
196-
197-#MATLAB path
198-MATLAB_PATH="/usr/local/matlab80/"
199-
200-#ISSM CONFIGURATION
201-ISSM_CONFIG='--prefix=$ISSM_DIR\
202- --prefix=$ISSM_DIR \
203- --without-kriging \
204- --without-kml \
205- --without-Gia \
206- --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
207- --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
208- --with-matlab-dir=$MATLAB_PATH \
209- --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
210-
211-#PYTHON and MATLAB testing
212-MATLAB_TEST=1
213-PYTHON_TEST=0
214-
215-#execution path used for parallel runs
216-EXECUTION_PATH=$ISSM_DIR/execution
217-
218-#repo:
219-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
220-
221-#-----------------------------------#
222-# 3: External packages installation #
223-#-----------------------------------#
224-
225-#List of external pakages to be installed and their installation scripts
226-EXTERNALPACKAGES="autotools install.sh
227- cmake install.sh
228- mpich install-3.0-linux64.sh
229- petsc install-3.5-linux64.sh
230- metis install-5.0.1-linux64.sh
231- triangle install-linux64.sh
232- gsl install-linux64.sh
233- adolc install.sh
234- shell2junit install.sh"
235-
236-#---------------------#
237-# 4: ISSM Compilation #
238-#---------------------#
239-
240-#ISSM_COMPILATION can have 2 values:
241-# - "yes" compile ISSM
242-# - "no" do not compile ISSM
243-ISSM_COMPILATION="yes"
244-
245-#------------------------#
246-# 5: Nightly run options #
247-#------------------------#
248-
249-#number of cpus used in ISSM installation and compilation (one is usually
250-#safer as some packages are very sensitive to parallel compilation)
251-NUMCPUS_INSTALL=8
252-
253-#number of cpus used in the nightly runs.
254-NUMCPUS_RUN=8
255-
256-#Nightly run options. The matlab routine runme.m will be called
257-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
258-#by Matlab and runme.m
259-#ex: "'id',[101 102 103]"
260-MATLAB_NROPTIONS="'benchmark','adolc','id',[3001:3019]"
261-PYTHON_NROPTIONS=""
262Index: ../trunk-jpl/jenkins/linux64_murdo_ampi
263===================================================================
264--- ../trunk-jpl/jenkins/linux64_murdo_ampi (revision 20401)
265+++ ../trunk-jpl/jenkins/linux64_murdo_ampi (revision 20402)
266@@ -1,81 +0,0 @@
267-
268-#-------------------------------#
269-# 1: ISSM general configuration #
270-#-------------------------------#
271-
272-#MATLAB path
273-MATLAB_PATH="/usr/local/matlab80/"
274-
275-#ISSM CONFIGURATION
276-ISSM_CONFIG='--prefix=$ISSM_DIR\
277- --without-kriging \
278- --without-kml \
279- --without-Gia \
280- --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
281- --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
282- --with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
283- --with-matlab-dir=$MATLAB_PATH \
284- --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
285- --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
286- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
287- --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
288- --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
289- --with-numthreads=18 \
290- --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
291- --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
292- --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
293- --enable-development \
294-
295-#PYTHON and MATLAB testing
296-MATLAB_TEST=1
297-PYTHON_TEST=0
298-
299-#execution path used for parallel runs
300-EXECUTION_PATH=$ISSM_DIR/execution
301-
302-#repo:
303-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
304-
305-#-----------------------------------#
306-# 3: External packages installation #
307-#-----------------------------------#
308-
309-#List of external pakages to be installed and their installation scripts
310-EXTERNALPACKAGES="autotools install.sh
311- cmake install.sh
312- mpich install-3.0-linux64.sh
313- petsc install-3.5-linux64.sh
314- metis install-5.0.1-linux64.sh
315- triangle install-linux64.sh
316- gsl install-linux64.sh
317- mercurial install.sh
318- adjoinablempi install.sh
319- adolc install-withampi.sh
320- shell2junit install.sh"
321-
322-#---------------------#
323-# 4: ISSM Compilation #
324-#---------------------#
325-
326-#ISSM_COMPILATION can have 2 values:
327-# - "yes" compile ISSM
328-# - "no" do not compile ISSM
329-ISSM_COMPILATION="yes"
330-
331-#------------------------#
332-# 5: Nightly run options #
333-#------------------------#
334-
335-#number of cpus used in ISSM installation and compilation (one is usually
336-#safer as some packages are very sensitive to parallel compilation)
337-NUMCPUS_INSTALL=1
338-
339-#number of cpus used in the nightly runs.
340-NUMCPUS_RUN=8
341-
342-#Nightly run options. The matlab routine runme.m will be called
343-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
344-#by Matlab and runme.m
345-#ex: "'id',[101 102 103]"
346-MATLAB_NROPTIONS="'benchmark','adolc','id',[3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3119]"
347-PYTHON_NROPTIONS=""
348Index: ../trunk-jpl/jenkins/execute_shell
349===================================================================
350--- ../trunk-jpl/jenkins/execute_shell (revision 20401)
351+++ ../trunk-jpl/jenkins/execute_shell (revision 20402)
352@@ -1,20 +0,0 @@
353-#!/bin/bash
354-
355-#some exports required
356-export ISSM_DIR="$WORKSPACE"
357-
358-#which configuration are we using?
359-case $Platform in
360- master )
361- configfile=linux64_murdo ;;
362- imac-012301-gil )
363- configfile=imac-012301-gil ;;
364- windows )
365- configfile=windows
366- export PATH=/cygdrive/c/Cygwin/usr/bin:/cygdrive/c/Cygwin/bin:$PATH ;;
367-
368-esac
369-
370-#run
371-cd "$WORKSPACE"
372-source $ISSM_DIR/jenkins/jenkins.sh $ISSM_DIR/jenkins/$configfile
373Index: ../trunk-jpl/jenkins/execute_shell_ad
374===================================================================
375--- ../trunk-jpl/jenkins/execute_shell_ad (revision 20401)
376+++ ../trunk-jpl/jenkins/execute_shell_ad (revision 20402)
377@@ -1,16 +0,0 @@
378-#!/bin/bash
379-
380-#some exports required
381-export ISSM_DIR="$WORKSPACE"
382-
383-#which configuration are we using?
384-case $AMPI in
385- ampion )
386- configfile=linux64_murdo_ampi ;;
387- ampioff )
388- configfile=linux64_murdo_ad ;;
389-esac
390-
391-#run
392-cd "$WORKSPACE"
393-source $ISSM_DIR/jenkins/jenkins.sh $ISSM_DIR/jenkins/$configfile
394Index: ../trunk-jpl/jenkins/linux64_murdo_gia
395===================================================================
396--- ../trunk-jpl/jenkins/linux64_murdo_gia (revision 20401)
397+++ ../trunk-jpl/jenkins/linux64_murdo_gia (revision 20402)
398@@ -1,75 +0,0 @@
399-
400-#-------------------------------#
401-# 1: ISSM general configuration #
402-#-------------------------------#
403-
404-#MATLAB path
405-MATLAB_PATH="/usr/local/matlab80/"
406-
407-#ISSM CONFIGURATION
408-ISSM_CONFIG='--prefix=$ISSM_DIR\
409- --with-matlab-dir=$MATLAB_PATH \
410- --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
411- --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
412- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
413- --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
414- --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
415- --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
416- --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
417- --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
418- --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
419- --with-gia=yes \
420- --with-numthreads=18 \
421- --enable-development \
422- --enable-debugging '
423-
424-#PYTHON and MATLAB testing
425-MATLAB_TEST=1
426-PYTHON_TEST=0
427-
428-#execution path used for parallel runs
429-EXECUTION_PATH=$ISSM_DIR/execution
430-
431-#repo:
432-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
433-
434-#-----------------------------------#
435-# 3: External packages installation #
436-#-----------------------------------#
437-
438-#List of external pakages to be installed and their installation scripts
439-EXTERNALPACKAGES="autotools install.sh
440- mpich install-3.0-linux64.sh
441- cmake install.sh
442- petsc install-3.5-linux64.sh
443- triangle install-linux64.sh
444- math77 install.sh
445- shell2junit install.sh"
446-
447-
448-#---------------------#
449-# 4: ISSM Compilation #
450-#---------------------#
451-
452-#ISSM_COMPILATION can have 2 values:
453-# - "yes" compile ISSM
454-# - "no" do not compile ISSM
455-ISSM_COMPILATION="yes"
456-
457-#------------------------#
458-# 5: Nightly run options #
459-#------------------------#
460-
461-#number of cpus used in ISSM installation and compilation (one is usually
462-#safer as some packages are very sensitive to parallel compilation)
463-NUMCPUS_INSTALL=8
464-
465-#number of cpus used in the nightly runs.
466-NUMCPUS_RUN=1
467-
468-#Nightly run options. The matlab routine runme.m will be called
469-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
470-#by Matlab and runme.m
471-#ex: "'id',[101 102 103]"
472-MATLAB_NROPTIONS="'benchmark','all','id',[2001:2100]"
473-PYTHON_NROPTIONS=""
474Index: ../trunk-jpl/jenkins/linux64_murdo_iceocean
475===================================================================
476--- ../trunk-jpl/jenkins/linux64_murdo_iceocean (revision 20401)
477+++ ../trunk-jpl/jenkins/linux64_murdo_iceocean (revision 20402)
478@@ -1,72 +0,0 @@
479-
480-#-------------------------------#
481-# 1: ISSM general configuration #
482-#-------------------------------#
483-
484-#MATLAB path
485-MATLAB_PATH="/usr/local/matlab80/"
486-
487-#ISSM CONFIGURATION
488-ISSM_CONFIG='--prefix=$ISSM_DIR\
489- --with-matlab-dir=$MATLAB_PATH \
490- --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
491- --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
492- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpich" \
493- --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
494- --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
495- --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
496- --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
497- --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
498- --with-numthreads=18 \
499- --enable-development \
500- --enable-debugging '
501-
502-#PYTHON and MATLAB testing
503-MATLAB_TEST=1
504-PYTHON_TEST=0
505-
506-#execution path used for parallel runs
507-EXECUTION_PATH=$ISSM_DIR/execution
508-
509-#repo:
510-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
511-
512-#-----------------------------------#
513-# 3: External packages installation #
514-#-----------------------------------#
515-
516-#List of external pakages to be installed and their installation scripts
517-EXTERNALPACKAGES="autotools install.sh
518- mpich install-3.0-linux64.sh
519- cmake install.sh
520- petsc install-3.5-linux64.sh
521- triangle install-linux64.sh
522- shell2junit install.sh"
523-
524-
525-#---------------------#
526-# 4: ISSM Compilation #
527-#---------------------#
528-
529-#ISSM_COMPILATION can have 2 values:
530-# - "yes" compile ISSM
531-# - "no" do not compile ISSM
532-ISSM_COMPILATION="yes"
533-
534-#------------------------#
535-# 5: Nightly run options #
536-#------------------------#
537-
538-#number of cpus used in ISSM installation and compilation (one is usually
539-#safer as some packages are very sensitive to parallel compilation)
540-NUMCPUS_INSTALL=8
541-
542-#number of cpus used in the nightly runs.
543-NUMCPUS_RUN=1
544-
545-#Nightly run options. The matlab routine runme.m will be called
546-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
547-#by Matlab and runme.m
548-#ex: "'id',[101 102 103]"
549-MATLAB_NROPTIONS="'benchmark','all','id',4001"
550-PYTHON_NROPTIONS=""
551Index: ../trunk-jpl/jenkins/imac-012301-gil
552===================================================================
553--- ../trunk-jpl/jenkins/imac-012301-gil (revision 20401)
554+++ ../trunk-jpl/jenkins/imac-012301-gil (revision 20402)
555@@ -1,67 +0,0 @@
556-
557-#-------------------------------#
558-# 1: ISSM general configuration #
559-#-------------------------------#
560-
561-#MATLAB path
562-MATLAB_PATH="/Applications/MATLAB_R2011b.app/"
563-
564-#ISSM CONFIGURATION
565-ISSM_CONFIG='--prefix=$ISSM_DIR \
566- --with-matlab-dir=$MATLAB_PATH \
567- --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
568- --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
569- --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lpmpich -lmpich -lmpl" \
570- --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
571- --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
572- --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
573- --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
574- --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
575- --with-numthreads=8 \
576- --enable-debugging \
577- --enable-development'
578-
579-#PYTHON and MATLAB testing
580-MATLAB_TEST=1
581-PYTHON_TEST=0
582-
583-#-----------------------------------#
584-# 3: External packages installation #
585-#-----------------------------------#
586-
587-#List of external pakages to be installed and their installation scripts
588-EXTERNALPACKAGES="autotools install.sh
589- mpich install-3.0-macosx64.sh
590- cmake install.sh
591- m1qn3 install.sh
592- petsc install-3.5-macosx64.sh
593- triangle install-macosx64.sh
594- shell2junit install.sh "
595-
596-#---------------------#
597-# 4: ISSM Compilation #
598-#---------------------#
599-
600-#ISSM_COMPILATION can have 2 values:
601-# - "yes" compile ISSM
602-# - "no" do not compile ISSM
603-ISSM_COMPILATION="yes"
604-
605-#------------------------#
606-# 5: Nightly run options #
607-#------------------------#
608-
609-#number of cpus used in ISSM installation and compilation (one is usually
610-#safer as some packages are very sensitive to parallel compilation)
611-NUMCPUS_INSTALL=8
612-
613-#number of cpus used in the nightly runs.
614-NUMCPUS_RUN=1
615-
616-#Nightly run options. The matlab routine runme.m will be called
617-#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
618-#by Matlab and runme.m
619-#ex: "'id',[101 102 103]"
620-## bamg mesh FS
621-MATLAB_NROPTIONS="'exclude',[218 234 235 412 413 414 417 418 420 514 701 702 703 422 404 421 503 507 510]"
622-PYTHON_NROPTIONS=""
623Index: ../trunk-jpl/jenkins/linux64_ross
624===================================================================
625--- ../trunk-jpl/jenkins/linux64_ross (revision 20401)
626+++ ../trunk-jpl/jenkins/linux64_ross (revision 20402)
627@@ -32,13 +32,6 @@
628 MATLAB_TEST=1
629 PYTHON_TEST=1
630
631-#execution path used for parallel runs
632-EXECUTION_PATH=$ISSM_DIR/execution
633-
634-#repo:
635-#We have had issues with upgrading SVN versions. As such, it is nescessary to specify which SVN to use.
636-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
637-
638 #-----------------------------------#
639 # 3: External packages installation #
640 #-----------------------------------#
641@@ -54,20 +47,10 @@
642 m1qn3 install.sh
643 shell2junit install.sh"
644
645+#-----------------#
646+# 4: test options #
647+#-----------------#
648
649-#---------------------#
650-# 4: ISSM Compilation #
651-#---------------------#
652-
653-#ISSM_COMPILATION can have 2 values:
654-# - "yes" compile ISSM
655-# - "no" do not compile ISSM
656-ISSM_COMPILATION="yes"
657-
658-#------------------------#
659-# 5: Nightly run options #
660-#------------------------#
661-
662 #number of cpus used in ISSM installation and compilation (one is usually
663 #safer as some packages are very sensitive to parallel compilation)
664 NUMCPUS_INSTALL=10
665Index: ../trunk-jpl/jenkins/linux64_caladan_ad
666===================================================================
667--- ../trunk-jpl/jenkins/linux64_caladan_ad (revision 20401)
668+++ ../trunk-jpl/jenkins/linux64_caladan_ad (revision 20402)
669@@ -22,12 +22,6 @@
670 MATLAB_TEST=1
671 PYTHON_TEST=0
672
673-#execution path used for parallel runs
674-EXECUTION_PATH=$ISSM_DIR/execution
675-
676-#repo:
677-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
678-
679 #-----------------------------------#
680 # 3: External packages installation #
681 #-----------------------------------#
682@@ -42,19 +36,10 @@
683 adolc install.sh
684 shell2junit install.sh"
685
686-#---------------------#
687-# 4: ISSM Compilation #
688-#---------------------#
689+#-----------------#
690+# 4: test options #
691+#-----------------#
692
693-#ISSM_COMPILATION can have 2 values:
694-# - "yes" compile ISSM
695-# - "no" do not compile ISSM
696-ISSM_COMPILATION="yes"
697-
698-#------------------------#
699-# 5: Nightly run options #
700-#------------------------#
701-
702 #number of cpus used in ISSM installation and compilation (one is usually
703 #safer as some packages are very sensitive to parallel compilation)
704 NUMCPUS_INSTALL=2
705Index: ../trunk-jpl/jenkins/linux64_caladan_ampi
706===================================================================
707--- ../trunk-jpl/jenkins/linux64_caladan_ampi (revision 20401)
708+++ ../trunk-jpl/jenkins/linux64_caladan_ampi (revision 20402)
709@@ -31,12 +31,6 @@
710 MATLAB_TEST=1
711 PYTHON_TEST=0
712
713-#execution path used for parallel runs
714-EXECUTION_PATH=$ISSM_DIR/execution
715-
716-#repo:
717-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
718-
719 #-----------------------------------#
720 # 3: External packages installation #
721 #-----------------------------------#
722@@ -52,19 +46,10 @@
723 adolc install-withampi.sh
724 shell2junit install.sh"
725
726-#---------------------#
727-# 4: ISSM Compilation #
728-#---------------------#
729+#-----------------#
730+# 4: test options #
731+#-----------------#
732
733-#ISSM_COMPILATION can have 2 values:
734-# - "yes" compile ISSM
735-# - "no" do not compile ISSM
736-ISSM_COMPILATION="yes"
737-
738-#------------------------#
739-# 5: Nightly run options #
740-#------------------------#
741-
742 #number of cpus used in ISSM installation and compilation (one is usually
743 #safer as some packages are very sensitive to parallel compilation)
744 NUMCPUS_INSTALL=2
745Index: ../trunk-jpl/jenkins/linux64_ross_ad
746===================================================================
747--- ../trunk-jpl/jenkins/linux64_ross_ad (revision 20401)
748+++ ../trunk-jpl/jenkins/linux64_ross_ad (revision 20402)
749@@ -24,12 +24,6 @@
750 MATLAB_TEST=1
751 PYTHON_TEST=1
752
753-#execution path used for parallel runs
754-EXECUTION_PATH=$ISSM_DIR/execution
755-
756-#repo:
757-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
758-
759 #-----------------------------------#
760 # 3: External packages installation #
761 #-----------------------------------#
762@@ -44,19 +38,10 @@
763 adolc install.sh
764 shell2junit install.sh"
765
766-#---------------------#
767-# 4: ISSM Compilation #
768-#---------------------#
769+#-----------------#
770+# 4: test options #
771+#-----------------#
772
773-#ISSM_COMPILATION can have 2 values:
774-# - "yes" compile ISSM
775-# - "no" do not compile ISSM
776-ISSM_COMPILATION="yes"
777-
778-#------------------------#
779-# 5: Nightly run options #
780-#------------------------#
781-
782 #number of cpus used in ISSM installation and compilation (one is usually
783 #safer as some packages are very sensitive to parallel compilation)
784 NUMCPUS_INSTALL=5
785Index: ../trunk-jpl/jenkins/macosx_pine-island_static
786===================================================================
787--- ../trunk-jpl/jenkins/macosx_pine-island_static (revision 20401)
788+++ ../trunk-jpl/jenkins/macosx_pine-island_static (revision 20402)
789@@ -29,12 +29,6 @@
790 MATLAB_TEST=1
791 PYTHON_TEST=0
792
793-#execution path used for parallel runs
794-EXECUTION_PATH=$ISSM_DIR/execution
795-
796-#repo:
797-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
798-
799 #-----------------------------------#
800 # 3: External packages installation #
801 #-----------------------------------#
802@@ -48,19 +42,10 @@
803 triangle install-macosx64.sh
804 shell2junit install.sh"
805
806-#---------------------#
807-# 4: ISSM Compilation #
808-#---------------------#
809+#-----------------#
810+# 4: test options #
811+#-----------------#
812
813-#ISSM_COMPILATION can have 2 values:
814-# - "yes" compile ISSM
815-# - "no" do not compile ISSM
816-ISSM_COMPILATION="yes"
817-
818-#------------------------#
819-# 5: Nightly run options #
820-#------------------------#
821-
822 #number of cpus used in ISSM installation and compilation (one is usually
823 #safer as some packages are very sensitive to parallel compilation)
824 NUMCPUS_INSTALL=4
825Index: ../trunk-jpl/jenkins/linux64_ross_ampi
826===================================================================
827--- ../trunk-jpl/jenkins/linux64_ross_ampi (revision 20401)
828+++ ../trunk-jpl/jenkins/linux64_ross_ampi (revision 20402)
829@@ -33,12 +33,6 @@
830 MATLAB_TEST=1
831 PYTHON_TEST=1
832
833-#execution path used for parallel runs
834-EXECUTION_PATH=$ISSM_DIR/execution
835-
836-#repo:
837-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
838-
839 #-----------------------------------#
840 # 3: External packages installation #
841 #-----------------------------------#
842@@ -54,19 +48,10 @@
843 adolc install-withampi.sh
844 shell2junit install.sh"
845
846-#---------------------#
847-# 4: ISSM Compilation #
848-#---------------------#
849+#-----------------#
850+# 4: test options #
851+#-----------------#
852
853-#ISSM_COMPILATION can have 2 values:
854-# - "yes" compile ISSM
855-# - "no" do not compile ISSM
856-ISSM_COMPILATION="yes"
857-
858-#------------------------#
859-# 5: Nightly run options #
860-#------------------------#
861-
862 #number of cpus used in ISSM installation and compilation (one is usually
863 #safer as some packages are very sensitive to parallel compilation)
864 NUMCPUS_INSTALL=5
865Index: ../trunk-jpl/jenkins/windows_test
866===================================================================
867--- ../trunk-jpl/jenkins/windows_test (revision 20401)
868+++ ../trunk-jpl/jenkins/windows_test (revision 20402)
869@@ -9,27 +9,14 @@
870 MATLAB_TEST=1
871 PYTHON_TEST=0
872
873-#execution path used for parallel runs
874-EXECUTION_PATH=$ISSM_DIR/execution
875-
876-
877 #-----------------------------------#
878 # 3: External packages installation #
879 #-----------------------------------#
880
881-#---------------------#
882-# 4: ISSM Compilation #
883-#---------------------#
884+#-----------------#
885+# 4: test options #
886+#-----------------#
887
888-#ISSM_COMPILATION can have 2 values:
889-# - "yes" compile ISSM
890-# - "no" do not compile ISSM
891-ISSM_COMPILATION="no"
892-
893-#------------------------#
894-# 5: Nightly run options #
895-#------------------------#
896-
897 #number of cpus used in ISSM installation and compilation (one is usually
898 #safer as some packages are very sensitive to parallel compilation)
899 NUMCPUS_INSTALL=4
900Index: ../trunk-jpl/jenkins/windows
901===================================================================
902--- ../trunk-jpl/jenkins/windows (revision 20401)
903+++ ../trunk-jpl/jenkins/windows (revision 20402)
904@@ -31,12 +31,6 @@
905 MATLAB_TEST=1
906 PYTHON_TEST=0
907
908-#execution path used for parallel runs
909-EXECUTION_PATH=$ISSM_DIR/execution
910-
911-#repo:
912-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
913-
914 #-----------------------------------#
915 # 3: External packages installation #
916 #-----------------------------------#
917@@ -48,19 +42,10 @@
918 triangle install-win7.sh
919 shell2junit install.sh"
920
921-#---------------------#
922-# 4: ISSM Compilation #
923-#---------------------#
924+#-----------------#
925+# 4: test options #
926+#-----------------#
927
928-#ISSM_COMPILATION can have 2 values:
929-# - "yes" compile ISSM
930-# - "no" do not compile ISSM
931-ISSM_COMPILATION="yes"
932-
933-#------------------------#
934-# 5: Nightly run options #
935-#------------------------#
936-
937 #number of cpus used in ISSM installation and compilation (one is usually
938 #safer as some packages are very sensitive to parallel compilation)
939 NUMCPUS_INSTALL=5
940Index: ../trunk-jpl/jenkins/linux64_ross_gia
941===================================================================
942--- ../trunk-jpl/jenkins/linux64_ross_gia (revision 20401)
943+++ ../trunk-jpl/jenkins/linux64_ross_gia (revision 20402)
944@@ -28,14 +28,6 @@
945 MATLAB_TEST=1
946 PYTHON_TEST=0
947
948-#execution path used for parallel runs
949-EXECUTION_PATH=$ISSM_DIR/execution
950-
951-#repo:
952-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
953-SVN='/usr/bin/svn'
954-SVNVERSION='/usr/bin/svnversion'
955-
956 #-----------------------------------#
957 # 3: External packages installation #
958 #-----------------------------------#
959@@ -49,20 +41,10 @@
960 gmsh install.sh
961 shell2junit install.sh"
962
963+#-----------------#
964+# 4: test options #
965+#-----------------#
966
967-#---------------------#
968-# 4: ISSM Compilation #
969-#---------------------#
970-
971-#ISSM_COMPILATION can have 2 values:
972-# - "yes" compile ISSM
973-# - "no" do not compile ISSM
974-ISSM_COMPILATION="yes"
975-
976-#------------------------#
977-# 5: Nightly run options #
978-#------------------------#
979-
980 #number of cpus used in ISSM installation and compilation (one is usually
981 #safer as some packages are very sensitive to parallel compilation)
982 NUMCPUS_INSTALL=8
983Index: ../trunk-jpl/jenkins/macosx_pine-island_dakota
984===================================================================
985--- ../trunk-jpl/jenkins/macosx_pine-island_dakota (revision 20401)
986+++ ../trunk-jpl/jenkins/macosx_pine-island_dakota (revision 20402)
987@@ -28,12 +28,6 @@
988 MATLAB_TEST=1
989 PYTHON_TEST=0
990
991-#execution path used for parallel runs
992-EXECUTION_PATH=$ISSM_DIR/execution
993-
994-#repo:
995-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
996-
997 #-----------------------------------#
998 # 3: External packages installation #
999 #-----------------------------------#
1000@@ -50,19 +44,10 @@
1001 dakota install-6.2-macosx64.sh
1002 shell2junit install.sh"
1003
1004-#---------------------#
1005-# 4: ISSM Compilation #
1006-#---------------------#
1007+#-----------------#
1008+# 4: test options #
1009+#-----------------#
1010
1011-#ISSM_COMPILATION can have 2 values:
1012-# - "yes" compile ISSM
1013-# - "no" do not compile ISSM
1014-ISSM_COMPILATION="yes"
1015-
1016-#------------------------#
1017-# 5: Nightly run options #
1018-#------------------------#
1019-
1020 #number of cpus used in ISSM installation and compilation (one is usually
1021 #safer as some packages are very sensitive to parallel compilation)
1022 NUMCPUS_INSTALL=4
1023Index: ../trunk-jpl/jenkins/linux64_ross_iceocean
1024===================================================================
1025--- ../trunk-jpl/jenkins/linux64_ross_iceocean (revision 20401)
1026+++ ../trunk-jpl/jenkins/linux64_ross_iceocean (revision 20402)
1027@@ -26,12 +26,6 @@
1028 MATLAB_TEST=1
1029 PYTHON_TEST=0
1030
1031-#execution path used for parallel runs
1032-EXECUTION_PATH=$ISSM_DIR/execution
1033-
1034-#repo:
1035-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
1036-
1037 #-----------------------------------#
1038 # 3: External packages installation #
1039 #-----------------------------------#
1040@@ -44,20 +38,10 @@
1041 triangle install-linux64.sh
1042 shell2junit install.sh"
1043
1044+#-----------------#
1045+# 4: test options #
1046+#-----------------#
1047
1048-#---------------------#
1049-# 4: ISSM Compilation #
1050-#---------------------#
1051-
1052-#ISSM_COMPILATION can have 2 values:
1053-# - "yes" compile ISSM
1054-# - "no" do not compile ISSM
1055-ISSM_COMPILATION="yes"
1056-
1057-#------------------------#
1058-# 5: Nightly run options #
1059-#------------------------#
1060-
1061 #number of cpus used in ISSM installation and compilation (one is usually
1062 #safer as some packages are very sensitive to parallel compilation)
1063 NUMCPUS_INSTALL=8
1064Index: ../trunk-jpl/jenkins/linux64_ross_se
1065===================================================================
1066--- ../trunk-jpl/jenkins/linux64_ross_se (revision 20401)
1067+++ ../trunk-jpl/jenkins/linux64_ross_se (revision 20402)
1068@@ -27,12 +27,6 @@
1069 MATLAB_TEST=1
1070 PYTHON_TEST=1
1071
1072-#execution path used for parallel runs
1073-EXECUTION_PATH=$ISSM_DIR/execution
1074-
1075-#repo:
1076-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
1077-
1078 #-----------------------------------#
1079 # 3: External packages installation #
1080 #-----------------------------------#
1081@@ -49,19 +43,10 @@
1082 gmsh install.sh
1083 shell2junit install.sh"
1084
1085-#---------------------#
1086-# 4: ISSM Compilation #
1087-#---------------------#
1088+#-----------------#
1089+# 4: test options #
1090+#-----------------#
1091
1092-#ISSM_COMPILATION can have 2 values:
1093-# - "yes" compile ISSM
1094-# - "no" do not compile ISSM
1095-ISSM_COMPILATION="yes"
1096-
1097-#------------------------#
1098-# 5: Nightly run options #
1099-#------------------------#
1100-
1101 #number of cpus used in ISSM installation and compilation (one is usually
1102 #safer as some packages are very sensitive to parallel compilation)
1103 NUMCPUS_INSTALL=5
1104Index: ../trunk-jpl/jenkins/windows-par
1105===================================================================
1106--- ../trunk-jpl/jenkins/windows-par (revision 20401)
1107+++ ../trunk-jpl/jenkins/windows-par (revision 20402)
1108@@ -29,12 +29,6 @@
1109 MATLAB_TEST=1
1110 PYTHON_TEST=0
1111
1112-#execution path used for parallel runs
1113-EXECUTION_PATH=$ISSM_DIR/execution
1114-
1115-#repo:
1116-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
1117-
1118 #-----------------------------------#
1119 # 3: External packages installation #
1120 #-----------------------------------#
1121@@ -46,19 +40,10 @@
1122 triangle install-win7.sh
1123 shell2junit install.sh"
1124
1125-#---------------------#
1126-# 4: ISSM Compilation #
1127-#---------------------#
1128+#-----------------#
1129+# 4: test options #
1130+#-----------------#
1131
1132-#ISSM_COMPILATION can have 2 values:
1133-# - "yes" compile ISSM
1134-# - "no" do not compile ISSM
1135-ISSM_COMPILATION="yes"
1136-
1137-#------------------------#
1138-# 5: Nightly run options #
1139-#------------------------#
1140-
1141 #number of cpus used in ISSM installation and compilation (one is usually
1142 #safer as some packages are very sensitive to parallel compilation)
1143 NUMCPUS_INSTALL=8
1144Index: ../trunk-jpl/jenkins/linux64_caladan
1145===================================================================
1146--- ../trunk-jpl/jenkins/linux64_caladan (revision 20401)
1147+++ ../trunk-jpl/jenkins/linux64_caladan (revision 20402)
1148@@ -32,12 +32,6 @@
1149 MATLAB_TEST=1
1150 PYTHON_TEST=1
1151
1152-#execution path used for parallel runs
1153-EXECUTION_PATH=$ISSM_DIR/execution
1154-
1155-#repo:
1156-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
1157-
1158 #-----------------------------------#
1159 # 3: External packages installation #
1160 #-----------------------------------#
1161@@ -53,19 +47,10 @@
1162 m1qn3 install.sh
1163 shell2junit install.sh"
1164
1165-#---------------------#
1166-# 4: ISSM Compilation #
1167-#---------------------#
1168+#-----------------#
1169+# 4: Test options #
1170+#-----------------#
1171
1172-#ISSM_COMPILATION can have 2 values:
1173-# - "yes" compile ISSM
1174-# - "no" do not compile ISSM
1175-ISSM_COMPILATION="yes"
1176-
1177-#------------------------#
1178-# 5: Nightly run options #
1179-#------------------------#
1180-
1181 #number of cpus used in ISSM installation and compilation (one is usually
1182 #safer as some packages are very sensitive to parallel compilation)
1183 NUMCPUS_INSTALL=4
1184Index: ../trunk-jpl/jenkins/macosx_pine-island
1185===================================================================
1186--- ../trunk-jpl/jenkins/macosx_pine-island (revision 20401)
1187+++ ../trunk-jpl/jenkins/macosx_pine-island (revision 20402)
1188@@ -38,19 +38,10 @@
1189 triangle install-macosx64.sh
1190 shell2junit install.sh"
1191
1192-#---------------------#
1193-# 4: ISSM Compilation #
1194-#---------------------#
1195+#-----------------#
1196+# 4: test options #
1197+#-----------------#
1198
1199-#ISSM_COMPILATION can have 2 values:
1200-# - "yes" compile ISSM
1201-# - "no" do not compile ISSM
1202-ISSM_COMPILATION="yes"
1203-
1204-#------------------------#
1205-# 5: Nightly run options #
1206-#------------------------#
1207-
1208 #number of cpus used in ISSM installation and compilation (one is usually
1209 #safer as some packages are very sensitive to parallel compilation)
1210 NUMCPUS_INSTALL=4
1211Index: ../trunk-jpl/jenkins/linux64_ross_test
1212===================================================================
1213--- ../trunk-jpl/jenkins/linux64_ross_test (revision 20401)
1214+++ ../trunk-jpl/jenkins/linux64_ross_test (revision 20402)
1215@@ -32,12 +32,6 @@
1216 #MATLAB_TEST=1
1217 #PYTHON_TEST=1
1218
1219-#execution path used for parallel runs
1220-EXECUTION_PATH=$ISSM_DIR/execution
1221-
1222-#repo:
1223-REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
1224-
1225 #-----------------------------------#
1226 # 3: External packages installation #
1227 #-----------------------------------#
1228@@ -53,20 +47,10 @@
1229 m1qn3 install.sh
1230 shell2junit install.sh"
1231
1232+#-----------------#
1233+# 4: test options #
1234+#-----------------#
1235
1236-#---------------------#
1237-# 4: ISSM Compilation #
1238-#---------------------#
1239-
1240-#ISSM_COMPILATION can have 2 values:
1241-# - "yes" compile ISSM
1242-# - "no" do not compile ISSM
1243-#ISSM_COMPILATION="yes"
1244-
1245-#------------------------#
1246-# 5: Nightly run options #
1247-#------------------------#
1248-
1249 #number of cpus used in ISSM installation and compilation (one is usually
1250 #safer as some packages are very sensitive to parallel compilation)
1251 NUMCPUS_INSTALL=6
Note: See TracBrowser for help on using the repository browser.