Changeset 19664

Timestamp:

10/20/15 17:35:36 (10 years ago)

Author:

schlegel

Message:

CHG: clean up old mpi files

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• configs/6.1-mpi (deleted)
• configs/6.2-mpi (deleted)
• install-6.1-linux64.sh (deleted)
• install-6.1-macosx64-yosemite.sh (deleted)
• install-6.1-macosx64.sh (deleted)
• install-6.1-mpi-linux64.sh (deleted)
• install-6.1-mpi-macosx64-yosemite.sh (deleted)
• install-6.2-macosx64-yosemite.sh (moved) (moved from issm/trunk-jpl/externalpackages/dakota/install-6.2-mpi-macosx64-yosemite.sh ) (2 diffs)
• install-6.2-macosx64.sh (added)

issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64-yosemite.sh

@@ -10 +10 @@
 
 #Download from ISSM server
-#$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'
+$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'
 
 #Untar 
-tar -zxvf dakota-6.2-public.src.tar.gz
+tar -zxvf dakota-6.2-public-src.tar.gz
 
 #Move Dakota to src directory
@@ -24 +24 @@
 export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
-patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2-mpi/BuildDakotaCustom.cmake.yosemite.patch
-patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2-mpi/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/6.2-mpi/CMakeLists.txt.patch
+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.yosemite.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.patch
 
 #Apply patches
-patch src/src/NonDSampling.cpp configs/6.2-mpi/NonDSampling.cpp.patch
-patch src/src/NonDLocalReliability.cpp configs/6.2-mpi/NonDLocalReliability.cpp.patch
-patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2-mpi/pecos_global_defs.hpp.patch
+patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
+patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
 
 #Configure dakota