source: issm/oecreview/Archive/19101-20495/ISSM-19539-19540.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: 5.3 KB
RevLine 
[20498]1Index: ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh
2===================================================================
3--- ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh (revision 0)
4+++ ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh (revision 19540)
5@@ -0,0 +1,51 @@
6+#!/bin/bash
7+set -eu
8+
9+#Some cleanup
10+rm -rf Dakota
11+rm -rf src
12+rm -rf build
13+rm -rf install
14+mkdir src build install
15+
16+#Download from ISSM server
17+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.1-public.src.tar.gz' 'dakota-6.1-public-src.tar.gz'
18+
19+#Untar
20+tar -zxvf dakota-6.1-public-src.tar.gz
21+
22+#Move Dakota to src directory
23+mv dakota-6.1.0.src/* src
24+rm -rf dakota-6.1.0.src
25+
26+#Set up Dakota cmake variables and config
27+export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
28+export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
29+cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
30+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.patch
31+#patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
32+patch $DAK_SRC/CMakeLists.txt configs/6.1/CMakeLists.txt.patch
33+
34+#Apply patches
35+patch src/src/ParallelLibrary.cpp configs/6.1/ParallelLibrary.cpp.patch
36+patch src/src/ParallelLibrary.hpp configs/6.1/ParallelLibrary.hpp.patch
37+patch src/src/NonDSampling.cpp configs/6.1/NonDSampling.cpp.patch
38+patch src/src/NonDLocalReliability.cpp configs/6.1/NonDLocalReliability.cpp.patch
39+patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.1/pecos_global_defs.hpp.patch
40+
41+#Configure dakota
42+cd $DAK_BUILD
43+cmake -D CMAKE_C_COMPILER=/usr/local/gfortran/bin/gcc -D CMAKE_CXX_COMPILER=/usr/local/gfortran/bin/g++ -D CMAKE_Fortran_COMPILER=/usr/local/gfortran/bin/gfortran -D LDFLAGS="-std=gnu++0x" -C $DAK_SRC/cmake/BuildDakotaCustom.cmake -C $DAK_SRC/cmake/DakotaDev.cmake $DAK_SRC
44+cd ..
45+
46+#Compile and install dakota
47+cd $DAK_BUILD
48+if [ $# -eq 0 ];
49+then
50+ make
51+ make install
52+else
53+ make -j $1
54+ make -j $1 install
55+fi
56+cd ..
57
58Property changes on: ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64-yosemite.sh
59___________________________________________________________________
60Added: svn:executable
61 + *
62
63Index: ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh
64===================================================================
65--- ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh (revision 0)
66+++ ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh (revision 19540)
67@@ -0,0 +1,56 @@
68+#!/bin/bash
69+set -eu
70+
71+#Some cleanup
72+rm -rf Dakota
73+rm -rf src
74+rm -rf build
75+rm -rf install
76+mkdir src build install
77+
78+#Download from ISSM server
79+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.1-public.src.tar.gz' 'dakota-6.1-public-src.tar.gz'
80+
81+#Untar
82+tar -zxvf dakota-6.1-public-src.tar.gz
83+
84+#Move Dakota to src directory
85+mv dakota-6.1.0.src/* src
86+rm -rf dakota-6.1.0.src
87+
88+#Set up Dakota cmake variables and config
89+export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
90+export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
91+cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
92+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.mac.patch
93+#patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
94+patch $DAK_SRC/CMakeLists.txt configs/6.1/CMakeLists.txt.patch
95+
96+#Apply patches
97+patch src/src/ParallelLibrary.cpp configs/6.1/ParallelLibrary.cpp.patch
98+patch src/src/ParallelLibrary.hpp configs/6.1/ParallelLibrary.hpp.patch
99+patch src/src/NonDSampling.cpp configs/6.1/NonDSampling.cpp.patch
100+patch src/src/NonDLocalReliability.cpp configs/6.1/NonDLocalReliability.cpp.patch
101+patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.1/pecos_global_defs.hpp.patch
102+
103+#Configure dakota
104+cd $DAK_BUILD
105+cmake -DBoost_NO_BOOST_CMAKE=TRUE \
106+ -DBoost_NO_SYSTEM_PATHS=TRUE \
107+ -DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
108+ -DBoost_LIBRARY_DIRS:FILEPATH=${BOOST_ROOT}/lib \
109+ -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CC_COMPILER=gcc \
110+ -C $DAK_SRC/cmake/BuildDakotaCustom.cmake -C $DAK_SRC/cmake/DakotaDev.cmake $DAK_SRC
111+cd ..
112+
113+#Compile and install dakota
114+cd $DAK_BUILD
115+if [ $# -eq 0 ];
116+then
117+ make
118+ make install
119+else
120+ make -j $1
121+ make -j $1 install
122+fi
123+cd ..
124
125Property changes on: ../trunk-jpl/externalpackages/dakota/install-6.1-macosx64.sh
126___________________________________________________________________
127Added: svn:executable
128 + *
129
130Index: ../trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh
131===================================================================
132--- ../trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh (revision 19539)
133+++ ../trunk-jpl/externalpackages/dakota/install-6.1-linux64.sh (revision 19540)
134@@ -23,7 +23,7 @@
135 export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
136 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
137 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.1/BuildDakotaCustom.cmake.patch
138-patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
139+#patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.1/DakotaDev.cmake.patch
140 #patch $DAK_SRC/CMakeLists.txt configs/6.1/CMakeLists.txt.patch
141
142 #Apply patches
Note: See TracBrowser for help on using the repository browser.