Changeset 581

Timestamp:

05/23/09 09:30:10 (16 years ago)

Author:

Eric.Larour

Message:

Added no matlab install + ParallelLibrary patches

Location:

issm/trunk/externalpackages/dakota

Files:

• ParallelLibrary.C.patch (added)
• ParallelLibrary.H.patch (added)
• install.sh (modified) (3 diffs)

issm/trunk/externalpackages/dakota/install.sh

@@ -6 +6 @@
 #Some cleanup
 rm -rf Dakota
-rm -rf src
-rm -rf install
+rm -rf src src_nomatlab
+rm -rf install install_nomatlab
 
 #Create src and install directories
-mkdir src install
+mkdir src src_nomatlab install install_nomatlab
 
 #version of doxygen
@@ -21 +21 @@
 mv Dakota/* src
 rm -rf Dakota
+cp -Rf src src_nomatlab
+
+#Apply patches
+patch src/src/ParallelLibrary.C ./ParallelLibrary.C.patch
+patch src/src/ParallelLibrary.H ./ParallelLibrary.H.patch
+
+patch src_nomatlab/src/ParallelLibrary.C ./ParallelLibrary.C.patch
+patch src_nomatlab/src/ParallelLibrary.H ./ParallelLibrary.H.patch
 
 #Configure dakota
@@ -31 +39 @@
 #Install dakota
 make  install
+
+#Configure dakota with no matlab
+cd ../src_nomatlab
+./configure --prefix="$ISSM_DIR/externalpackages/dakota/install_nomatlab" --without-graphics 
+
+#Compile dakota
+make  -j $NUMCPUS
+
+#Install dakota
+make  install