Commit 47d3ca1a authored by hrchilds's avatar hrchilds
Browse files

Update from March 17, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@199 18c085ea-50e0-402c-830e-de6fd14e8384
parent 95432d8d
......@@ -190,6 +190,7 @@ then
./visit-install -private -a -c closed -g visit -gw -l $ver sunos5 /usr/gapps/visit > installlog 2>&1
else
./visit-install -private -c closed -g visit -gw -l $ver sunos5 /usr/gapps/visit > installlog 2>&1
fi
rm -f resultlog
echo " install of visit on sunset" > resultlog 2>&1
echo " ----------------------------" >> resultlog 2>&1
......
......@@ -51,13 +51,13 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*")
PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*")
{
variables.push_back("default");
displayIncidentElements = true;
......@@ -109,13 +109,13 @@ PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFF
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*")
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*")
{
AttributeGroupVector::const_iterator pos;
int i;
......@@ -187,6 +187,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
varInfo.push_back(newPickVarInfo);
}
invalidVars = obj.invalidVars;
SelectAll();
}
......@@ -200,7 +201,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -224,7 +225,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -303,6 +304,7 @@ PickAttributes::operator = (const PickAttributes &obj)
varInfo.push_back(newPickVarInfo);
}
invalidVars = obj.invalidVars;
SelectAll();
}
......@@ -316,7 +318,7 @@ PickAttributes::operator = (const PickAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -402,7 +404,8 @@ PickAttributes::operator == (const PickAttributes &obj) const
(dzoneCoords == obj.dzoneCoords) &&
(bzoneCoords == obj.bzoneCoords) &&
(needTransformMessage == obj.needTransformMessage) &&
varInfo_equal);
varInfo_equal &&
(invalidVars == obj.invalidVars));
}
// ****************************************************************************
......@@ -414,7 +417,7 @@ PickAttributes::operator == (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -435,7 +438,7 @@ PickAttributes::operator != (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -456,7 +459,7 @@ PickAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -484,7 +487,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -510,7 +513,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -537,7 +540,7 @@ PickAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -582,6 +585,7 @@ PickAttributes::SelectAll()
Select(33, (void *)&bzoneCoords);
Select(34, (void *)&needTransformMessage);
Select(35, (void *)&varInfo);
Select(36, (void *)&invalidVars);
}
// ****************************************************************************
......@@ -593,7 +597,7 @@ PickAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1004,6 +1008,13 @@ PickAttributes::SetNeedTransformMessage(bool needTransformMessage_)
Select(34, (void *)&needTransformMessage);
}
void
PickAttributes::SetInvalidVars(const stringVector &invalidVars_)
{
invalidVars = invalidVars_;
Select(36, (void *)&invalidVars);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1338,6 +1349,18 @@ PickAttributes::GetVarInfo()
return varInfo;
}
const stringVector &
PickAttributes::GetInvalidVars() const
{
return invalidVars;
}
stringVector &
PickAttributes::GetInvalidVars()
{
return invalidVars;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1456,6 +1479,12 @@ PickAttributes::SelectVarInfo()
Select(35, (void *)&varInfo);
}
void
PickAttributes::SelectInvalidVars()
{
Select(36, (void *)&invalidVars);
}
///////////////////////////////////////////////////////////////////////////////
// AttributeGroupVector convenience methods.
///////////////////////////////////////////////////////////////////////////////
......@@ -1469,7 +1498,7 @@ PickAttributes::SelectVarInfo()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1494,7 +1523,7 @@ PickAttributes::AddPickVarInfo(const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1522,7 +1551,7 @@ PickAttributes::ClearPickVarInfos()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1557,7 +1586,7 @@ PickAttributes::RemovePickVarInfo(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1578,7 +1607,7 @@ PickAttributes::GetNumPickVarInfos() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1599,7 +1628,7 @@ PickAttributes::GetPickVarInfo(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1620,7 +1649,7 @@ PickAttributes::GetPickVarInfo(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1641,7 +1670,7 @@ PickAttributes::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1666,7 +1695,7 @@ PickAttributes::operator [] (int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1713,6 +1742,7 @@ PickAttributes::GetFieldName(int index) const
case 33: return "bzoneCoords";
case 34: return "needTransformMessage";
case 35: return "varInfo";
case 36: return "invalidVars";
default: return "invalid index";
}
}
......@@ -1726,7 +1756,7 @@ PickAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1773,6 +1803,7 @@ PickAttributes::GetFieldType(int index) const
case 33: return FieldType_stringVector;
case 34: return FieldType_bool;
case 35: return FieldType_attVector;
case 36: return FieldType_stringVector;
default: return FieldType_unknown;
}
}
......@@ -1786,7 +1817,7 @@ PickAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -1833,6 +1864,7 @@ PickAttributes::GetFieldTypeName(int index) const
case 33: return "stringVector";
case 34: return "bool";
case 35: return "attVector";
case 36: return "stringVector";
default: return "invalid index";
}
}
......@@ -1846,7 +1878,7 @@ PickAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:47 PST 2004
//
// Modifications:
//
......@@ -2080,6 +2112,11 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = varInfo_equal;
}
break;
case 36:
{ // new scope
retval = (invalidVars == obj.invalidVars);
}
break;
default: retval = false;
}
......@@ -2285,6 +2322,9 @@ PickAttributes::PrintSelf(ostream &os)
// Kathleen Bonnell, Wed Dec 17 15:19:46 PST 2003
// Support multiple types of coordinates.
//
// Kathleen Bonnell, Tue Mar 16 16:02:05 PST 2004
// Create message regarding invalid variables.
//
// ****************************************************************************
void
PickAttributes::CreateOutputString(std::string &os, bool withLetter)
......@@ -2505,6 +2545,15 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
os += iv;
os += "\n";
}
if (invalidVars.size() > 0)
{
os += "The following variables are invalid, and Pick ignored them:\n";
for (i = 0; i < invalidVars.size(); i++)
{
os += " " + invalidVars[i];
}
os += "\n";
}
}
// ****************************************************************************
......@@ -2530,6 +2579,9 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
// Kathleen Bonnell, Wed Dec 17 15:19:46 PST 2003
// Support new types of coordinates.
//
// Kathleen Bonnell, Tue Mar 16 16:02:05 PST 2004
// Clear invalidVars.
//
// ****************************************************************************
void
......@@ -2572,5 +2624,8 @@ PickAttributes::PrepareForNewPick()
plotBounds[i] = 0.;
ClearPickVarInfos();
if (!invalidVars.empty())
invalidVars.clear();
}
......@@ -199,6 +199,9 @@ Definition:
// Kathleen Bonnell, Wed Dec 17 15:19:46 PST 2003
// Support multiple types of coordinates.
//
// Kathleen Bonnell, Tue Mar 16 16:02:05 PST 2004
// Create message regarding invalid variables.
//
// ****************************************************************************
void
PickAttributes::CreateOutputString(std::string &os, bool withLetter)
......@@ -419,6 +422,15 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
os += iv;
os += "\n";
}
if (invalidVars.size() > 0)
{
os += "The following variables are invalid, and Pick ignored them:\n";
for (i = 0; i < invalidVars.size(); i++)
{
os += " " + invalidVars[i];
}
os += "\n";
}
}
Function: PrepareForNewPick
......@@ -447,6 +459,9 @@ Definition:
// Kathleen Bonnell, Wed Dec 17 15:19:46 PST 2003
// Support new types of coordinates.
//
// Kathleen Bonnell, Tue Mar 16 16:02:05 PST 2004
// Clear invalidVars.
//
// ****************************************************************************
void
......@@ -489,6 +504,9 @@ PickAttributes::PrepareForNewPick()
plotBounds[i] = 0.;
ClearPickVarInfos();
if (!invalidVars.empty())
invalidVars.clear();
}
Function: SetFromNode
......
......@@ -15,7 +15,7 @@ class PickVarInfo;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:29:50 PDT 2003
// Creation: Tue Mar 16 16:08:46 PST 2004
//
// Modifications:
//
......@@ -66,6 +66,7 @@ public:
void SelectDzoneCoords();
void SelectBzoneCoords();
void SelectVarInfo();
void SelectInvalidVars();
// Property setting methods
void SetVariables(const stringVector &variables_);
......@@ -104,6 +105,7 @@ public:
void SetBzoneCoords(const stringVector &bzoneCoords_);
void SetNeedTransformMessage(bool needTransformMessage_);
void SetVarInfo(const AttributeGroupVector &varInfo_);
void SetInvalidVars(const stringVector &invalidVars_);
// Property getting methods
const stringVector &GetVariables() const;
......@@ -161,6 +163,8 @@ public:
bool GetNeedTransformMessage() const;
const AttributeGroupVector &GetVarInfo() const;
AttributeGroupVector &GetVarInfo();
const stringVector &GetInvalidVars() const;
stringVector &GetInvalidVars();
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -234,6 +238,7 @@ private:
stringVector bzoneCoords;
bool needTransformMessage;
AttributeGroupVector varInfo;
stringVector invalidVars;
};
#endif
......@@ -117,6 +117,8 @@
</Field>
<Field name="varInfo" label="varInfo" type="attVector" subtype="PickVarInfo" internal="true">
</Field>
<Field name="invalidVars" label="invalidVars" type="stringVector" internal="true">
</Field>
<Function name="PrintSelf" user="true" member="true">
</Function>
<Function name="CreateOutputString" user="true" member="true">
......
......@@ -1292,6 +1292,10 @@ avtSILRestriction::GetLeafSets(int ind, vector<int> &leaves)
// Added better support for creating a compatible SIL when the two SILs
// are not identical in structure -- mainly for time-varying SILs
//
// Mark C. Miller, Tue Mar 16 18:23:11 PST 2004
// Added code to test top-set names and return false if we think the SILs
// are for totally different meshes
//
// ****************************************************************************
bool
......@@ -1302,6 +1306,14 @@ avtSILRestriction::SetFromCompatibleRestriction(avtSILRestriction_p silr)
vector<int> leaves;
vector<int> otherLeaves;
//
// if we think these are different meshes, do nothing & return false
//
string topName = GetSILSet(GetTopSet())->GetName();
string otherTopName = silr->GetSILSet(silr->GetTopSet())->GetName();
if (topName != otherTopName)
return false;
//
// Get the leaf sets for each SIL restriction.
//
......
......@@ -254,7 +254,7 @@ avtDatabase::PopulateDataObjectInformation(avtDataObject_p &dob,
int ts,
avtDataSpecification *spec)
{
int i, j;
int i;
int timerHandle = visitTimer->StartTimer();
......@@ -558,7 +558,7 @@ avtDatabase::GetNewMetaData(int timeState)
if (! OnlyServeUpMetaData())
{
PopulateIOInformation(ioInfo);
PopulateIOInformation(timeState, ioInfo);
gotIOInfo = true;
}
......@@ -852,28 +852,6 @@ avtDatabase::FreeUpResources(void)
;
}
// ****************************************************************************
// Method: avtDatabase::PopulateIOInformation
//
// Purpose:
// This is defined so the derived types don't have to. It should
// populate the "I/O Hints", which allows domains that should be processed
// on the same processor to be groups together when the load balancing
// occurs.
//
// Programmer: Hank Childs
// Creation: May 11, 2001
//
// ****************************************************************************
void
avtDatabase::PopulateIOInformation(avtIOInformation &)
{
;
}
// ****************************************************************************
// Method: avtDatabase::GetIOInformation
//
......@@ -883,20 +861,17 @@ avtDatabase::PopulateIOInformation(avtIOInformation &)
// Programmer: Hank Childs
// Creation: August 31, 2001
//
// Modifications:
// Mark C. Miller, Tue Mar 16 14:49:26 PST 2004
// Made it call PopulateIOInformation directly
//
// ****************************************************************************
const avtIOInformation &
avtDatabase::GetIOInformation(void)
avtDatabase::GetIOInformation(int stateIndex)
{
if (!gotIOInfo)
{
//
// Getting the meta-data will force the I/O information to be read in.
// It also does the correct preconditions so that getting the I/O info
// will be meaningful. We assume this info does not change with time
//
GetMetaData(0);
}
PopulateIOInformation(stateIndex, ioInfo);
return ioInfo;
}
......@@ -1077,6 +1052,9 @@ avtDatabase::GetFileListFromTextFile(const char *textfile,
// Kathleen Bonnell, Mon Mar 8 15:34:13 PST 2004
// Allow vars that already have info to be skipped.
//
// Kathleen Bonnell, Tue Mar 16 15:55:18 PST 2004
// Don't remove any pickVarInfo's, let Pick handle that.
//
// ****************************************************************************
void
......@@ -1165,7 +1143,6 @@ avtDatabase::Query(PickAttributes *pa)
QueryMesh(pa->GetActiveVariable(), ts, foundDomain, meshInfo);
pa->SetMeshInfo(meshInfo);
intVector removeMe;
for (int varNum = 0; varNum < userVars.size(); varNum++)
{
vName = userVars[varNum];
......@@ -1223,7 +1200,8 @@ avtDatabase::Query(PickAttributes *pa)
pa->GetPickVarInfo(varNum).SetVariableType("species");
break;
case AVT_MESH :
removeMe.push_back(varNum);
if (!pa->GetPickVarInfo(varNum).HasInfo())
pa->GetPickVarInfo(varNum).SetVariableType("mesh");
break;
default :
break;
......@@ -1239,17 +1217,7 @@ avtDatabase::Query(PickAttributes *pa)
ENDTRY
}
//
// Remove any PickVarInfos (genenerally for vars whose type is AVT_MESH)
//
if (removeMe.size() > 0)
{
for (int i = removeMe.size() -1; i >= 0; --i)
pa->RemovePickVarInfo(removeMe[i]);
}
const char *fname = GetFilename(ts);
pa->SetDatabaseName(fname);
}
......@@ -154,6 +154,13 @@ typedef struct {
// Added virtual GetDomainName, defined here so derived types don't
// have to.
//
// Mark C. Miller, Tue Mar 16 09:38:19 PST 2004
// Added ActivateTimestep method
//
// Mark C. Miller, Tue Mar 16 14:40:19 PST 2004
// Added stateIndex argument to GetIOInformation.
// Implemented PopulateIOInformation here instead of in file
//
// ****************************************************************************
class DATABASE_API avtDatabase
......@@ -173,6 +180,10 @@ class DATABASE_API avtDatabase