source: issm/oecreview/Archive/19101-20495/ISSM-19694-19695.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.0 KB
RevLine 
[20498]1Index: ../trunk-jpl/externalpackages/dakota/install-6.2-pfe.sh
2===================================================================
3--- ../trunk-jpl/externalpackages/dakota/install-6.2-pfe.sh (revision 19694)
4+++ ../trunk-jpl/externalpackages/dakota/install-6.2-pfe.sh (revision 19695)
5@@ -1,56 +0,0 @@
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.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz'
18-
19-#Untar
20-tar -zxvf dakota-6.2-public-src.tar.gz
21-
22-#Move Dakota to src directory
23-mv dakota-6.2.0.src/* src
24-rm -rf dakota-6.2.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-export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
30-cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
31-patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.pfe.patch
32-patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
33-patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.pfe.patc
34-
35-#Apply patches
36-patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch
37-patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
38-patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
39-
40-#Configure dakota
41-cd $DAK_BUILD
42-
43-cmake -D CMAKE_C_COMPILER=mpicc \
44- -D CMAKE_CXX_COMPILER=mpicxx \
45- -D CMAKE_Fortran_COMPILER=mpif77 \
46- -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
47- -C $DAK_SRC/cmake/DakotaDev.cmake \
48- $DAK_SRC
49-cd ..
50-
51-#Compile and install dakota
52-cd $DAK_BUILD
53-if [ $# -eq 0 ];
54-then
55- make
56- make install
57-else
58- make -j $1
59- make -j $1 install
60-fi
61-cd ..
62Index: ../trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.pfe.patch
63===================================================================
64--- ../trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.pfe.patch (revision 19694)
65+++ ../trunk-jpl/externalpackages/dakota/configs/6.2/BuildDakotaCustom.cmake.pfe.patch (revision 19695)
66@@ -1,9 +1,12 @@
67-64,65c64,65
68-< #set( DAKOTA_HAVE MPI ON
69-< # CACHE BOOL "Build with MPI enabled" FORCE)
70----
71-> set( DAKOTA_HAVE MPI OFF
72-> CACHE BOOL "Build with MPI disabled" FORCE)
73+67a68,75
74+> set( DAKOTA_HAVE_MPI ON
75+> CACHE BOOL "Always build with MPI enabled" FORCE)
76+> set( MPI_INCLUDE_PATH
77+> "$ENV{ISSM_DIR}/externalpackages/mpich/install/include"
78+> CACHE FILEPATH "Use installed MPI headers" FORCE)
79+> set( MPI_LIBRARY
80+> "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so"
81+> CACHE FILEPATH "Use installed MPI library" FORCE)
82 73,77c73,77
83 < #set(BOOST_ROOT
84 < # "path/to/custom/Boost/install/directory"
85Index: ../trunk-jpl/externalpackages/dakota/install-6.2-pleiades.sh
86===================================================================
87--- ../trunk-jpl/externalpackages/dakota/install-6.2-pleiades.sh (revision 0)
88+++ ../trunk-jpl/externalpackages/dakota/install-6.2-pleiades.sh (revision 19695)
89@@ -0,0 +1,56 @@
90+#!/bin/bash
91+set -eu
92+
93+#Some cleanup
94+rm -rf Dakota
95+rm -rf src
96+rm -rf build
97+rm -rf install
98+mkdir src build install
99+
100+#Download from ISSM server
101+$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz'
102+
103+#Untar
104+tar -zxvf dakota-6.2-public-src.tar.gz
105+
106+#Move Dakota to src directory
107+mv dakota-6.2.0.src/* src
108+rm -rf dakota-6.2.0.src
109+
110+#Set up Dakota cmake variables and config
111+export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
112+export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
113+export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
114+cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
115+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.pfe.patch
116+patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
117+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.pfe.patch
118+
119+#Apply patches
120+patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch
121+patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
122+patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
123+
124+#Configure dakota
125+cd $DAK_BUILD
126+
127+cmake -D CMAKE_C_COMPILER=mpicc \
128+ -D CMAKE_CXX_COMPILER=mpicxx \
129+ -D CMAKE_Fortran_COMPILER=/usr/bin/gfortran \
130+ -C $DAK_SRC/cmake/BuildDakotaCustom.cmake \
131+ -C $DAK_SRC/cmake/DakotaDev.cmake \
132+ $DAK_SRC
133+cd ..
134+
135+#Compile and install dakota
136+cd $DAK_BUILD
137+if [ $# -eq 0 ];
138+then
139+ make
140+ make install
141+else
142+ make -j $1
143+ make -j $1 install
144+fi
145+cd ..
146
147Property changes on: ../trunk-jpl/externalpackages/dakota/install-6.2-pleiades.sh
148___________________________________________________________________
149Added: svn:executable
150 + *
151
Note: See TracBrowser for help on using the repository browser.