Changeset 16020

Timestamp:

08/29/13 15:29:35 (12 years ago)

Author:

jschierm

Message:

CHG: Updated ParallelLibrary.cpp.patch for Dakota 5.3.1.

File:

• issm/trunk-jpl/externalpackages/dakota/configs/5.3.1/ParallelLibrary.cpp.patch (modified) (3 diffs)

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

@@ -3 +3 @@
 133a135
 >   initialized=0; //we run serially all the time!
-141a144,176
+141a144,171
 > /** This constructor is provided for the ISSM software, to run serial
 >  * Dakota in a parallel MPI ring: */
 > ParallelLibrary::ParallelLibrary(char* serial_mode):
->   worldRank(0), worldSize(1),
+>   dakotaMPIComm(MPI_COMM_WORLD), worldRank(0), worldSize(1),
 >   mpirunFlag(false), ownMPIFlag(false), dummyFlag(false),
 >   stdOutputToFile(false), stdErrorToFile(false), checkFlag(false),
 >   preRunFlag(true), runFlag(true), postRunFlag(true), userModesFlag(false),
->   startClock(0), stopRestartEvals(0),
+>   outputTimings(true), startClock(0), stopRestartEvals(0),
 >   currPLIter(parallelLevels.end()), currPCIter(parallelConfigurations.end())
 > {
->   startClock   = clock();
-> #ifdef DAKOTA_UTILIB
->   utilib::exception_mngr::set_mode(utilib::exception_mngr::Abort);
->   startCPUTime = CPUSeconds();       // see utilib/src/sys/seconds.cpp
->   startWCTime  = WallClockSeconds(); // see utilib/src/sys/seconds.cpp
-> #endif // DAKOTA_UTILIB
+>   initialize_timers();
 > 
 >   // do not initialize MPI.  Get worldRank/worldSize if available
@@ -25 +20 @@
 > #ifdef HAVE_MPI // mpi available, we still don't want to run in parallel for Dakota!
 >   pl.serverIntraComm = MPI_COMM_NULL;
->   Cout << "Running Dakota 5.3.1 MPI executable in serial mode on CPU 0 for ISSM.";
+>   Cout << "Running Dakota 5.3.1 MPI executable in serial mode on CPU 0 for ISSM." << std::endl;
 > #else // mpi not available
 >   pl.serverIntraComm = MPI_COMM_NULL;
->   Cout << "Running Dakota 5.3.1 serial executable in serial mode for ISSM.\n";
+>   Cout << "Running Dakota 5.3.1 serial executable in serial mode for ISSM." << std::endl;
 > #endif // HAVE_MPI
 > 
@@ -37 +32 @@
 > 
 > 
-1536a1572
+1536a1567
 >   initialized=0; //we run serially all the time!