Commit d75ac756 authored by hrchilds's avatar hrchilds
Browse files

Update from September 23, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@329 18c085ea-50e0-402c-830e-de6fd14e8384
parent a0f38151
......@@ -68,6 +68,13 @@
# I changed the default for append to be true, and replaced the -a
# option with -r to make it false.
#
# Eric Brugger, Thu Sep 23 13:41:22 PDT 2004
# I corrected a bug where the usage logging flag in the visit script
# doesn't get set when logging is enabled. The sed command that made
# the substitution assumed a certain number of spaces in the line,
# which changed on a recent update. The current sed command is more
# forgiving of extra whitespace.
#
#-----------------------------------------------------------------------
set Compress = COMPRESS
......@@ -237,7 +244,7 @@ endif
if ($logging == false) then
cp distribution/visit/bin/visit $dir/bin/visit+
else
sed -e "s/logging = 0/logging = 1/" distribution/visit/bin/visit > $dir/bin/visit+
sed -e "s/logging[ \t]*= 0/logging = 1/" distribution/visit/bin/visit > $dir/bin/visit+
endif
if (-e $dir/$version+) rm -rf $dir/$version+
......
......@@ -52,13 +52,13 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbss")
PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bb")
{
variables.push_back("default");
displayIncidentElements = true;
......@@ -106,6 +106,8 @@ PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFF
conciseOutput = false;
showTimeStep = true;
showMeshName = true;
includeGhosts = false;
elementIsGhost = false;
}
// ****************************************************************************
......@@ -117,13 +119,13 @@ PickAttributes::PickAttributes() : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFF
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbss")
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*bbbbbbbbbsbiiii*iissFFFFFFsii*s*s*s*s*s*ba*s*bsbbbbbbssi*bb")
{
AttributeGroupVector::const_iterator pos;
int i;
......@@ -206,6 +208,9 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
showMeshName = obj.showMeshName;
blockPieceName = obj.blockPieceName;
groupPieceName = obj.groupPieceName;
ghosts = obj.ghosts;
includeGhosts = obj.includeGhosts;
elementIsGhost = obj.elementIsGhost;
SelectAll();
}
......@@ -219,7 +224,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("s*
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -243,7 +248,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -333,6 +338,9 @@ PickAttributes::operator = (const PickAttributes &obj)
showMeshName = obj.showMeshName;
blockPieceName = obj.blockPieceName;
groupPieceName = obj.groupPieceName;
ghosts = obj.ghosts;
includeGhosts = obj.includeGhosts;
elementIsGhost = obj.elementIsGhost;
SelectAll();
}
......@@ -346,7 +354,7 @@ PickAttributes::operator = (const PickAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -443,7 +451,10 @@ PickAttributes::operator == (const PickAttributes &obj) const
(showTimeStep == obj.showTimeStep) &&
(showMeshName == obj.showMeshName) &&
(blockPieceName == obj.blockPieceName) &&
(groupPieceName == obj.groupPieceName));
(groupPieceName == obj.groupPieceName) &&
(ghosts == obj.ghosts) &&
(includeGhosts == obj.includeGhosts) &&
(elementIsGhost == obj.elementIsGhost));
}
// ****************************************************************************
......@@ -455,7 +466,7 @@ PickAttributes::operator == (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -476,7 +487,7 @@ PickAttributes::operator != (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -497,7 +508,7 @@ PickAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -525,7 +536,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -551,7 +562,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -578,7 +589,7 @@ PickAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -634,6 +645,9 @@ PickAttributes::SelectAll()
Select(44, (void *)&showMeshName);
Select(45, (void *)&blockPieceName);
Select(46, (void *)&groupPieceName);
Select(47, (void *)&ghosts);
Select(48, (void *)&includeGhosts);
Select(49, (void *)&elementIsGhost);
}
// ****************************************************************************
......@@ -645,7 +659,7 @@ PickAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1176,6 +1190,27 @@ PickAttributes::SetGroupPieceName(const std::string &groupPieceName_)
Select(46, (void *)&groupPieceName);
}
void
PickAttributes::SetGhosts(const intVector &ghosts_)
{
ghosts = ghosts_;
Select(47, (void *)&ghosts);
}
void
PickAttributes::SetIncludeGhosts(bool includeGhosts_)
{
includeGhosts = includeGhosts_;
Select(48, (void *)&includeGhosts);
}
void
PickAttributes::SetElementIsGhost(bool elementIsGhost_)
{
elementIsGhost = elementIsGhost_;
Select(49, (void *)&elementIsGhost);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1600,6 +1635,30 @@ PickAttributes::GetGroupPieceName()
return groupPieceName;
}
const intVector &
PickAttributes::GetGhosts() const
{
return ghosts;
}
intVector &
PickAttributes::GetGhosts()
{
return ghosts;
}
bool
PickAttributes::GetIncludeGhosts() const
{
return includeGhosts;
}
bool
PickAttributes::GetElementIsGhost() const
{
return elementIsGhost;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1742,6 +1801,12 @@ PickAttributes::SelectGroupPieceName()
Select(46, (void *)&groupPieceName);
}
void
PickAttributes::SelectGhosts()
{
Select(47, (void *)&ghosts);
}
///////////////////////////////////////////////////////////////////////////////
// AttributeGroupVector convenience methods.
///////////////////////////////////////////////////////////////////////////////
......@@ -1755,7 +1820,7 @@ PickAttributes::SelectGroupPieceName()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1780,7 +1845,7 @@ PickAttributes::AddPickVarInfo(const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1808,7 +1873,7 @@ PickAttributes::ClearPickVarInfos()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1843,7 +1908,7 @@ PickAttributes::RemovePickVarInfo(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1864,7 +1929,7 @@ PickAttributes::GetNumPickVarInfos() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1885,7 +1950,7 @@ PickAttributes::GetPickVarInfo(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1906,7 +1971,7 @@ PickAttributes::GetPickVarInfo(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1927,7 +1992,7 @@ PickAttributes::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -1952,7 +2017,7 @@ PickAttributes::operator [] (int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -2010,6 +2075,9 @@ PickAttributes::GetFieldName(int index) const
case 44: return "showMeshName";
case 45: return "blockPieceName";
case 46: return "groupPieceName";
case 47: return "ghosts";
case 48: return "includeGhosts";
case 49: return "elementIsGhost";
default: return "invalid index";
}
}
......@@ -2023,7 +2091,7 @@ PickAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -2081,6 +2149,9 @@ PickAttributes::GetFieldType(int index) const
case 44: return FieldType_bool;
case 45: return FieldType_string;
case 46: return FieldType_string;
case 47: return FieldType_intVector;
case 48: return FieldType_bool;
case 49: return FieldType_bool;
default: return FieldType_unknown;
}
}
......@@ -2094,7 +2165,7 @@ PickAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -2152,6 +2223,9 @@ PickAttributes::GetFieldTypeName(int index) const
case 44: return "bool";
case 45: return "string";
case 46: return "string";
case 47: return "intVector";
case 48: return "bool";
case 49: return "bool";
default: return "invalid index";
}
}
......@@ -2165,7 +2239,7 @@ PickAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Aug 24 20:06:17 PST 2004
// Creation: Thu Sep 23 09:46:21 PDT 2004
//
// Modifications:
//
......@@ -2454,6 +2528,21 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (groupPieceName == obj.groupPieceName);
}
break;
case 47:
{ // new scope
retval = (ghosts == obj.ghosts);
}
break;
case 48:
{ // new scope
retval = (includeGhosts == obj.includeGhosts);
}
break;
case 49:
{ // new scope
retval = (elementIsGhost == obj.elementIsGhost);
}
break;
default: retval = false;
}
......@@ -2493,9 +2582,6 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
// Kathleen Bonnell, Wed Jun 9 12:24:09 PDT 2004
// Add conciseOutput.
//
// Mark C. Miller, Tue Aug 24 19:53:18 PDT 2004
// Added block/group piece names
//
// ****************************************************************************
void
PickAttributes::PrintSelf(ostream &os)
......@@ -2562,7 +2648,12 @@ PickAttributes::PrintSelf(ostream &os)
{
os << "Zone " ;
if (showZoneId)
os<< elementNumber << " ";
{
if (!elementIsGhost)
os<< elementNumber << " ";
else
os<< elementNumber << "(ghost) ";
}
if (showZoneDomainLogicalCoords && !dzoneCoords.empty())
{
os << "d" << dzoneCoords[0].c_str();
......@@ -2577,7 +2668,12 @@ PickAttributes::PrintSelf(ostream &os)
{
os << "Node ";
if (showNodeId)
os << elementNumber << " ";
{
if (!elementIsGhost)
os << elementNumber << " ";
else
os << elementNumber << "(ghost) ";
}
if (showNodePhysicalCoords && !pnodeCoords.empty())
{
os << pnodeCoords[0].c_str() ;
......@@ -2608,7 +2704,12 @@ PickAttributes::PrintSelf(ostream &os)
for (i = 0; i < incidentElements.size(); i++)
{
if (showId)
os << incidentElements[i] << " ";
{
if (ghosts.size() > 0 && ghosts[i])
os << incidentElements[i] << "(ghost) ";
else
os << incidentElements[i] << " ";
}
if (pickType == Zone || pickType == DomainZone)
{
if (showNodePhysicalCoords && !pnodeCoords.empty())
......@@ -2682,6 +2783,9 @@ PickAttributes::PrintSelf(ostream &os)
//
// Kathleen Bonnell, Wed Jun 9 12:24:09 PDT 2004
// Added 'showTimeStep'.
//
// Mark C. Miller, Tue Aug 24 19:53:18 PDT 2004
// Added block/group piece names
//
// ****************************************************************************
void
......@@ -2797,7 +2901,10 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
os += "Zone: ";
if (showZoneId)
{
SNPRINTF(buff, 512, "%d", elementNumber);
if (!elementIsGhost)
SNPRINTF(buff, 512, "%d", elementNumber);
else
SNPRINTF(buff, 512, "%d(ghost)", elementNumber);
os += buff;
}
if (showZoneDomainLogicalCoords & !dzoneCoords.empty())
......@@ -2819,7 +2926,10 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
os += "Node: ";
if (showNodeId)
{
SNPRINTF(buff, 512, "%d", elementNumber);
if (!elementIsGhost)
SNPRINTF(buff, 512, "%d", elementNumber);
else
SNPRINTF(buff, 512, "%d(ghost)", elementNumber);
os += buff;
}
if (showNodePhysicalCoords & !pnodeCoords.empty())
......@@ -2866,7 +2976,10 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
{
if (showId)
{
SNPRINTF(buff, 512, "%d ", incidentElements[i]);
if (ghosts.size() > 0 && ghosts[i])
SNPRINTF(buff, 512, "%d(ghost) ", incidentElements[i]);
else
SNPRINTF(buff, 512, "%d ", incidentElements[i]);
os += buff;
}
if (pickType == Zone || pickType == DomainZone)
......@@ -3021,6 +3134,12 @@ PickAttributes::PrepareForNewPick()
blockPieceName = "";
groupPieceName = "";
if (!ghosts.empty())
ghosts.clear();
includeGhosts = false;
elementIsGhost = false;
}
// ****************************************************************************
......@@ -3034,6 +3153,9 @@ PickAttributes::PrepareForNewPick()
// Creation: June 9, 2004
//
// Modifications:
//
// Mark C. Miller, Tue Aug 24 19:53:18 PDT 2004
// Added block/group piece names
//
// ****************************************************************************
......@@ -3115,7 +3237,10 @@ PickAttributes::CreateConciseOutputString(std::string &os, bool withLetter)
os += "Zone: ";
if (showZoneId)
{
SNPRINTF(buff, 512, "%d ", elementNumber);
if (!elementIsGhost)
SNPRINTF(buff, 512, "%d ", elementNumber);
else
SNPRINTF(buff, 512, "%d(ghost) ", elementNumber);
os += buff;
}
if (showZoneDomainLogicalCoords & !dzoneCoords.empty())
......@@ -3135,7 +3260,10 @@ PickAttributes::CreateConciseOutputString(std::string &os, bool withLetter)
os += "Node: ";
if (showNodeId)
{
SNPRINTF(buff, 512, "%d ", elementNumber);
if (!elementIsGhost)
SNPRINTF(buff, 512, "%d ", elementNumber);
else
SNPRINTF(buff, 512, "%d(ghost) ", elementNumber);
os += buff;
}
if (showNodePhysicalCoords & !pnodeCoords.empty())
......@@ -3172,7 +3300,10 @@ PickAttributes::CreateConciseOutputString(std::string &os, bool withLetter)
{
if (showId)
{
SNPRINTF(buff, 512, "%d ", incidentElements[i]);
if (ghosts.size() > 0 && ghosts[i])
SNPRINTF(buff, 512, "%d(ghost) ", incidentElements[i]);
else
SNPRINTF(buff, 512, "%d ", incidentElements[i]);
os += buff;
}
if (pickType == Zone || pickType == DomainZone)
......
......@@ -96,7 +96,12 @@ PickAttributes::PrintSelf(ostream &os)
{
os << "Zone " ;
if (showZoneId)
os<< elementNumber << " ";
{
if (!elementIsGhost)
os<< elementNumber << " ";
else
os<< elementNumber << "(ghost) ";
}
if (showZoneDomainLogicalCoords && !dzoneCoords.empty())
{
os << "d" << dzoneCoords[0].c_str();
......@@ -111,7 +116,12 @@ PickAttributes::PrintSelf(ostream &os)
{
os << "Node ";
if (showNodeId)
os << elementNumber << " ";
{
if (!elementIsGhost)
os << elementNumber << " ";
else
os << elementNumber << "(ghost) ";
}
if (showNodePhysicalCoords && !pnodeCoords.empty())
{
os << pnodeCoords[0].c_str() ;
......@@ -142,7 +152,12 @@ PickAttributes::PrintSelf(ostream &os)
for (i = 0; i < incidentElements.size(); i++)
{
if (showId)
os << incidentElements[i] << " ";
{
if (ghosts.size() > 0 && ghosts[i])
os << incidentElements[i] << "(ghost) ";
else
os << incidentElements[i] << " ";
}
if (pickType == Zone || pickType == DomainZone)
{
if (showNodePhysicalCoords && !pnodeCoords.empty())
......@@ -337,7 +352,10 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
os += "Zone: ";
if (showZoneId)
{
SNPRINTF(buff, 512, "%d", elementNumber);
if (!elementIsGhost)
SNPRINTF(buff, 512, "%d", elementNumber);
else
SNPRINTF(buff, 512, "%d(ghost)", elementNumber);
os += buff;
}
if (showZoneDomainLogicalCoords & !dzoneCoords.empty())
......@@ -359,7 +377,10 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
os += "Node: ";
if (showNodeId)
{
SNPRINTF(buff, 512, "%d", elementNumber);
if (!elementIsGhost)
SNPRINTF(buff, 512, "%d", elementNumber);
else
SNPRINTF(buff, 512, "%d(ghost)", elementNumber);
os += buff;
}
if (showNodePhysicalCoords & !pnodeCoords.empty())
......@@ -406,7 +427,10 @@ PickAttributes::CreateOutputString(std::string &os, bool withLetter)
{
if (showId)
{
SNPRINTF(buff, 512, "%d ", incidentElements[i]);
if (ghosts.size() > 0 && ghosts[i])
SNPRINTF(buff, 512, "%d(ghost) ", incidentElements[i]);
else
SNPRINTF(buff, 512, "%d ", incidentElements[i]);
os += buff;
}
if (pickType == Zone || pic