Commit a3b2e729 authored by fogal1's avatar fogal1
Browse files

Merge from 1.12RC.

Fixes:
  * a compile error in the VLI database,
  * a minor bug in printing filenames along an error path,
  * a parallel deadlock in special circumstances.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7171 18c085ea-50e0-402c-830e-de6fd14e8384
parent 61746c6e
...@@ -454,6 +454,9 @@ avtGenericDatabase::SetCycleTimeInDatabaseMetaData(avtDatabaseMetaData *md, int ...@@ -454,6 +454,9 @@ avtGenericDatabase::SetCycleTimeInDatabaseMetaData(avtDatabaseMetaData *md, int
// Hank Childs, Tue Jan 20 16:33:40 CST 2009 // Hank Childs, Tue Jan 20 16:33:40 CST 2009
// Add a stage for "waiting for all processors to finish I/O". // Add a stage for "waiting for all processors to finish I/O".
// //
// Tom Fogal, Sun May 3 19:50:37 MDT 2009
// Don't do any ghost calculations when there are no domains.
//
// **************************************************************************** // ****************************************************************************
avtDataTree_p avtDataTree_p
...@@ -737,11 +740,11 @@ avtGenericDatabase::GetOutput(avtDataRequest_p spec, ...@@ -737,11 +740,11 @@ avtGenericDatabase::GetOutput(avtDataRequest_p spec,
// //
// Apply ghosting when domains nest within other domains (AMR meshes) // Apply ghosting when domains nest within other domains (AMR meshes)
// //
if (!alreadyDidNesting) if (!alreadyDidNesting && nDomains > 0)
{ {
int t0 = visitTimer->StartTimer(); int t0 = visitTimer->StartTimer();
ApplyGhostForDomainNesting(datasetCollection, domains, allDomains, spec, ApplyGhostForDomainNesting(datasetCollection, domains, allDomains, spec,
canDoCollectiveCommunication); canDoCollectiveCommunication);
visitTimer->StopTimer(t0, "Doing ghost nesting"); visitTimer->StopTimer(t0, "Doing ghost nesting");
} }
...@@ -759,7 +762,7 @@ avtGenericDatabase::GetOutput(avtDataRequest_p spec, ...@@ -759,7 +762,7 @@ avtGenericDatabase::GetOutput(avtDataRequest_p spec,
if (ghostType != NO_GHOST_DATA) if (ghostType != NO_GHOST_DATA)
ghostDataIsNeeded = true; ghostDataIsNeeded = true;
if (ghostDataIsNeeded && !alreadyDidGhosts) if (ghostDataIsNeeded && !alreadyDidGhosts && nDomains > 0)
{ {
didGhosts = CommunicateGhosts(ghostType, datasetCollection, domains, didGhosts = CommunicateGhosts(ghostType, datasetCollection, domains,
spec, src, allDomains, spec, src, allDomains,
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
// avtNamedSelectionManager.C // // avtNamedSelectionManager.C //
// ************************************************************************* // // ************************************************************************* //
#include <sstream>
#include <avtNamedSelectionManager.h> #include <avtNamedSelectionManager.h>
#include <vtkCellData.h> #include <vtkCellData.h>
...@@ -321,6 +322,9 @@ avtNamedSelectionManager::DeleteNamedSelection(const std::string &name, ...@@ -321,6 +322,9 @@ avtNamedSelectionManager::DeleteNamedSelection(const std::string &name,
// Programmer: Hank Childs // Programmer: Hank Childs
// Creation: January 30, 2009 // Creation: January 30, 2009
// //
// Tom Fogal, Sun May 3 19:21:44 MDT 2009
// Fix string formatting when an exception occurs.
//
// **************************************************************************** // ****************************************************************************
void void
...@@ -330,10 +334,10 @@ avtNamedSelectionManager::LoadNamedSelection(const std::string &name) ...@@ -330,10 +334,10 @@ avtNamedSelectionManager::LoadNamedSelection(const std::string &name)
ifstream ifile(qualName.c_str()); ifstream ifile(qualName.c_str());
if (ifile.fail()) if (ifile.fail())
{ {
char msg[1024]; std::ostringstream msg;
SNPRINTF(msg, 1024, "Unable to load named selection from file %s", msg << "Unable to load named selection from file: '"
qualName.size()); << qualName << "'";
EXCEPTION1(VisItException, msg); EXCEPTION1(VisItException, msg.str().c_str());
} }
int fileType; int fileType;
...@@ -354,10 +358,10 @@ avtNamedSelectionManager::LoadNamedSelection(const std::string &name) ...@@ -354,10 +358,10 @@ avtNamedSelectionManager::LoadNamedSelection(const std::string &name)
} }
else else
{ {
char msg[1024]; std::ostringstream msg;
SNPRINTF(msg, 1024, "Problem reading named selection from file %s", msg << "Problem reading named selection from file: '"
qualName.size()); << qualName << "'";
EXCEPTION1(VisItException, msg); EXCEPTION1(VisItException, msg.str().c_str());
} }
int curSize = selList.size(); int curSize = selList.size();
......
...@@ -65,9 +65,6 @@ ...@@ -65,9 +65,6 @@
#include <avtParallel.h> #include <avtParallel.h>
#ifdef PARALLEL #ifdef PARALLEL
#undef SEEK_SET
#undef SEEK_CUR
#undef SEEK_END
#include <mpi.h> #include <mpi.h>
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment