Commit e24ad72e authored by hrchilds's avatar hrchilds

Update from November 6, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@113 18c085ea-50e0-402c-830e-de6fd14e8384
parent 726c26cc
......@@ -275,6 +275,9 @@ $0 = shift @ARGV;
# Brad Whitlock, Thu Aug 21 14:34:42 PST 2003
# Added support for MacOS X.
#
# Jeremy Meredith, Thu Nov 6 10:59:45 PST 2003
# Added fast pipe IP addresses for the SGI viz servers.
#
###############################################################################
......@@ -589,7 +592,22 @@ if ($host =~ /^q\d+$/ || $host =~ /^qfe\d$/)
}
# ----
# HACK to allow other talk-back interfaces, specifically designed for Q:
# HACK to default fast connections from white to tidalwave:
#
# If we're on white trying to connect back to tidalwave, use one of the
# jumbo gig-E paths back to tidalwave.
# ----
if ($host =~ /^white\d+.asci.llnl.gov$/)
{
# As above, four pipes per machine, choose one at random
$interface = int(rand(4)+1);
$remotehost = "172.16.$interface.53" if ($remotehost =~ /^tidalwave/);
$remotehost = "172.16.$interface.54" if ($remotehost =~ /^whitecap/);
$remotehost = "172.16.$interface.57" if ($remotehost =~ /^edgewater/);
}
# ----
# HACK to allow other talk-back interfaces
#
# We stripped off the "host" argument above, so put it back here.
# (This allowed us to change it if needed, e.g. for Q)
......
......@@ -583,7 +583,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">white.llnl.gov</Field>
<Field name="hostAliases" type="string">white###.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">white.asci.llnl.gov white###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -605,7 +605,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">white.llnl.gov</Field>
<Field name="hostAliases" type="string">white###.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">white.asci.llnl.gov white###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -627,7 +627,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel views batch</Field>
<Field name="host" type="string">white.llnl.gov</Field>
<Field name="hostAliases" type="string">white###.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">white.asci.llnl.gov white###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -649,7 +649,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel views interactive</Field>
<Field name="host" type="string">white.llnl.gov</Field>
<Field name="hostAliases" type="string">white###.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">white.asci.llnl.gov white###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
......
......@@ -50,13 +50,13 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisii*F")
PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisii*FF")
{
clearWindow = false;
fulfilled = false;
......@@ -85,6 +85,12 @@ PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisi
nodePoint[0] = 0;
nodePoint[1] = 0;
nodePoint[2] = 0;
plotBounds[0] = 0;
plotBounds[1] = 0;
plotBounds[2] = 0;
plotBounds[3] = 0;
plotBounds[4] = 0;
plotBounds[5] = 0;
}
// ****************************************************************************
......@@ -96,15 +102,16 @@ PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisi
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
// ****************************************************************************
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisii*F")
PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbisii*FF")
{
AttributeGroupVector::const_iterator pos;
int i;
clearWindow = obj.clearWindow;
fulfilled = obj.fulfilled;
......@@ -160,6 +167,9 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bb
nodePoint[1] = obj.nodePoint[1];
nodePoint[2] = obj.nodePoint[2];
for(i = 0; i < 6; ++i)
plotBounds[i] = obj.plotBounds[i];
SelectAll();
}
......@@ -173,7 +183,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bb
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -197,7 +207,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -207,6 +217,7 @@ void
PickAttributes::operator = (const PickAttributes &obj)
{
AttributeGroupVector::const_iterator pos;
int i;
clearWindow = obj.clearWindow;
fulfilled = obj.fulfilled;
......@@ -262,6 +273,9 @@ PickAttributes::operator = (const PickAttributes &obj)
nodePoint[1] = obj.nodePoint[1];
nodePoint[2] = obj.nodePoint[2];
for(i = 0; i < 6; ++i)
plotBounds[i] = obj.plotBounds[i];
SelectAll();
}
......@@ -275,7 +289,7 @@ PickAttributes::operator = (const PickAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -320,6 +334,11 @@ PickAttributes::operator == (const PickAttributes &obj) const
for(i = 0; i < 3 && nodePoint_equal; ++i)
nodePoint_equal = (nodePoint[i] == obj.nodePoint[i]);
// Compare the plotBounds arrays.
bool plotBounds_equal = true;
for(i = 0; i < 6 && plotBounds_equal; ++i)
plotBounds_equal = (plotBounds[i] == obj.plotBounds[i]);
// Create the return value
return ((clearWindow == obj.clearWindow) &&
(fulfilled == obj.fulfilled) &&
......@@ -345,7 +364,8 @@ PickAttributes::operator == (const PickAttributes &obj) const
(meshInfo == obj.meshInfo) &&
(realElementNumber == obj.realElementNumber) &&
(realIncidentElements == obj.realIncidentElements) &&
nodePoint_equal);
nodePoint_equal &&
plotBounds_equal);
}
// ****************************************************************************
......@@ -357,7 +377,7 @@ PickAttributes::operator == (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -378,7 +398,7 @@ PickAttributes::operator != (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -399,7 +419,7 @@ PickAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -427,7 +447,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -453,7 +473,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -480,7 +500,7 @@ PickAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -514,6 +534,7 @@ PickAttributes::SelectAll()
Select(22, (void *)&realElementNumber);
Select(23, (void *)&realIncidentElements);
Select(24, (void *)nodePoint, 3);
Select(25, (void *)plotBounds, 6);
}
// ****************************************************************************
......@@ -525,7 +546,7 @@ PickAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -550,7 +571,7 @@ PickAttributes::CreateSubAttributeGroup(int)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -718,6 +739,12 @@ PickAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
node->AddNode(new DataNode("nodePoint", nodePoint, 3));
}
if(!FieldsEqual(25, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("plotBounds", plotBounds, 6));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
......@@ -737,7 +764,7 @@ PickAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -834,6 +861,8 @@ PickAttributes::SetFromNode(DataNode *parentNode)
SetRealIncidentElements(node->AsIntVector());
if((node = searchNode->GetNode("nodePoint")) != 0)
SetNodePoint(node->AsFloatArray());
if((node = searchNode->GetNode("plotBounds")) != 0)
SetPlotBounds(node->AsFloatArray());
}
///////////////////////////////////////////////////////////////////////////////
......@@ -1018,6 +1047,14 @@ PickAttributes::SetNodePoint(const float *nodePoint_)
Select(24, (void *)nodePoint, 3);
}
void
PickAttributes::SetPlotBounds(const float *plotBounds_)
{
for(int i = 0; i < 6; ++i)
plotBounds[i] = plotBounds_[i];
Select(25, (void *)plotBounds, 6);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1256,6 +1293,18 @@ PickAttributes::GetNodePoint()
return nodePoint;
}
const float *
PickAttributes::GetPlotBounds() const
{
return plotBounds;
}
float *
PickAttributes::GetPlotBounds()
{
return plotBounds;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -1344,6 +1393,12 @@ PickAttributes::SelectNodePoint()
Select(24, (void *)nodePoint, 3);
}
void
PickAttributes::SelectPlotBounds()
{
Select(25, (void *)plotBounds, 6);
}
///////////////////////////////////////////////////////////////////////////////
// AttributeGroupVector convenience methods.
///////////////////////////////////////////////////////////////////////////////
......@@ -1357,7 +1412,7 @@ PickAttributes::SelectNodePoint()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1382,7 +1437,7 @@ PickAttributes::AddPickVarInfo(const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1410,7 +1465,7 @@ PickAttributes::ClearPickVarInfos()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1445,7 +1500,7 @@ PickAttributes::RemovePickVarInfo(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1466,7 +1521,7 @@ PickAttributes::GetNumPickVarInfos() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1487,7 +1542,7 @@ PickAttributes::GetPickVarInfo(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1508,7 +1563,7 @@ PickAttributes::GetPickVarInfo(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1529,7 +1584,7 @@ PickAttributes::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1554,7 +1609,7 @@ PickAttributes::operator [] (int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1590,6 +1645,7 @@ PickAttributes::GetFieldName(int index) const
case 22: return "RealElementNumber";
case 23: return "RealIncidentElements";
case 24: return "nodePoint";
case 25: return "plotBounds";
default: return "invalid index";
}
}
......@@ -1603,7 +1659,7 @@ PickAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1639,6 +1695,7 @@ PickAttributes::GetFieldType(int index) const
case 22: return FieldType_int;
case 23: return FieldType_intVector;
case 24: return FieldType_floatArray;
case 25: return FieldType_floatArray;
default: return FieldType_unknown;
}
}
......@@ -1652,7 +1709,7 @@ PickAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1688,6 +1745,7 @@ PickAttributes::GetFieldTypeName(int index) const
case 22: return "int";
case 23: return "intVector";
case 24: return "floatArray";
case 25: return "floatArray";
default: return "invalid index";
}
}
......@@ -1701,7 +1759,7 @@ PickAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:24 PST 2003
//
// Modifications:
//
......@@ -1875,6 +1933,16 @@ PickAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = nodePoint_equal;
}
break;
case 25:
{ // new scope
// Compare the plotBounds arrays.
bool plotBounds_equal = true;
for(i = 0; i < 6 && plotBounds_equal; ++i)
plotBounds_equal = (plotBounds[i] == obj.plotBounds[i]);
retval = plotBounds_equal;
}
break;
default: retval = false;
}
......@@ -2179,6 +2247,8 @@ PickAttributes::PrepareForNewPick()
realIncidentElements.clear();
meshInfo = "";
for (int i = 0; i < 6; ++i)
plotBounds[i] = 0.;
ClearPickVarInfos();
}
......
......@@ -301,6 +301,8 @@ PickAttributes::PrepareForNewPick()
realIncidentElements.clear();
meshInfo = "";
for (int i = 0; i < 6; ++i)
plotBounds[i] = 0.;
ClearPickVarInfos();
}
......
......@@ -15,7 +15,7 @@ class PickVarInfo;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:17 PDT 2003
// Creation: Wed Nov 5 17:14:23 PST 2003
//
// Modifications:
//
......@@ -59,6 +59,7 @@ public:
void SelectMeshInfo();
void SelectRealIncidentElements();
void SelectNodePoint();
void SelectPlotBounds();
// Property setting methods
void SetClearWindow(bool clearWindow_);
......@@ -86,6 +87,7 @@ public:
void SetRealElementNumber(int realElementNumber_);
void SetRealIncidentElements(const intVector &realIncidentElements_);
void SetNodePoint(const float *nodePoint_);
void SetPlotBounds(const float *plotBounds_);
// Property getting methods
bool GetClearWindow() const;
......@@ -127,6 +129,8 @@ public:
intVector &GetRealIncidentElements();
const float *GetNodePoint() const;
float *GetNodePoint();
const float *GetPlotBounds() const;
float *GetPlotBounds();
// Persistence methods
virtual bool CreateNode(DataNode *node, bool forceAdd);
......@@ -189,6 +193,7 @@ private:
int realElementNumber;
intVector realIncidentElements;
float nodePoint[3];
float plotBounds[6];
};
#endif
......@@ -81,6 +81,14 @@
0.000000
0.000000
</Field>
<Field name="plotBounds" label="plotBounds" type="floatArray" length="6" internal="true">
0.000000
0.000000
0.000000
0.000000
0.000000
0.000000
</Field>
<Function name="PrintSelf" user="true" member="true">
</Function>
<Function name="CreateOutputString" user="true" member="true">
......
......@@ -48,13 +48,13 @@ QueryAttributes::ElementType_FromString(const std::string &s, QueryAttributes::E
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:25 PDT 2003
// Creation: Wed Nov 5 17:20:11 PST 2003
//
// Modifications:
//
// ****************************************************************************
QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiiFFFdiF")
QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiidi")
{
variables.push_back("default");
worldPoint[0] = 0;
......@@ -62,20 +62,8 @@ QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiiFFFdiF")
worldPoint[2] = 0;
domain = -1;
element = -1;
rayPoint1[0] = 0;
rayPoint1[1] = 0;
rayPoint1[2] = 0;
rayPoint2[0] = 0;
rayPoint2[1] = 0;
rayPoint2[2] = 0;
cellPoint[0] = 0;
cellPoint[1] = 0;
cellPoint[2] = 0;
resultsValue = 0;
elementType = Zone;
nodePoint[0] = 0;
nodePoint[1] = 0;
nodePoint[2] = 0;
}
// ****************************************************************************
......@@ -87,13 +75,13 @@ QueryAttributes::QueryAttributes() : AttributeSubject("ss*sFiiFFFdiF")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Fri Oct 10 12:27:25 PDT 2003
// Creation: Wed Nov 5 17:20:11 PST 2003
//
// Modifications:
//
// ****************************************************************************
QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject("ss*sFiiFFFdiF")
QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject("ss*sFiidi")
{
name = obj.name;
variables = obj.variables;
......@@ -104,24 +92,8 @@ QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject(
domain = obj.domain;
element = obj.element;
rayPoint1[0] = obj.rayPoint1[0];
rayPoint1[1] = obj.rayPoint1[1];
rayPoint1[2] = obj.rayPoint1[2];
rayPoint2[0] = obj.rayPoint2[0];
rayPoint2[1] = obj.rayPoint2[1];
rayPoint2[2] = obj.rayPoint2[2];
cellPoint[0] = obj.cellPoint[0];
cellPoint[1] = obj.cellPoint[1];
cellPoint[2] = obj.cellPoint[2];
resultsValue = obj.resultsValue;
elementType = obj.elementType;
nodePoint[0] = obj.nodePoint[0];
nodePoint[1] = obj.nodePoint[1];
nodePoint[2] = obj.nodePoint[2];
SelectAll();
}
......@@ -135,7 +107,7 @@ QueryAttributes::QueryAttributes(const QueryAttributes &obj) : AttributeSubject(
// Note: Autogenerated by xml2atts.
//