Commit 2b55c980 authored by hrchilds's avatar hrchilds

Update from March 30, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@209 18c085ea-50e0-402c-830e-de6fd14e8384
parent 59fdfd9f
......@@ -309,6 +309,10 @@ $0 = shift @ARGV;
# Jeremy Meredith, Fri Mar 26 09:21:08 PST 2004
# Changed colons in engineargs to semicolons.
#
# Jeremy Meredith, Tue Mar 30 09:42:51 PST 2004
# I added support for a manual plugin installation destination. Simply
# set the VISITPLUGININST environment variable before running xml2makefile.
#
###############################################################################
......@@ -1050,19 +1054,23 @@ elsif (!grep /$visitprivateplugins/, $ENV{VISITPLUGINDIR})
$ENV{VISITPLUGININSTPUB}="$visitplugins";
$ENV{VISITPLUGININSTPRI}="$visitprivateplugins";
$shouldinstallprivate = $publicversion;
foreach (@plugincategories)
# Only set up the default installation path if needed
if (!defined($ENV{VISITPLUGININST}))
{
$shouldinstallprivate=1 if (! -w "$visitplugins/$_");
}
$shouldinstallprivate = $publicversion;
foreach (@plugincategories)
{
$shouldinstallprivate=1 if (! -w "$visitplugins/$_");
}
if ($shouldinstallprivate)
{
$ENV{VISITPLUGININST}="$visitprivateplugins";
}
else
{
$ENV{VISITPLUGININST}="$visitplugins";
if ($shouldinstallprivate)
{
$ENV{VISITPLUGININST}="$visitprivateplugins";
}
else
{
$ENV{VISITPLUGININST}="$visitplugins";
}
}
# Set required environment variables
......
......@@ -426,6 +426,9 @@ PluginManager::EnablePlugin(const string &id)
// Added code to prevent the same plugin from being in the list multiple
// times.
//
// Jeremy Meredith, Thu Mar 25 14:05:21 PST 2004
// Use only the first plugin with the same name, independent of directory.
//
// ****************************************************************************
void
......@@ -460,7 +463,7 @@ PluginManager::GetPluginList(vector<pair<string,string> > &libs)
// It is a valid library name so add it to the list.
bool found = false;
for(int j = 0; j < libs.size() && !found; ++j)
found = (libs[j] == files[i]);
found = (libs[j].second == files[i].second);
if(!found)
libs.push_back(files[i]);
......
......@@ -10,13 +10,13 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
// ****************************************************************************
EngineList::EngineList() : AttributeSubject("s*i*i*i*")
EngineList::EngineList() : AttributeSubject("s*i*i*i*s*")
{
}
......@@ -29,18 +29,19 @@ EngineList::EngineList() : AttributeSubject("s*i*i*i*")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
// ****************************************************************************
EngineList::EngineList(const EngineList &obj) : AttributeSubject("s*i*i*i*")
EngineList::EngineList(const EngineList &obj) : AttributeSubject("s*i*i*i*s*")
{
engines = obj.engines;
numProcessors = obj.numProcessors;
numNodes = obj.numNodes;
loadBalancing = obj.loadBalancing;
simulationName = obj.simulationName;
SelectAll();
}
......@@ -54,7 +55,7 @@ EngineList::EngineList(const EngineList &obj) : AttributeSubject("s*i*i*i*")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -74,7 +75,7 @@ EngineList::~EngineList()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -87,6 +88,7 @@ EngineList::operator = (const EngineList &obj)
numProcessors = obj.numProcessors;
numNodes = obj.numNodes;
loadBalancing = obj.loadBalancing;
simulationName = obj.simulationName;
SelectAll();
}
......@@ -100,7 +102,7 @@ EngineList::operator = (const EngineList &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -113,7 +115,8 @@ EngineList::operator == (const EngineList &obj) const
return ((engines == obj.engines) &&
(numProcessors == obj.numProcessors) &&
(numNodes == obj.numNodes) &&
(loadBalancing == obj.loadBalancing));
(loadBalancing == obj.loadBalancing) &&
(simulationName == obj.simulationName));
}
// ****************************************************************************
......@@ -125,7 +128,7 @@ EngineList::operator == (const EngineList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -146,7 +149,7 @@ EngineList::operator != (const EngineList &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -167,7 +170,7 @@ EngineList::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -195,7 +198,7 @@ EngineList::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -221,7 +224,7 @@ EngineList::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -248,7 +251,7 @@ EngineList::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -261,6 +264,7 @@ EngineList::SelectAll()
Select(1, (void *)&numProcessors);
Select(2, (void *)&numNodes);
Select(3, (void *)&loadBalancing);
Select(4, (void *)&simulationName);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -276,7 +280,7 @@ EngineList::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -317,6 +321,12 @@ EngineList::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
node->AddNode(new DataNode("loadBalancing", loadBalancing));
}
if(completeSave || !FieldsEqual(4, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("simulationName", simulationName));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
......@@ -336,7 +346,7 @@ EngineList::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -362,6 +372,8 @@ EngineList::SetFromNode(DataNode *parentNode)
SetNumNodes(node->AsIntVector());
if((node = searchNode->GetNode("loadBalancing")) != 0)
SetLoadBalancing(node->AsIntVector());
if((node = searchNode->GetNode("simulationName")) != 0)
SetSimulationName(node->AsStringVector());
}
///////////////////////////////////////////////////////////////////////////////
......@@ -396,6 +408,13 @@ EngineList::SetLoadBalancing(const intVector &loadBalancing_)
Select(3, (void *)&loadBalancing);
}
void
EngineList::SetSimulationName(const stringVector &simulationName_)
{
simulationName = simulationName_;
Select(4, (void *)&simulationName);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -448,6 +467,18 @@ EngineList::GetLoadBalancing()
return loadBalancing;
}
const stringVector &
EngineList::GetSimulationName() const
{
return simulationName;
}
stringVector &
EngineList::GetSimulationName()
{
return simulationName;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -476,6 +507,12 @@ EngineList::SelectLoadBalancing()
Select(3, (void *)&loadBalancing);
}
void
EngineList::SelectSimulationName()
{
Select(4, (void *)&simulationName);
}
///////////////////////////////////////////////////////////////////////////////
// Keyframing methods
///////////////////////////////////////////////////////////////////////////////
......@@ -489,7 +526,7 @@ EngineList::SelectLoadBalancing()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -504,6 +541,7 @@ EngineList::GetFieldName(int index) const
case 1: return "numProcessors";
case 2: return "numNodes";
case 3: return "loadBalancing";
case 4: return "simulationName";
default: return "invalid index";
}
}
......@@ -517,7 +555,7 @@ EngineList::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -532,6 +570,7 @@ EngineList::GetFieldType(int index) const
case 1: return FieldType_intVector;
case 2: return FieldType_intVector;
case 3: return FieldType_intVector;
case 4: return FieldType_stringVector;
default: return FieldType_unknown;
}
}
......@@ -545,7 +584,7 @@ EngineList::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -560,6 +599,7 @@ EngineList::GetFieldTypeName(int index) const
case 1: return "intVector";
case 2: return "intVector";
case 3: return "intVector";
case 4: return "stringVector";
default: return "invalid index";
}
}
......@@ -573,7 +613,7 @@ EngineList::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -606,6 +646,11 @@ EngineList::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (loadBalancing == obj.loadBalancing);
}
break;
case 4:
{ // new scope
retval = (simulationName == obj.simulationName);
}
break;
default: retval = false;
}
......
......@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:05 PDT 2003
// Creation: Thu Mar 25 18:04:03 PST 2004
//
// Modifications:
//
......@@ -41,12 +41,14 @@ public:
void SelectNumProcessors();
void SelectNumNodes();
void SelectLoadBalancing();
void SelectSimulationName();
// Property setting methods
void SetEngines(const stringVector &engines_);
void SetNumProcessors(const intVector &numProcessors_);
void SetNumNodes(const intVector &numNodes_);
void SetLoadBalancing(const intVector &loadBalancing_);
void SetSimulationName(const stringVector &simulationName_);
// Property getting methods
const stringVector &GetEngines() const;
......@@ -57,6 +59,8 @@ public:
intVector &GetNumNodes();
const intVector &GetLoadBalancing() const;
intVector &GetLoadBalancing();
const stringVector &GetSimulationName() const;
stringVector &GetSimulationName();
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -74,6 +78,7 @@ private:
intVector numProcessors;
intVector numNodes;
intVector loadBalancing;
stringVector simulationName;
};
#endif
......@@ -4,4 +4,5 @@
<Field name="numProcessors" type="intVector"></Field>
<Field name="numNodes" type="intVector"></Field>
<Field name="loadBalancing" type="intVector"></Field>
<Field name="simulationName" type="stringVector"></Field>
</Attribute>
......@@ -48,13 +48,13 @@ Plot::StateType_FromString(const std::string &s, Plot::StateType &val)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
// ****************************************************************************
Plot::Plot() : AttributeSubject("iibbbssi*iiiii*i*")
Plot::Plot() : AttributeSubject("iibbbssi*iiiii*i*b")
{
stateType = NewlyCreated;
plotType = 0;
......@@ -67,6 +67,7 @@ Plot::Plot() : AttributeSubject("iibbbssi*iiiii*i*")
id = -1;
beginFrame = -999;
endFrame = 999;
isFromSimulation = false;
}
// ****************************************************************************
......@@ -78,13 +79,13 @@ Plot::Plot() : AttributeSubject("iibbbssi*iiiii*i*")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
// ****************************************************************************
Plot::Plot(const Plot &obj) : AttributeSubject("iibbbssi*iiiii*i*")
Plot::Plot(const Plot &obj) : AttributeSubject("iibbbssi*iiiii*i*b")
{
stateType = obj.stateType;
plotType = obj.plotType;
......@@ -100,6 +101,7 @@ Plot::Plot(const Plot &obj) : AttributeSubject("iibbbssi*iiiii*i*")
endFrame = obj.endFrame;
keyframes = obj.keyframes;
databaseKeyframes = obj.databaseKeyframes;
isFromSimulation = obj.isFromSimulation;
SelectAll();
}
......@@ -113,7 +115,7 @@ Plot::Plot(const Plot &obj) : AttributeSubject("iibbbssi*iiiii*i*")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -133,7 +135,7 @@ Plot::~Plot()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -156,6 +158,7 @@ Plot::operator = (const Plot &obj)
endFrame = obj.endFrame;
keyframes = obj.keyframes;
databaseKeyframes = obj.databaseKeyframes;
isFromSimulation = obj.isFromSimulation;
SelectAll();
}
......@@ -169,7 +172,7 @@ Plot::operator = (const Plot &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -192,7 +195,8 @@ Plot::operator == (const Plot &obj) const
(beginFrame == obj.beginFrame) &&
(endFrame == obj.endFrame) &&
(keyframes == obj.keyframes) &&
(databaseKeyframes == obj.databaseKeyframes));
(databaseKeyframes == obj.databaseKeyframes) &&
(isFromSimulation == obj.isFromSimulation));
}
// ****************************************************************************
......@@ -204,7 +208,7 @@ Plot::operator == (const Plot &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -225,7 +229,7 @@ Plot::operator != (const Plot &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -246,7 +250,7 @@ Plot::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -274,7 +278,7 @@ Plot::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -300,7 +304,7 @@ Plot::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -327,7 +331,7 @@ Plot::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -350,6 +354,7 @@ Plot::SelectAll()
Select(11, (void *)&endFrame);
Select(12, (void *)&keyframes);
Select(13, (void *)&databaseKeyframes);
Select(14, (void *)&isFromSimulation);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -454,6 +459,13 @@ Plot::SetDatabaseKeyframes(const intVector &databaseKeyframes_)
Select(13, (void *)&databaseKeyframes);
}
void
Plot::SetIsFromSimulation(bool isFromSimulation_)
{
isFromSimulation = isFromSimulation_;
Select(14, (void *)&isFromSimulation);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -572,6 +584,12 @@ Plot::GetDatabaseKeyframes()
return databaseKeyframes;
}
bool
Plot::GetIsFromSimulation() const
{
return isFromSimulation;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -619,7 +637,7 @@ Plot::SelectDatabaseKeyframes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -644,6 +662,7 @@ Plot::GetFieldName(int index) const
case 11: return "endFrame";
case 12: return "keyframes";
case 13: return "databaseKeyframes";
case 14: return "isFromSimulation";
default: return "invalid index";
}
}
......@@ -657,7 +676,7 @@ Plot::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -682,6 +701,7 @@ Plot::GetFieldType(int index) const
case 11: return FieldType_int;
case 12: return FieldType_intVector;
case 13: return FieldType_intVector;
case 14: return FieldType_bool;
default: return FieldType_unknown;
}
}
......@@ -695,7 +715,7 @@ Plot::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -720,6 +740,7 @@ Plot::GetFieldTypeName(int index) const
case 11: return "int";
case 12: return "intVector";
case 13: return "intVector";
case 14: return "bool";
default: return "invalid index";
}
}
......@@ -733,7 +754,7 @@ Plot::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -816,6 +837,11 @@ Plot::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (databaseKeyframes == obj.databaseKeyframes);
}
break;
case 14:
{ // new scope
retval = (isFromSimulation == obj.isFromSimulation);
}
break;
default: retval = false;
}
......
......@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:20 PDT 2003
// Creation: Tue Mar 30 12:25:01 PDT 2004
//
// Modifications:
//
......@@ -66,6 +66,7 @@ public:
void SetEndFrame(int endFrame_);
void SetKeyframes(const intVector &keyframes_);
void SetDatabaseKeyframes(const intVector &databaseKeyframes_);
void SetIsFromSimulation(bool isFromSimulation_);
// Property getting methods
StateType GetStateType() const;
......@@ -87,6 +88,7 @@ public:
intVector &GetKeyframes();
const intVector &GetDatabaseKeyframes() const;
intVector &GetDatabaseKeyframes();
bool GetIsFromSimulation() const;
// Enum conversion functions
static std::string StateType_ToString(StateType);
......@@ -122,6 +124,7 @@ private:
int endFrame;
intVector keyframes;
intVector databaseKeyframes;
bool isFromSimulation;
};
#endif
......@@ -20,6 +20,7 @@
<Field name="endFrame" type="int">999</Field>
<Field name="keyframes" type="intVector"></Field>
<Field name="databaseKeyframes" type="intVector"></Field>
<Field name="isFromSimulation" type="bool">false</Field>
<Function name="AddOperator" user="true" member="true"></Function>
<Function name="ClearAllOperators" user="true" member="true"></Function>
<Function name="GetNumOperators" user="true" member="true"></Function>
......
......@@ -3076,10 +3076,13 @@ avtDefaultPlotMetaData::Print(ostream &out, int indent) const
// Hank Childs, Fri Mar 5 11:21:06 PST 2004
// Added 's' for fileFormat.
//
// Jeremy Meredith, Tue Mar 30 09:53:19 PST 2004
// Added simulation information.
//
// ****************************************************************************
avtDatabaseMetaData::avtDatabaseMetaData()
: AttributeSubject("ssbddibss*i*i*i*d*a*a*a*a*a*a*a*a*a*aba*")
: AttributeSubject("ssbddibss*i*i*i*d*a*a*a*a*a*a*a*a*a*aba*bsi")
{
hasTemporalExtents = false;
minTemporalExtents = 0.;
......@@ -3087,6 +3090,9 @@ avtDatabaseMetaData::avtDatabaseMetaData()
numStates = 0;
isVirtualDatabase = false;
mustRepopulateOnStateChange = false;
isSimulation = false;
simHost = "";
simPort = 0;
}
......@@ -3131,10 +3137,13 @@ avtDatabaseMetaData::avtDatabaseMetaData()
// Hank Childs, Fri Mar 5 11:21:06 PST 2004
// Copy over file format.
//
// Jeremy Meredith, Tue Mar 30 09:53:19 PST 2004
// Added simulation information.
//
// ****************************************************************************
avtDatabaseMetaData::avtDatabaseMetaData(const avtDatabaseMetaData &rhs)
: AttributeSubject("ssbddibss*i*i*i*d*a*a*a*a*a*a*a*a*a*aba*")
: AttributeSubject("ssbddibss*i*i*i*d*a*a*a*a*a*a*a*a*a*aba*bsi")
{
databaseName = rhs.databaseName;
fileFormat = rhs.fileFormat;
......@@ -3151,6 +3160,9 @@ avtDatabaseMetaData::avtDatabaseMetaData(const avtDatabaseMetaData &rhs)
timesAreAccurate = rhs.timesAreAccurate;
times = rhs.times;
exprList = rhs.exprList;
isSimulation = rhs.isSimulation;
simHost = rhs.simHost;
simPort = rhs.simPort;
int i;
for (i=0; i<rhs.meshes.size(); i++)
......@@ -3218,6 +3230,9 @@ avtDatabaseMetaData::avtDatabaseMetaData(const avtDatabaseMetaData &rhs)
// Hank Childs, Fri Mar 5 11:21:06 PST 2004
// Copy over file format.
//
// Jeremy Meredith, Tue Mar 30 09:53:19 PST 2004