source: issm/oecreview/Archive/24307-24683/ISSM-24310-24311.diff@ 24684

Last change on this file since 24684 was 24684, checked in by Mathieu Morlighem, 5 years ago

CHG: added new review
File size: 34.3 KB
RevLine 
[24684]1Index: ../trunk-jpl/m4/issm_options.m4
2===================================================================
3--- ../trunk-jpl/m4/issm_options.m4 (revision 24310)
4+++ ../trunk-jpl/m4/issm_options.m4 (revision 24311)
5@@ -395,7 +395,6 @@
6 TRIANGLELIB="-Wl,`cygpath -m $TRIANGLE_ROOT/`triangle.lib"
7 ;;
8 *linux*)
9- TRIANGLELIB=$TRIANGLE_ROOT/triangle.a
10 if test "x$HAVE_JAVASCRIPT" = "xyes"; then
11 dnl go to the bit code, not the library.
12 TRIANGLELIB=$TRIANGLE_ROOT/triangle.o
13@@ -482,6 +481,7 @@
14 AC_DEFINE_UNQUOTED([_DAKOTA_VERSION_],"$DAKOTA_VERSION",[Dakota version number])
15
16 DAKOTAFLAGS=""
17+ dnl TODO: Should we also be checking if HAVE_BOOST before adding boost libs?
18 case "${host_os}" in
19 *cygwin*)
20 if test x$DAKOTA_VERSION = x5.1 || test x$DAKOTA_VERSION = x5.2; then
21@@ -506,7 +506,11 @@
22 AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])
23 else if test x$DAKOTA_VERSION = x6.1 || test x$DAKOTA_VERSION = x6.2; then
24 DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
25- DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
26+ if test "x$enable_standalone_executables" = "xyes"; then
27+ DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid $BOOST_ROOT/lib/libboost_serialization.a $BOOST_ROOT/lib/libboost_signals.a $BOOST_ROOT/lib/libboost_regex.a $BOOST_ROOT/lib/libboost_filesystem.a $BOOST_ROOT/lib/libboost_system.a"
28+ else
29+ DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
30+ fi
31 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H],[1],[disabling DAKOTA_CONFIG_H])
32 AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])
33 else
34@@ -525,8 +529,12 @@
35 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H],[1],[disabling DAKOTA_CONFIG_H])
36 AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])
37 else if test x$DAKOTA_VERSION = x6.1 || test x$DAKOTA_VERSION = x6.2; then
38- DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
39- DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
40+ DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
41+ if test "x$enable_standalone_executables" = "xyes"; then
42+ DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid $BOOST_ROOT/lib/libboost_serialization.a $BOOST_ROOT/lib/libboost_signals.a $BOOST_ROOT/lib/libboost_regex.a $BOOST_ROOT/lib/libboost_filesystem.a $BOOST_ROOT/lib/libboost_system.a"
43+ else
44+ DAKOTALIB="-L$DAKOTA_ROOT/lib -L$BOOST_ROOT/lib -ldakota_src -ldream -lfsudace -lddace -lnomad -lpecos_src -llhs -llhs_mods -loptpp -lsurfpack -lconmin -ldakota_src_fortran -llhs_mod -lncsuopt -lsurfpack_fortran -lteuchos -lamplsolver -lcport -ldfftpack -lfsudace -lhopspack -lnidr -lpecos -lpsuade -lsparsegrid -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
45+ fi
46 AC_DEFINE([DISABLE_DAKOTA_CONFIG_H],[1],[disabling DAKOTA_CONFIG_H])
47 AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])
48 else
49Index: ../trunk-jpl/externalpackages/adjoinablempi/install-macosx64.sh
50===================================================================
51--- ../trunk-jpl/externalpackages/adjoinablempi/install-macosx64.sh (revision 24310)
52+++ ../trunk-jpl/externalpackages/adjoinablempi/install-macosx64.sh (revision 24311)
53@@ -9,7 +9,7 @@
54 #hg clone -r 268 http://mercurial.mcs.anl.gov//ad/AdjoinableMPI src
55
56 #Download from ISSM server
57-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/adjoinablempi' 'adjoinablempi.tar.gz'
58+$ISSM_DIR/scripts/DownloadExternalPackage.sh 'http://issm.jpl.nasa.gov/files/externalpackages/adjoinablempi' 'adjoinablempi.tar.gz'
59
60 #Untar ADOL-C
61 tar -zxf adjoinablempi.tar.gz
62Index: ../trunk-jpl/externalpackages/dakota/install-6.2-macosx64-static.sh
63===================================================================
64--- ../trunk-jpl/externalpackages/dakota/install-6.2-macosx64-static.sh (nonexistent)
65+++ ../trunk-jpl/externalpackages/dakota/install-6.2-macosx64-static.sh (revision 24311)
66@@ -0,0 +1,80 @@
67+#!/bin/bash
68+set -eu
69+
70+# Constants
71+DAK_VER="6.2"
72+
73+# Some cleanup
74+rm -rf build
75+rm -rf install
76+rm -rf tests
77+rm -rf src
78+mkdir build install src
79+
80+# Download from ISSM server
81+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/dakota-${DAK_VER}-public.src.tar.gz" "dakota-${DAK_VER}-public-src.tar.gz"
82+
83+# Untar
84+tar -zxvf dakota-${DAK_VER}-public-src.tar.gz
85+
86+# Move Dakota to src directory
87+mv dakota-${DAK_VER}.0.src/* src
88+rm -rf dakota-${DAK_VER}.0.src
89+
90+# Set up Dakota and CMake variables
91+DAK_PATH=$ISSM_DIR/externalpackages/dakota
92+
93+export DAK_BUILD=$DAK_PATH/build
94+export DAK_INSTALL=$DAK_PATH/install
95+export DAK_SRC=$DAK_PATH/src
96+export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
97+
98+
99+# Apply patches
100+cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
101+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/$DAK_VER/BuildDakotaCustom.cmake.mac.patch
102+patch $DAK_SRC/cmake/DakotaDev.cmake configs/$DAK_VER/DakotaDev.cmake.patch
103+patch $DAK_SRC/cmake/InstallDarwinDylibs.cmake configs/$DAK_VER/InstallDarwinDylibs.cmake.patch
104+patch $DAK_SRC/CMakeLists.txt configs/$DAK_VER/CMakeLists.txt.patch
105+patch src/src/NonDSampling.cpp configs/$DAK_VER/NonDSampling.cpp.patch
106+patch src/src/NonDLocalReliability.cpp configs/$DAK_VER/NonDLocalReliability.cpp.patch
107+patch src/packages/pecos/src/pecos_global_defs.hpp configs/$DAK_VER/pecos_global_defs.hpp.patch
108+
109+# Configure and build Dakota
110+cd $DAK_BUILD
111+cmake \
112+ -C$DAK_SRC/cmake/BuildDakotaCustom.cmake \
113+ -C$DAK_SRC/cmake/DakotaDev.cmake \
114+ -DBUILD_STATIC_LIBS=ON \
115+ -DBUILD_SHARED_LIBS=OFF \
116+ -DBOOST_ROOT=$BOOST_ROOT \
117+ -DBoost_LIBRARY_DIRS=$BOOST_ROOT/lib \
118+ -DBoost_NO_BOOST_CMAKE=TRUE \
119+ -DBoost_NO_SYSTEM_PATHS=TRUE \
120+ -DCMAKE_INSTALL_PREFIX=$DAK_INSTALL \
121+ -DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
122+ -DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
123+ -DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
124+ -DCMAKE_CXX_FLAGS=-fdelayed-template-parsing \
125+ -DHAVE_ACRO=off \
126+ -DHAVE_JEGA=off \
127+ $DAK_SRC
128+
129+if [ $# -eq 0 ];
130+then
131+ make
132+ make install
133+else
134+ make -j $1
135+ make -j $1 install
136+fi
137+
138+# Set paths and library paths
139+export PATH=$DAK_INSTALL/bin:$DAK_INSTALL/test:$PATH
140+
141+if [ -z ${DYLD_LIBRARY_PATH+x} ]
142+then
143+ export DYLD_LIBRARY_PATH=$DAK_INSTALL/lib:$DAK_INSTALL/bin
144+else
145+ export DYLD_LIBRARY_PATH=$DAK_INSTALL/lib:$DAK_INSTALL/bin:$DYLD_LIBRARY_PATH
146+fi
147
148Property changes on: ../trunk-jpl/externalpackages/dakota/install-6.2-macosx64-static.sh
149___________________________________________________________________
150Added: svn:executable
151## -0,0 +1 ##
152+*
153\ No newline at end of property
154Index: ../trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh
155===================================================================
156--- ../trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh (nonexistent)
157+++ ../trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh (revision 24311)
158@@ -0,0 +1,81 @@
159+#!/bin/bash
160+set -eu
161+
162+# Constants
163+DAK_VER="6.2"
164+
165+#Some cleanup
166+rm -rf Dakota
167+rm -rf src
168+rm -rf build
169+rm -rf install
170+mkdir src build install
171+
172+#Download from ISSM server
173+$ISSM_DIR/scripts/DownloadExternalPackage.sh https://issm.ess.uci.edu/files/externalpackages/dakota-${DAK_VER}-public.src.tar.gz dakota-${DAK_VER}-public-src.tar.gz
174+
175+#Untar
176+tar -zxvf dakota-${DAK_VER}-public-src.tar.gz
177+
178+#Move Dakota to src directory
179+mv dakota-${DAK_VER}.0.src/* src
180+rm -rf dakota-${DAK_VER}.0.src
181+
182+#Set up Dakota cmake variables and config
183+DAK_PATH=$ISSM_DIR/externalpackages/dakota
184+
185+export DAK_BUILD=$DAK_PATH/build
186+export DAK_INSTALL=$DAK_PATH/install
187+export DAK_SRC=$DAK_PATH/src
188+export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
189+export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
190+
191+cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
192+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/${DAK_VER}/BuildDakotaCustom.cmake.patch
193+patch $DAK_SRC/cmake/DakotaDev.cmake configs/${DAK_VER}/DakotaDev.cmake.patch
194+patch $DAK_SRC/CMakeLists.txt configs/${DAK_VER}/CMakeLists.txt.petsclibs.patch
195+
196+#Apply patches
197+patch src/src/NonDSampling.cpp configs/${DAK_VER}/NonDSampling.cpp.patch
198+patch src/src/NonDLocalReliability.cpp configs/${DAK_VER}/NonDLocalReliability.cpp.patch
199+patch src/packages/pecos/src/pecos_global_defs.hpp configs/${DAK_VER}/pecos_global_defs.hpp.patch
200+
201+#Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
202+export CXXFLAGS='-std=c++98'
203+
204+#Configure dakota
205+cd $DAK_BUILD
206+
207+cmake -C$DAK_SRC/cmake/BuildDakotaCustom.cmake \
208+ -C$DAK_SRC/cmake/DakotaDev.cmake \
209+ -DBUILD_STATIC_LIBS=ON \
210+ -DBUILD_SHARED_LIBS=OFF \
211+ -DBOOST_ROOT=$BOOST_ROOT \
212+ -DBoost_LIBRARY_DIRS=$BOOST_ROOT/lib \
213+ -DBoost_NO_BOOST_CMAKE=TRUE \
214+ -DBoost_NO_SYSTEM_PATHS=TRUE \
215+ -DBoost_INSTALL_PREFIX=$DAK_INSTALL \
216+ -DCMAKE_C_FLAGS="-O2 -g -fPIC" \
217+ -DCMAKE_CXX_FLAGS="-O2 -g -fPIC" \
218+ -DCMAKE_Fortran_FLAGS="-O2 -g -fPIC" \
219+ -DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
220+ -DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
221+ -DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
222+ -DHAVE_ACRO=off \
223+ -DHAVE_JEGA=off \
224+ $DAK_SRC
225+cd ..
226+
227+#Compile and install dakota
228+cd $DAK_BUILD
229+
230+if [ $# -eq 0 ];
231+then
232+ make
233+ make install
234+else
235+ make -j $1
236+ make -j $1 install
237+fi
238+
239+cd ..
240
241Property changes on: ../trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh
242___________________________________________________________________
243Added: svn:executable
244## -0,0 +1 ##
245+*
246\ No newline at end of property
247Index: ../trunk-jpl/externalpackages/boost/install-1.55-macosx-el_capitan-static.sh
248===================================================================
249--- ../trunk-jpl/externalpackages/boost/install-1.55-macosx-el_capitan-static.sh (nonexistent)
250+++ ../trunk-jpl/externalpackages/boost/install-1.55-macosx-el_capitan-static.sh (revision 24311)
251@@ -0,0 +1,47 @@
252+#!/bin/bash
253+set -eu
254+
255+# NOTE: Stop after boostrap phase, and run
256+#
257+# bjam --debug-configuration
258+#
259+# to figure out which paths boost is using to include python. Make sure everyone
260+# of these paths is covered by python. If not, just make symlinks in
261+# externalpackages/python to what boost is expecting. There is NO WAY to get the
262+# boost library to include python support without doing that.
263+
264+#Some cleanup
265+rm -rf install boost_1_55_0 src
266+mkdir install src
267+
268+#Download from ISSM server
269+$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz' 'boost_1_55_0.tar.gz'
270+
271+#Untar
272+tar -zxvf boost_1_55_0.tar.gz
273+
274+#Move boost into install directory
275+mv boost_1_55_0/* src
276+rm -rf boost_1_55_0
277+
278+patch src/boost/atomic/detail/cas128strong.hpp ./configs/1.55/cas128strong.hpp.patch
279+patch src/boost/atomic/detail/gcc-atomic.hpp ./configs/1.55/gcc-atomic.hpp.patch
280+patch src/tools/build/v2/user-config.jam ./configs/1.55/user-config.jam.patch
281+patch src/tools/build/v2/tools/darwin.jam ./configs/1.55/darwin.jam.patch
282+patch src/tools/build/v2/tools/darwin.py ./configs/1.55/darwin.py.patch
283+
284+#Configure and compile
285+cd src
286+./bootstrap.sh \
287+ --prefix="$ISSM_DIR/externalpackages/boost/install" \
288+ --with-python=python
289+
290+#Compile boost
291+# Need gcc with iconv installed in a location that has been added to your path
292+# export CC=/usr/local/gfortan/bin/gcc
293+# export CXX=/usr/local/gfortran/bin/g++
294+./bjam toolset=darwin link=static runtime-link=static install
295+
296+#put bjam into install also:
297+mkdir ../install/bin
298+cp bjam ../install/bin
299
300Property changes on: ../trunk-jpl/externalpackages/boost/install-1.55-macosx-el_capitan-static.sh
301___________________________________________________________________
302Added: svn:executable
303## -0,0 +1 ##
304+*
305\ No newline at end of property
306Index: ../trunk-jpl/externalpackages/boost/install-1.55-linux64-static.sh
307===================================================================
308--- ../trunk-jpl/externalpackages/boost/install-1.55-linux64-static.sh (nonexistent)
309+++ ../trunk-jpl/externalpackages/boost/install-1.55-linux64-static.sh (revision 24311)
310@@ -0,0 +1,39 @@
311+#!/bin/bash
312+#set -eu
313+#unhook set -eu because some target do fail and it is not a big deal
314+
315+#Note of caution: stop after boostrap phase, and run
316+#bjam --debug-configuration, to figure out which paths boost is using to include
317+#python. make sure everyone of these paths is covered by python. If not, just make
318+#symlinks in externalpackages/python to what boost is expecting. Ther is NO WAY
319+#to get the boost library to include python support without doing that.
320+
321+#Some cleanup
322+rm -rf install boost_1_55_0 src
323+mkdir install src
324+
325+#Download from ISSM server
326+$ISSM_DIR/scripts/DownloadExternalPackage.sh https://issm.ess.uci.edu/files/externalpackages/boost_1_55_0.tar.gz boost_1_55_0.tar.gz
327+
328+#Untar
329+tar -zxvf boost_1_55_0.tar.gz
330+
331+#Move boost into install directory
332+mv boost_1_55_0/* src
333+rm -rf boost_1_55_0
334+
335+#Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
336+export CXXFLAGS='-std=c++98'
337+
338+#Configure and compile
339+cd src
340+./bootstrap.sh \
341+ --prefix="$ISSM_DIR/externalpackages/boost/install" \
342+ --with-python=python
343+
344+#Compile boost
345+./bjam toolset=gcc link=static install
346+
347+#put bjam into install also
348+mkdir ../install/bin
349+cp bjam ../install/bin
350
351Property changes on: ../trunk-jpl/externalpackages/boost/install-1.55-linux64-static.sh
352___________________________________________________________________
353Added: svn:executable
354## -0,0 +1 ##
355+*
356\ No newline at end of property
357Index: ../trunk-jpl/packagers/ubuntu/package.sh
358===================================================================
359--- ../trunk-jpl/packagers/ubuntu/package.sh (revision 24310)
360+++ ../trunk-jpl/packagers/ubuntu/package.sh (revision 24311)
361@@ -1,12 +1,31 @@
362 #!/bin/bash
363
364-echo "modify generic"
365+MATLAB_PATH="/usr/local/MATLAB/R2015a"
366+PACKAGE="ISSM" # Name of directory to copy distributable files to
367+TARBALL_NAME="issm-ubuntu"
368+TARBALL=$TARBALL_NAME.tar.gz
369+
370+# Clean up from previous packaging
371+echo "Cleaning up existing assets"
372+cd $ISSM_DIR
373+rm -rf $PACKAGE
374+mkdir $PACKAGE
375+
376+# Add/modify required binaries
377 cd $ISSM_DIR/bin
378+
379+echo "Modify generic"
380 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
381-echo "move mpiexec to bin"
382-cp ../externalpackages/mpich/install/bin/mpiexec .
383-cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
384-echo "move gmsh to bin"
385+
386+echo "Moving mpiexec to bin"
387+if [ -f ../externalpackages/mpich/install/bin/mpiexec ]; then
388+ cp ../externalpackages/mpich/install/bin/mpiexec .
389+ cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
390+else
391+ echo "mpich not found"
392+fi
393+
394+echo "Moving gmsh to bin"
395 if [ -f ../externalpackages/gmsh/install/gmsh ]; then
396 cp ../externalpackages/gmsh/install/gmsh .
397 else
398@@ -13,32 +32,25 @@
399 echo "gmsh not found"
400 fi
401
402-#Check that test101 runs
403+# Check that test101 runs
404 cd $ISSM_DIR/test/NightlyRun
405 rm matlab.log
406-/usr/local/MATLAB/R2015a/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
407+$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
408
409 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
410 echo "test101 FAILED"
411 exit 1;
412 else
413- echo "test101 passed"
414+ echo "test101 PASSED"
415 fi
416
417-tarball_name='issm-ubuntu-static_build.tar.gz'
418-
419-echo "Cleanup first"
420+echo "Creating tarball: ${TARBALL_NAME}"
421 cd $ISSM_DIR
422-rm $tarball_name
423+rm -f $TARBALL
424+cp -rf bin lib test examples scripts $PACKAGE/
425+tar -czf $TARBALL $PACKAGE
426+ls -lah $TARBALL
427
428-echo "Creating tarball: ${tarball_name}"
429-cd $ISSM_DIR
430-rm -rf trunk
431-mkdir trunk
432-cp -rf bin lib test examples scripts trunk/
433-tar -czf $tarball_name trunk
434-ls -lah $tarball_name
435-
436 echo "Shipping binaries to website"
437
438 # We're using public key authentication method to upload the tarball The
439@@ -55,7 +67,7 @@
440 source ~/.ssh/agent.sh
441 ssh-add ~/.ssh/ubuntu-bins_jenkins-to-ross
442
443-scp $tarball_name ross.ics.uci.edu:/var/www/html/$tarball_name
444+scp $TARBALL ross.ics.uci.edu:/var/www/html/$TARBALL
445
446 if [ $? -ne 0 ]; then
447 echo "The upload failed."
448Index: ../trunk-jpl/packagers/ubuntu-dakota/package.sh
449===================================================================
450--- ../trunk-jpl/packagers/ubuntu-dakota/package.sh (nonexistent)
451+++ ../trunk-jpl/packagers/ubuntu-dakota/package.sh (revision 24311)
452@@ -0,0 +1,76 @@
453+#!/bin/bash
454+
455+MATLAB_PATH="/usr/local/MATLAB/R2015a"
456+PACKAGE="ISSM" # Name of directory to copy distributable files to
457+TARBALL_NAME="issm-ubuntu-dakota"
458+TARBALL=$TARBALL_NAME.tar.gz
459+
460+# Clean up from previous packaging
461+echo "Cleaning up existing assets"
462+cd $ISSM_DIR
463+rm -rf $PACKAGE
464+mkdir $PACKAGE
465+
466+# Add/modify required binaries
467+cd $ISSM_DIR/bin
468+
469+echo "Modify generic"
470+cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
471+
472+echo "Moving mpiexec to bin"
473+if [ -f ../externalpackages/mpich/install/bin/mpiexec ]; then
474+ cp ../externalpackages/mpich/install/bin/mpiexec .
475+ cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
476+else
477+ echo "mpich not found"
478+fi
479+
480+echo "Moving gmsh to bin"
481+if [ -f ../externalpackages/gmsh/install/gmsh ]; then
482+ cp ../externalpackages/gmsh/install/gmsh .
483+else
484+ echo "gmsh not found"
485+fi
486+
487+# Check that test101 runs
488+cd $ISSM_DIR/test/NightlyRun
489+rm matlab.log
490+$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
491+
492+if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
493+ echo "test101 FAILED"
494+ exit 1;
495+else
496+ echo "test101 PASSED"
497+fi
498+
499+echo "Creating tarball: ${TARBALL_NAME}"
500+cd $ISSM_DIR
501+rm -f $TARBALL
502+cp -rf bin lib test examples scripts $PACKAGE/
503+tar -czf $TARBALL $PACKAGE
504+ls -lah $TARBALL
505+
506+echo "Shipping binaries to website"
507+
508+# We're using public key authentication method to upload the tarball The
509+# following lines check to see if the SSH Agent is running. If not, then it is
510+# started and relevant information is forwarded to a script.
511+pgrep "ssh-agent" > /dev/null
512+if [ $? -ne 0 ]; then
513+ echo "SSH Agent is not running. Starting it..."
514+ ssh-agent > ~/.ssh/agent.sh
515+else
516+ echo "SSH Agent is running..."
517+fi
518+
519+source ~/.ssh/agent.sh
520+ssh-add ~/.ssh/ubuntu-bins_jenkins-to-ross
521+
522+scp $TARBALL ross.ics.uci.edu:/var/www/html/$TARBALL
523+
524+if [ $? -ne 0 ]; then
525+ echo "The upload failed."
526+ echo "Perhaps the SSH Agent was started by some other means."
527+ echo "Try killing the agent and running again."
528+fi
529
530Property changes on: ../trunk-jpl/packagers/ubuntu-dakota/package.sh
531___________________________________________________________________
532Added: svn:executable
533## -0,0 +1 ##
534+*
535\ No newline at end of property
536Index: ../trunk-jpl/packagers/macosx/package.sh
537===================================================================
538--- ../trunk-jpl/packagers/macosx/package.sh (revision 24310)
539+++ ../trunk-jpl/packagers/macosx/package.sh (revision 24311)
540@@ -1,13 +1,15 @@
541 #!/bin/bash
542
543-TARBALL_NAME='issm-mac-static_build'
544+MATLAB_PATH="/Applications/MATLAB_R2015b.app"
545+PACKAGE="ISSM" # Name of directory to copy distributable files to
546+TARBALL_NAME="issm-mac"
547 TARBALL=$TARBALL_NAME.tar.gz
548
549 # Clean up from previous packaging
550 echo "Cleaning up existing assets"
551 cd $ISSM_DIR
552-rm -rf trunk
553-mkdir trunk
554+rm -rf $PACKAGE
555+mkdir $PACKAGE
556
557 # Add/modify required binaries
558 cd $ISSM_DIR/bin
559@@ -30,13 +32,13 @@
560 echo "gmsh not found"
561 fi
562
563-# Copy gmt to trunk
564+# Copy gmt to package
565 # NOTE: The following assumes the precompiled version of gmt
566 echo "Moving gmt to externalpackages"
567 if [ -f $ISSM_DIR/externalpackages/gmt/install/bin/gmt ]; then
568- mkdir $ISSM_DIR/trunk/externalpackages
569- mkdir $ISSM_DIR/trunk/externalpackages/gmt
570- cp -a $ISSM_DIR/externalpackages/gmt/install/. $ISSM_DIR/trunk/externalpackages/gmt
571+ mkdir $ISSM_DIR/$PACKAGE/externalpackages
572+ mkdir $ISSM_DIR/$PACKAGE/externalpackages/gmt
573+ cp -a $ISSM_DIR/externalpackages/gmt/install $ISSM_DIR/$PACKAGE/externalpackages/gmt/install
574 else
575 echo "gmt not found"
576 fi
577@@ -44,7 +46,7 @@
578 # Check that test101 runs
579 cd $ISSM_DIR/test/NightlyRun
580 rm matlab.log
581-/Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
582+$MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
583
584 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
585 echo "test101 FAILED"
586@@ -56,17 +58,17 @@
587 echo "Creating tarball: ${TARBALL_NAME}"
588 cd $ISSM_DIR
589 rm -f $TARBALL
590-cp -rf bin lib test examples scripts trunk/
591+cp -rf bin lib test examples scripts $PACKAGE/
592
593 # Create link to gmt from bin
594 # NOTE: It is important that we are in the destination dir when sym linking so that the path is relative
595-if [ -f $ISSM_DIR/trunk/externalpackages/gmt/bin/gmt ]; then
596- cd $ISSM_DIR/trunk/bin
597- ln -s ../externalpackages/gmt/bin/gmt ./gmt
598+if [ -f $ISSM_DIR/$PACKAGE/externalpackages/gmt/install/bin/gmt ]; then
599+ cd $ISSM_DIR/$PACKAGE/bin
600+ ln -s ../externalpackages/gmt/install/bin/gmt ./gmt
601 fi
602
603 cd $ISSM_DIR
604-tar -czf $TARBALL trunk
605+tar -czf $TARBALL $PACKAGE
606 ls -lah $TARBALL
607
608 echo "Shipping binaries to website"
609Index: ../trunk-jpl/packagers/macosx-dakota/package.sh
610===================================================================
611--- ../trunk-jpl/packagers/macosx-dakota/package.sh (revision 24310)
612+++ ../trunk-jpl/packagers/macosx-dakota/package.sh (revision 24311)
613@@ -1,39 +1,49 @@
614 #!/bin/bash
615
616-echo "modify generic"
617+MATLAB_PATH="/Applications/MATLAB_R2015b.app"
618+PACKAGE="ISSM" # Name of directory to copy distributable files to
619+TARBALL_NAME="issm-mac-dakota"
620+TARBALL=$TARBALL_NAME.tar.gz
621+
622+# Clean up from previous packaging
623+echo "Cleaning up existing assets"
624+cd $ISSM_DIR
625+rm -rf $PACKAGE
626+mkdir $PACKAGE
627+
628+# Add/modify required binaries
629 cd $ISSM_DIR/bin
630+
631+echo "Modifying generic"
632 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
633-echo "move mpiexec to bin"
634-cp ../externalpackages/mpich/install/bin/mpiexec .
635-cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
636
637-#Check that test101 runs
638+echo "Moving mpiexec to bin"
639+if [ -f ../externalpackages/mpich/install/bin/mpiexec ]; then
640+ cp ../externalpackages/mpich/install/bin/mpiexec .
641+ cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
642+else
643+ echo "mpich not found"
644+fi
645+
646+# Check that test101 runs
647 cd $ISSM_DIR/test/NightlyRun
648 rm matlab.log
649-/Applications/MATLAB_R2015b.app/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
650+$MATLAB_PATH/bin/matlab -nodisplay -nojvm -nosplash -nodesktop -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101); exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
651
652 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then
653 echo "test101 FAILED"
654 exit 1;
655 else
656- echo "test101 passed"
657+ echo "test101 PASSED"
658 fi
659
660-#Package using the Package Maker from OSX, driven by command line.
661-tarball_name='issm-mac-dakota-static_build.tar.gz'
662-
663-echo "Cleanup first"
664+echo "Creating tarball: ${TARBALL_NAME}"
665 cd $ISSM_DIR
666-rm $tarball_name
667+rm -f $TARBALL
668+cp -rf bin lib test examples scripts $PACKAGE/
669+tar -czf $TARBALL $PACKAGE
670+ls -lah $TARBALL
671
672-echo "Creating tarball: ${tarball_name}"
673-cd $ISSM_DIR
674-rm -rf trunk
675-mkdir trunk
676-cp -rf bin lib test examples trunk/
677-tar -czf $tarball_name trunk
678-ls -lah $tarball_name
679-
680 echo "Shipping binaries to website"
681
682 # We're using public key authentication method to upload the tarball. The
683@@ -50,7 +60,7 @@
684 source ~/.ssh/agent.sh
685 ssh-add ~/.ssh/macosx-bins_richese-to-ross
686
687-scp $tarball_name ross.ics.uci.edu:/var/www/html/$tarball_name
688+scp $TARBALL ross.ics.uci.edu:/var/www/html/$TARBALL
689
690 if [ $? -ne 0 ]; then
691 echo "The upload failed."
692Index: ../trunk-jpl/packagers/win10/package64.sh
693===================================================================
694--- ../trunk-jpl/packagers/win10/package64.sh (revision 24310)
695+++ ../trunk-jpl/packagers/win10/package64.sh (revision 24311)
696@@ -1,8 +1,9 @@
697 #!/bin/bash
698
699+MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a"
700+PACKAGE="ISSM" # Name of directory to copy distributable files to
701 TARBALL_NAME='ISSM-Win10-64'
702 TARBALL=$TARBALL_NAME.tar.gz
703-MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a"
704
705 # Source Windows environment
706 source $ISSM_DIR/externalpackages/windows/windows_environment.sh
707@@ -10,8 +11,8 @@
708 # Clean up from previous packaging
709 echo "Cleaning up existing assets"
710 cd $ISSM_DIR
711-rm -rf trunk
712-mkdir trunk
713+rm -rf $PACKAGE
714+mkdir $PACKAGE
715
716 # Add/modify required binaries
717 cd $ISSM_DIR/bin
718@@ -25,18 +26,18 @@
719
720 echo "Copying gmsh to bin"
721 if [ -f ../externalpackages/gmsh/install/gmsh.exe ]; then
722- cp ../externalpackages/gmsh/install/gmsh.exe .
723+ cp ../externalpackages/gmsh/install/gmsh.exe ./gmsh.exe
724 else
725 echo "gmsh not found"
726 fi
727
728-# Copy gmt to trunk
729+# Copy gmt to package
730 # NOTE: The following assumes the precompiled version of gmt
731 echo "Moving gmt to externalpackages"
732 if [ -f $ISSM_DIR/externalpackages/gmt/install/bin/gmt ]; then
733- mkdir $ISSM_DIR/trunk/externalpackages
734- mkdir $ISSM_DIR/trunk/externalpackages/gmt
735- cp -a $ISSM_DIR/externalpackages/gmt/install/. $ISSM_DIR/trunk/externalpackages/gmt
736+ mkdir $ISSM_DIR/$PACKAGE/externalpackages
737+ mkdir $ISSM_DIR/$PACKAGE/externalpackages/gmt
738+ cp -a $ISSM_DIR/externalpackages/gmt/install $ISSM_DIR/$PACKAGE/externalpackages/gmt/install
739 else
740 echo "gmt not found"
741 fi
742@@ -66,17 +67,17 @@
743 echo "Creating tarball: ${TARBALL_NAME}"
744 cd $ISSM_DIR
745 rm -f $TARBALL
746-cp -rf bin lib test examples scripts trunk/
747+cp -rf bin lib test examples scripts $PACKAGE/
748
749 # Create link to gmt from bin
750 # NOTE: It is important that we are in the destination dir when sym linking so that the path is relative
751-if [ -f $ISSM_DIR/trunk/externalpackages/gmt/bin/gmt ]; then
752- cd $ISSM_DIR/trunk/bin
753- ln -s ../externalpackages/gmt/bin/gmt.exe ./gmt
754+if [ -f $ISSM_DIR/$PACKAGE/externalpackages/gmt/bin/gmt ]; then
755+ cd $ISSM_DIR/$PACKAGE/bin
756+ ln -s ../externalpackages/gmt/bin/gmt.exe ./gmt.exe
757 fi
758
759 cd $ISSM_DIR
760-tar -czf $TARBALL trunk
761+tar -czf $TARBALL $PACKAGE
762 ls -lah $TARBALL
763
764 # Ship binaries to website
765Index: ../trunk-jpl/jenkins/linux64_ross_static
766===================================================================
767--- ../trunk-jpl/jenkins/linux64_ross_static (revision 24310)
768+++ ../trunk-jpl/jenkins/linux64_ross_static (revision 24311)
769@@ -22,9 +22,9 @@
770 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
771 --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
772 --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
773- --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran" \
774- --with-pic \
775- --with-numthreads=4'
776+ --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu -lgfortran" \
777+ --with-numthreads=4 \
778+ --with-pic'
779
780 #PYTHON and MATLAB testing
781 MATLAB_TEST=0
782@@ -51,10 +51,10 @@
783
784 #number of cpus used in ISSM installation and compilation (one is usually
785 #safer as some packages are very sensitive to parallel compilation)
786-NUMCPUS_INSTALL=10
787+NUMCPUS_INSTALL=4
788
789 #number of cpus used in the nightly runs.
790-NUMCPUS_RUN=10
791+NUMCPUS_RUN=4
792
793 #Nightly run options. The matlab routine runme.m will be called
794 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
795@@ -61,5 +61,5 @@
796 #by Matlab and runme.m
797 #ex: "'id',[101 102 103]"
798 ## FS
799-#PYTHON_NROPTIONS="--exclude_name 'Dakota'"
800-#MATLAB_NROPTIONS="'exclude',[243,701,702,703,435,IdFromString('Dakota')]"
801+#PYTHON_NROPTIONS=""
802+#MATLAB_NROPTIONS=""
803Index: ../trunk-jpl/jenkins/linux64_ross_dakota_static
804===================================================================
805--- ../trunk-jpl/jenkins/linux64_ross_dakota_static (nonexistent)
806+++ ../trunk-jpl/jenkins/linux64_ross_dakota_static (revision 24311)
807@@ -0,0 +1,67 @@
808+
809+#-------------------------------#
810+# 1: ISSM general configuration #
811+#-------------------------------#
812+
813+#MATLAB path
814+MATLAB_PATH="/usr/local/MATLAB/R2015a"
815+
816+#ISSM CONFIGURATION
817+ISSM_CONFIG='--prefix=$ISSM_DIR\
818+ --enable-standalone-executables \
819+ --enable-standalone-modules \
820+ --enable-standalone-libraries \
821+ --with-matlab-dir=$MATLAB_PATH \
822+ --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
823+ --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
824+ --with-mpi-libflags="$ISSM_DIR/externalpackages/mpich/install/lib/libmpifort.a $ISSM_DIR/externalpackages/mpich/install/lib/libmpi.a -lrt -lpthread" \
825+ --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
826+ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
827+ --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
828+ --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
829+ --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
830+ --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
831+ --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
832+ --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
833+ --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
834+ --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu -lgfortran" \
835+ --with-numthreads=4 \
836+ --with-pic'
837+
838+#PYTHON and MATLAB testing
839+MATLAB_TEST=0
840+PYTHON_TEST=0
841+
842+#-----------------------------------#
843+# 3: External packages installation #
844+#-----------------------------------#
845+
846+#List of external pakages to be installed and their installation scripts
847+EXTERNALPACKAGES="autotools install.sh
848+ cmake install.sh
849+ chaco install.sh
850+ mpich install-3.2-linux64-static.sh
851+ m1qn3 install.sh
852+ petsc install-3.7-linux64-static.sh
853+ triangle install-linux64.sh
854+ boost install-1.55-linux64-static.sh
855+ dakota install-6.2-linux64-static.sh
856+ shell2junit install.sh"
857+
858+#-----------------#
859+# 4: test 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=4
865+
866+#number of cpus used in the nightly runs.
867+NUMCPUS_RUN=4
868+
869+#Nightly run options. The matlab routine runme.m will be called
870+#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
871+#by Matlab and runme.m
872+#ex: "'id',[101 102 103]"
873+#PYTHON_NROPTIONS=""
874+#MATLAB_NROPTIONS=""
875
876Property changes on: ../trunk-jpl/jenkins/linux64_ross_dakota_static
877___________________________________________________________________
878Added: svn:executable
879## -0,0 +1 ##
880+*
881\ No newline at end of property
882Index: ../trunk-jpl/examples/Pig2/runme.m
883===================================================================
884--- ../trunk-jpl/examples/Pig2/runme.m (revision 24310)
885+++ ../trunk-jpl/examples/Pig2/runme.m (revision 24311)
886@@ -1,6 +1,6 @@
887-steps=[1:8];
888+steps=1;
889
890-if any(steps==1) %Mesh Generation #1
891+if any(steps==1) %Mesh Generation #1
892
893 %Mesh parameters
894 domain =['./DomainOutline.exp'];
895@@ -157,7 +157,7 @@
896
897 if any(steps==6) %Transient Run #1
898
899- md = loadmodel('../Pig/Models/PIG_Control_drag');
900+ md = loadmodel('./Models/PIG_Control_drag');
901
902 md.inversion.iscontrol=0;
903 md.transient.ismasstransport=1;
904Index: ../trunk-jpl
905===================================================================
906--- ../trunk-jpl (revision 24310)
907+++ ../trunk-jpl (revision 24311)
908
909Property changes on: ../trunk-jpl
910___________________________________________________________________
911Modified: svn:mergeinfo
912## -0,0 +0,1 ##
913 Merged /issm/trunk:r23397-24310
Note: See TracBrowser for help on using the repository browser.