Changeset 15245

Timestamp:

06/12/13 10:11:27 (12 years ago)

Author:

jschierm

Message:

NEW: Dakota 5.3.1 install and patch files (along with a couple 5.3 changes).

Location:

issm/trunk-jpl/externalpackages/dakota/configs

Files:

• 5.3.1 (added)
• 5.3.1/BuildDakotaCustom.cmake.patch (added)
• 5.3.1/DakotaDev.cmake.patch (added)
• 5.3.1/NonDLocalReliability.cpp.patch (added)
• 5.3.1/NonDSampling.cpp.patch (added)
• 5.3.1/ParallelLibrary.cpp.patch (added)
• 5.3.1/ParallelLibrary.hpp.patch (added)
• 5.3.1/pecos_global_defs.hpp.patch (added)
• 5.3/ParallelLibrary.cpp.patch (modified) (2 diffs)
• 5.3/ParallelLibrary.hpp.patch (modified) (1 diff)

issm/trunk-jpl/externalpackages/dakota/configs/5.3/ParallelLibrary.cpp.patch

@@ -4 +4 @@
 >   initialized=0; //we run serially all the time!
 137a140,172
-> /** This constructor is provided for the Issm software, to run serial
+> /** This constructor is provided for the ISSM software, to run serial
 >  * Dakota in a parallel MPI ring: */
 > ParallelLibrary::ParallelLibrary(char* serial_mode):
@@ -25 +25 @@
 > #ifdef HAVE_MPI // mpi available, we still don't want to run in parallel for Dakota!
 >   pl.serverIntraComm = MPI_COMM_NULL;
->   Cout << "Running Dakota MPI executable in serial mode on CPU 0 for ISSM.";
+>   Cout << "Running Dakota 5.3 MPI executable in serial mode on CPU 0 for ISSM.";
 > #else // mpi not available
 >   pl.serverIntraComm = MPI_COMM_NULL;
->   Cout << "Running Dakota serial executable in serial mode for ISSM.\n";
+>   Cout << "Running Dakota 5.3 serial executable in serial mode for ISSM.\n";
 > #endif // HAVE_MPI
 > 

issm/trunk-jpl/externalpackages/dakota/configs/5.3/ParallelLibrary.hpp.patch

@@ -1 +1 @@
 358a359,360
->   /// library mode constructor, serial mode (for the Issm software)
+>   /// library mode constructor, serial mode (for the ISSM software)
 >   ParallelLibrary(char* serial_mode);