source: issm/oecreview/Archive/14064-14311/ISSM-14267-14268.diff@ 14312

Last change on this file since 14312 was 14312, checked in by Mathieu Morlighem, 12 years ago

Added 14064-14311
File size: 6.9 KB
RevLine 
[14312]1Index: ../trunk-jpl/externalpackages/dakota/pecos_global_defs.hpp.5.2.patch
2===================================================================
3--- ../trunk-jpl/externalpackages/dakota/pecos_global_defs.hpp.5.2.patch (revision 0)
4+++ ../trunk-jpl/externalpackages/dakota/pecos_global_defs.hpp.5.2.patch (revision 14268)
5@@ -0,0 +1,4 @@
6+24a25
7+> #ifndef PI
8+25a27
9+> #endif
10Index: ../trunk-jpl/externalpackages/dakota/NonDLocalReliability.C.5.2.patch
11===================================================================
12--- ../trunk-jpl/externalpackages/dakota/NonDLocalReliability.C.5.2.patch (revision 0)
13+++ ../trunk-jpl/externalpackages/dakota/NonDLocalReliability.C.5.2.patch (revision 14268)
14@@ -0,0 +1,9 @@
15+2218a2219
16+> // add sensitivity output to importance factors (jes, 8/06/10)
17+2223c2224,2227
18+< << std::setw(width) << impFactor(j,i) << '\n';
19+---
20+> << std::setw(width) << impFactor(j,i)
21+> << " Sensitivity = "
22+> << std::resetiosflags(std::ios::adjustfield)
23+> << std::setw(width) << fnGradsMeanX(j,i) << '\n';
24Index: ../trunk-jpl/externalpackages/dakota/NonDUnilevelRBDO.C.5.2.patch
25===================================================================
26--- ../trunk-jpl/externalpackages/dakota/NonDUnilevelRBDO.C.5.2.patch (revision 0)
27+++ ../trunk-jpl/externalpackages/dakota/NonDUnilevelRBDO.C.5.2.patch (revision 14268)
28@@ -0,0 +1,7 @@
29+1046a1047
30+> // add sensitivity output to importance factors (jes, 8/06/10)
31+1048c1049,1050
32+< << uv_labels[j].data() << " = " << impFactor[i][j] << '\n';
33+---
34+> << uv_labels[j].data() << " = " << impFactor[i][j]
35+> << " Sensitivity = " << fnGradsMeanX(i,j) << '\n';
36Index: ../trunk-jpl/externalpackages/dakota/ParallelLibrary.C.5.2.patch
37===================================================================
38--- ../trunk-jpl/externalpackages/dakota/ParallelLibrary.C.5.2.patch (revision 0)
39+++ ../trunk-jpl/externalpackages/dakota/ParallelLibrary.C.5.2.patch (revision 14268)
40@@ -0,0 +1,36 @@
41+178a179
42+> initialized=0; //we run serially all the time!
43+214a216,248
44+> /** This constructor is provided for the Issm software, to run serial
45+> * Dakota in a parallel MPI ring: */
46+> ParallelLibrary::ParallelLibrary(char* serial_mode):
47+> worldRank(0), worldSize(1),
48+> mpirunFlag(false), ownMPIFlag(false), dummyFlag(false),
49+> stdOutputToFile(false), stdErrorToFile(false), checkFlag(false),
50+> preRunFlag(true), runFlag(true), postRunFlag(true), userModesFlag(false),
51+> startClock(0), stopRestartEvals(0),
52+> currPLIter(parallelLevels.end()), currPCIter(parallelConfigurations.end())
53+> {
54+> startClock = clock();
55+> #ifdef DAKOTA_UTILIB
56+> utilib::exception_mngr::set_mode(utilib::exception_mngr::Abort);
57+> startCPUTime = CPUSeconds(); // see utilib/src/sys/seconds.cpp
58+> startWCTime = WallClockSeconds(); // see utilib/src/sys/seconds.cpp
59+> #endif // DAKOTA_UTILIB
60+>
61+> // do not initialize MPI. Get worldRank/worldSize if available
62+> ParallelLevel pl;
63+> #ifdef HAVE_MPI // mpi available, we still don't want to run in parallel for Dakota!
64+> pl.serverIntraComm = MPI_COMM_NULL;
65+> Cout << "Running Dakota MPI executable in serial mode on CPU 0 for ISSM.";
66+> #else // mpi not available
67+> pl.serverIntraComm = MPI_COMM_NULL;
68+> Cout << "Running Dakota serial executable in serial mode for ISSM.\n";
69+> #endif // HAVE_MPI
70+>
71+> parallelLevels.push_back(pl);
72+> currPLIter = parallelLevels.begin();
73+> increment_parallel_configuration();
74+> }
75+>
76+>
77Index: ../trunk-jpl/externalpackages/dakota/NIDRProblemDescDB.C.5.2.patch
78===================================================================
79--- ../trunk-jpl/externalpackages/dakota/NIDRProblemDescDB.C.5.2.patch (revision 0)
80+++ ../trunk-jpl/externalpackages/dakota/NIDRProblemDescDB.C.5.2.patch (revision 14268)
81@@ -0,0 +1,5 @@
82+109a110,113
83+>
84+> //close the input file
85+> fclose(nidrin);
86+>
87Index: ../trunk-jpl/externalpackages/dakota/ParallelLibrary.H.5.2.patch
88===================================================================
89--- ../trunk-jpl/externalpackages/dakota/ParallelLibrary.H.5.2.patch (revision 0)
90+++ ../trunk-jpl/externalpackages/dakota/ParallelLibrary.H.5.2.patch (revision 14268)
91@@ -0,0 +1,3 @@
92+358a359,360
93+> /// library mode constructor, serial mode (for the Issm software)
94+> ParallelLibrary(char* serial_mode);
95Index: ../trunk-jpl/externalpackages/dakota/NonDSampling.C.5.2.patch
96===================================================================
97--- ../trunk-jpl/externalpackages/dakota/NonDSampling.C.5.2.patch (revision 0)
98+++ ../trunk-jpl/externalpackages/dakota/NonDSampling.C.5.2.patch (revision 14268)
99@@ -0,0 +1,14 @@
100+438,439c438,440
101+< if (!subIteratorFlag)
102+< nonDSampCorr.compute_correlations(vars_samples, resp_samples);
103+---
104+> //don't compute for now, too expensive.
105+> // if (!subIteratorFlag)
106+> // nonDSampCorr.compute_correlations(vars_samples, resp_samples);
107+894,895c895,897
108+< nonDSampCorr.print_correlations(s, cv_labels, div_labels, drv_labels,
109+< iteratedModel.response_labels());
110+---
111+> //don't output for now.
112+> // nonDSampCorr.print_correlations(s, cv_labels, div_labels, drv_labels,
113+> // iteratedModel.response_labels());
114Index: ../trunk-jpl/externalpackages/dakota/install-5.2-linux64-astrid.sh
115===================================================================
116--- ../trunk-jpl/externalpackages/dakota/install-5.2-linux64-astrid.sh (revision 0)
117+++ ../trunk-jpl/externalpackages/dakota/install-5.2-linux64-astrid.sh (revision 14268)
118@@ -0,0 +1,51 @@
119+#!/bin/bash
120+set -eu
121+
122+#Some cleanup
123+rm -rf Dakota
124+rm -rf src
125+rm -rf install
126+mkdir src install
127+
128+#Download from ISSM server
129+#$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/Dakota_5_2.src.tar.gz' 'Dakota_5_2.src.tar.gz'
130+
131+#Untar
132+tar -zxvf Dakota_5_2.src.tar.gz
133+
134+#Move Dakota to src directory
135+mv Dakota/* src
136+rm -rf Dakota
137+
138+#Apply patches
139+patch src/src/ParallelLibrary.C ./ParallelLibrary.C.5.2.patch
140+patch src/src/ParallelLibrary.H ./ParallelLibrary.H.5.2.patch
141+#patch src/src/NIDRProblemDescDB.C ./NIDRProblemDescDB.C.5.2.patch # causes segfault in 5.2
142+patch src/src/NonDSampling.C ./NonDSampling.C.5.2.patch
143+patch src/src/NonDLocalReliability.C ./NonDLocalReliability.C.5.2.patch
144+patch src/src/NonDUnilevelRBDO.C ./NonDUnilevelRBDO.C.5.2.patch # source not even used?
145+patch src/packages/pecos/src/pecos_global_defs.hpp ./pecos_global_defs.hpp.5.2.patch
146+
147+#Configure dakota
148+cd src
149+./configure \
150+ --prefix="$ISSM_DIR/externalpackages/dakota/install" \
151+ --without-graphics \
152+ --with-pic \
153+ --disable-mpi \
154+ --with-plugin \
155+ --with-blas=/usr/lib64/libblas.so.3.0.3 \
156+ --with-lapack=/usr/lib64/liblapack.so.3.0.3
157+cd ..
158+
159+#Compile and install dakota
160+cd src
161+if [ $# -eq 0 ];
162+then
163+ make
164+ make install
165+else
166+ make -j $1
167+ make -j $1 install
168+fi
169+cd ..
170
171Property changes on: ../trunk-jpl/externalpackages/dakota/install-5.2-linux64-astrid.sh
172___________________________________________________________________
173Added: svn:executable
174## -0,0 +1 ##
175+*
Note: See TracBrowser for help on using the repository browser.