Commit 4cd9bd52 authored by hrchilds's avatar hrchilds
Browse files

Update from March 3, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@423 18c085ea-50e0-402c-830e-de6fd14e8384
parent 766cc048
......@@ -486,7 +486,7 @@ ExprParser::Parse(const std::string &s)
ParseOneToken(token);
}
}
CATCH (UnhandledReductionException &e)
CATCH2(UnhandledReductionException, e)
{
// This should only occur during debugging; print to cerr anyway
cerr << e.Message() << endl;
......@@ -494,7 +494,7 @@ ExprParser::Parse(const std::string &s)
e.GetPos().PrintErrorText(cerr, text);
CATCH_RETURN2(1, NULL);
}
CATCH (ParseException &e)
CATCH2(ParseException, e)
{
char error[1024];
SNPRINTF(error, 1024, "%s\n%s",
......
......@@ -226,7 +226,7 @@ class TestParser : public Parser
ParseOneToken(token);
}
}
CATCH (UnhandledReductionException &e)
CATCH2(UnhandledReductionException, e)
{
// This should only occur during debugging; print to cerr anyway
cerr << e.Message() << endl;
......@@ -234,13 +234,13 @@ class TestParser : public Parser
cerr << e.GetPos().GetText(input) << endl;
CATCH_RETURN2(1, NULL);
}
CATCH (ParseException &e)
CATCH2(ParseException, e)
{
cerr << e.Message() << endl;
cerr << e.GetPos().GetText(input) << endl;
CATCH_RETURN2(1, NULL);
}
CATCHALL (...)
CATCHALL(...)
{
cerr << "Unknown exception!\n";
CATCH_RETURN2(1, NULL);
......
......@@ -511,6 +511,10 @@ PluginManager::GetPluginList(vector<pair<string,string> > &libs)
// with matches the current version of VisIt. Added code to store
// the appropriate list of errors.
//
// Jeremy Meredith, Thu Mar 3 11:46:05 PST 2005
// Track the missing vs old plugin version separately, because solving
// them correctly requires a different action in each case.
//
// ****************************************************************************
void
......@@ -522,6 +526,7 @@ PluginManager::ReadPluginInfo()
// Keep track of plugin version errors
vector<string> pluginsWithWrongVersion;
vector<string> pluginsWithNoVersion;
// Read the plugin info for each plugin in the libs list.
string ext(PLUGIN_EXTENSION);
......@@ -563,7 +568,12 @@ PluginManager::ReadPluginInfo()
const char **VisItPluginVersion =
(const char**)PluginSymbol("VisItPluginVersion");
bool success;
if (!VisItPluginVersion || strcmp(*VisItPluginVersion, VERSION) != 0)
if (!VisItPluginVersion)
{
pluginsWithNoVersion.push_back(pluginFile);
success = false;
}
else if (strcmp(*VisItPluginVersion, VERSION) != 0)
{
pluginsWithWrongVersion.push_back(pluginFile);
success = false;
......@@ -589,7 +599,7 @@ PluginManager::ReadPluginInfo()
{
pluginInitErrors += "The following plugins were built with an old "
"version of VisIt. Please either rebuild the plugins associated "
"with these files (after running xml2makefile) or delete them:\n";
"with these files or delete them:\n";
for (int i=0; i<pluginsWithWrongVersion.size(); i++)
{
string pluginFile(pluginsWithWrongVersion[i]);
......@@ -605,6 +615,32 @@ PluginManager::ReadPluginInfo()
pluginInitErrors += string(" the ")+pluginPrefix+
" plugin in the directory "+dirname+"\n";
}
pluginInitErrors += "\n";
}
if (pluginsWithNoVersion.size() != 0)
{
pluginInitErrors += "The following plugins are missing version "
"information; this means that their source code was generated "
"with an old version of VisIt. Please either regenerate the "
"plugin info files by running xml2info and rebuild them, or else "
"simply delete them:\n";
for (int i=0; i<pluginsWithNoVersion.size(); i++)
{
string pluginFile(pluginsWithNoVersion[i]);
string ext(PLUGIN_EXTENSION);
int slashPos = pluginFile.rfind("/");
string dirname = pluginFile.substr(0, slashPos);
int suffixLen = (pluginFile.find("_ser") != -1 ||
pluginFile.find("_par") != -1) ? 4 : 0;
int len = pluginFile.size() - slashPos - suffixLen - 5 -
managerName.size() - ext.size();
string pluginPrefix(pluginFile.substr(slashPos + 5, len));
pluginInitErrors += string(" the ")+pluginPrefix+
" plugin in the directory "+dirname+"\n";
}
pluginInitErrors += "\n";
}
}
......
......@@ -78,6 +78,10 @@ avtDatasetQuery::~avtDatasetQuery()
// Test for empty data tree after ApplyFilters, and submit an error
// message.
//
// Kathleen Bonnell, Thu Mar 3 16:38:16 PST 2005
// Ensure all procs Execute, even if they have empty trees (a valid state
// when in parallel and more processors than domains.)
//
// ****************************************************************************
void
......@@ -98,33 +102,27 @@ avtDatasetQuery::PerformQuery(QueryAttributes *qA)
//
SetTypedInput(dob);
avtDataTree_p tree = GetInputDataTree();
bool validInputTree = false;
// No need to process an empty tree.
int validInputTree = 0;
if (!tree->IsEmpty())
{
totalNodes = tree->GetNumberOfLeaves();
PreExecute();
Execute(tree);
PostExecute();
validInputTree = true;
//
// Retrieve the query results and set the message in the atts.
//
queryAtts.SetResultsMessage(resMsg);
queryAtts.SetResultsValue(resValue);
validInputTree = 1;
}
else
else
{
// An empty tree at this point is the sign that something bad has
// happened during the 'update' cycle called by ApplyFilters.
// Set the flag to false -- use OR, becuase for QueryOverTime,
// We only want to send the InternalError message if all time steps
// encountered empty trees.
validInputTree != false;
debug4 << "Query encountered EMPTY InputDataTree after ApplyFilters!!"
<< endl;
validInputTree |= 0;
debug4 << "Query encountered EMPTY InputDataTree after ApplyFilters. "
<< "This may be a valid state if running parallel and there "
<< "are more processors than domains." << endl;
}
totalNodes = tree->GetNumberOfLeaves();
PreExecute();
Execute(tree);
PostExecute();
validInputTree = UnifyMaximumValue(validInputTree);
if (validInputTree)
{
//
......
......@@ -47,6 +47,6 @@ PYVERSION=python2.1
##
## Silo
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.4.1/ARCH/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.4.1/ARCH/lib
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.4.2/ARCH/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.4.2/ARCH/lib
......@@ -80,5 +80,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/chaos_2_ia32_elan3/lib
......@@ -80,5 +80,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/chaos_2_ia32_elan3/lib
......@@ -100,8 +100,8 @@ MILI_DIR=/usr/gapps/visit/mili/current/aix_5_ll
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/aix_5_ll/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/aix_5_ll/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/aix_5_ll/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/aix_5_ll/lib
##
## ViSUS
......
......@@ -69,5 +69,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/redhat_7_ia32/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/redhat_7_ia32/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/redhat_7_ia32/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/redhat_7_ia32/lib
......@@ -73,5 +73,5 @@ DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.0/linux_redhat_gcc_3.2.3/lib
##
## Silo
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.4.1/linux_redhat_gcc_3.2.3/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.4.1/linux_redhat_gcc_3.2.3/lib
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.4.2/linux_redhat_gcc_3.2.3/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.4.2/linux_redhat_gcc_3.2.3/lib
......@@ -74,5 +74,5 @@ MILI_DIR=/usr/gapps/visit/mili/1.06/irix64_cc_7.3.1.2_64
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/irix_6.5_64/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/irix_6.5_64/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/irix_6.5_64/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/irix_6.5_64/lib
......@@ -87,5 +87,5 @@ DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/lib
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/linux_rhel3_gcc_3.2.3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/linux_rhel3_gcc_3.2.3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/linux_rhel3_gcc_3.2.3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/linux_rhel3_gcc_3.2.3/lib
......@@ -80,5 +80,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/chaos_2_ia32_elan3/lib
......@@ -80,5 +80,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/chaos_2_ia32_elan3/lib
......@@ -87,5 +87,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/redhat_7_ia32/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/redhat_7_ia32/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/redhat_7_ia32/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/redhat_7_ia32/lib
......@@ -87,5 +87,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/tru64_5
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/tru64_5/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/tru64_5/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/tru64_5/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/tru64_5/lib
......@@ -87,5 +87,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/tru64_5
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/tru64_5/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/tru64_5/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/tru64_5/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/tru64_5/lib
......@@ -87,5 +87,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/tru64_5
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/tru64_5/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/tru64_5/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/tru64_5/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/tru64_5/lib
......@@ -87,5 +87,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/tru64_5
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/tru64_5/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/tru64_5/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/tru64_5/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/tru64_5/lib
......@@ -75,5 +75,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/redhat_7_ia32/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/redhat_7_ia32/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2/redhat_7_ia32/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2/redhat_7_ia32/lib
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