Commit 6daba546 authored by hrchilds's avatar hrchilds
Browse files

Update from July 24, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@42 18c085ea-50e0-402c-830e-de6fd14e8384
parent 55298726
......@@ -231,9 +231,13 @@ $0 = shift @ARGV;
# allow non-private plugin installs.
#
# Jeremy Meredith, Mon Jul 7 12:46:08 PDT 2003
# The changed the path of "bsub" on Q, breaking things for the Q port.
# They changed the path of "bsub" on Q, breaking things for the Q port.
# I updated the path for the Q stuff to match it.
#
# Jeremy Meredith, Thu Jul 24 15:58:45 PDT 2003
# I added the ability to translate a known remotehost into a different
# IP address. This allows us to use the DISCOM pipes back to White from Q.
#
###############################################################################
......@@ -395,6 +399,7 @@ while (scalar(@ARGV) > 0) {
elsif ($arg eq "-t") { $time = shift; $time_set = 1; }
elsif ($arg eq "-v" ) { $ver = shift; $ver_set = 1; }
elsif ($arg eq "-expedite") { if($exe_name eq "engine") { $expedite_engine = 1;} else { push @visitargs, $arg; }}
elsif ($arg eq "-host") { $remotehost = shift; $remotehost_set = 1; }
elsif ($arg eq "-beta") { $beta = 1; push @visitargs,$arg;}
elsif ($arg eq "-key" ) { $security_key = shift; $security_key_set = 1;}
elsif ($arg eq "-viewer" ) { $exe_name = "viewer"; }
......@@ -485,6 +490,14 @@ if ($ver_set)
# ----
if ($host =~ /^q\d+$/ || $host =~ /^qfe\d$/)
{
# These are the DISCOM pipes to White from Q. Four per login node;
# choose one at random.
$interface = int(rand(4)+1);
$remotehost = "172.16.$interface.1" if ($remotehost =~ /^white128/);
$remotehost = "172.16.$interface.5" if ($remotehost =~ /^white129/);
$remotehost = "172.16.$interface.9" if ($remotehost =~ /^white269/);
$remotehost = "172.16.$interface.13" if ($remotehost =~ /^white432/);
$ENV{PATH} = join ':' , ("$ENV{PATH}","/lsf/bin");
$ENV{LD_LIBRARY_PATH} = join ':' ,
("$ENV{LD_LIBRARY_PATH}",
......@@ -493,6 +506,21 @@ if ($host =~ /^q\d+$/ || $host =~ /^qfe\d$/)
"/usr/local/opt/Compaq_MPI_64_2.5UK1_r1/usr/shlib");
}
# ----
# HACK to allow other talk-back interfaces, specifically designed for Q:
#
# We stripped off the "host" argument above, so put it back here.
# (This allowed us to change it if needed, e.g. for Q)
# VisIt seems to need the -host argument before the -nread and -nwrite
# values, so when we put it back, put it at the beginning.
# ----
if ($remotehost_set)
{
unshift @visitargs, $remotehost;
unshift @visitargs, "-host";
}
# -----------------------------------------------------------------------------
# Check for errors
# -----------------------------------------------------------------------------
......
......@@ -10,13 +10,13 @@
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
// ****************************************************************************
Line::Line() : AttributeSubject("DDsaiibbs")
Line::Line() : AttributeSubject("DDsaiibbsi")
{
point1[0] = 0;
point1[1] = 0;
......@@ -29,6 +29,7 @@ Line::Line() : AttributeSubject("DDsaiibbs")
interactive = false;
reflineLabels = false;
varName = "default";
numSamples = 50;
}
// ****************************************************************************
......@@ -40,13 +41,13 @@ Line::Line() : AttributeSubject("DDsaiibbs")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
// ****************************************************************************
Line::Line(const Line &obj) : AttributeSubject("DDsaiibbs")
Line::Line(const Line &obj) : AttributeSubject("DDsaiibbsi")
{
point1[0] = obj.point1[0];
point1[1] = obj.point1[1];
......@@ -63,6 +64,7 @@ Line::Line(const Line &obj) : AttributeSubject("DDsaiibbs")
interactive = obj.interactive;
reflineLabels = obj.reflineLabels;
varName = obj.varName;
numSamples = obj.numSamples;
SelectAll();
}
......@@ -76,7 +78,7 @@ Line::Line(const Line &obj) : AttributeSubject("DDsaiibbs")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -96,7 +98,7 @@ Line::~Line()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -120,6 +122,7 @@ Line::operator = (const Line &obj)
interactive = obj.interactive;
reflineLabels = obj.reflineLabels;
varName = obj.varName;
numSamples = obj.numSamples;
SelectAll();
}
......@@ -133,7 +136,7 @@ Line::operator = (const Line &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -163,7 +166,8 @@ Line::operator == (const Line &obj) const
(lineWidth == obj.lineWidth) &&
(interactive == obj.interactive) &&
(reflineLabels == obj.reflineLabels) &&
(varName == obj.varName));
(varName == obj.varName) &&
(numSamples == obj.numSamples));
}
// ****************************************************************************
......@@ -175,7 +179,7 @@ Line::operator == (const Line &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -196,7 +200,7 @@ Line::operator != (const Line &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -217,7 +221,7 @@ Line::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -245,7 +249,7 @@ Line::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -271,7 +275,7 @@ Line::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -298,7 +302,7 @@ Line::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -316,6 +320,7 @@ Line::SelectAll()
Select(6, (void *)&interactive);
Select(7, (void *)&reflineLabels);
Select(8, (void *)&varName);
Select(9, (void *)&numSamples);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -331,7 +336,7 @@ Line::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -408,6 +413,12 @@ Line::CreateNode(DataNode *parentNode, bool forceAdd)
node->AddNode(new DataNode("varName", varName));
}
if(!FieldsEqual(9, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("numSamples", numSamples));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
......@@ -427,7 +438,7 @@ Line::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -462,6 +473,8 @@ Line::SetFromNode(DataNode *parentNode)
SetReflineLabels(node->AsBool());
if((node = searchNode->GetNode("varName")) != 0)
SetVarName(node->AsString());
if((node = searchNode->GetNode("numSamples")) != 0)
SetNumSamples(node->AsInt());
}
///////////////////////////////////////////////////////////////////////////////
......@@ -535,6 +548,13 @@ Line::SetVarName(const std::string &varName_)
Select(8, (void *)&varName);
}
void
Line::SetNumSamples(int numSamples_)
{
numSamples = numSamples_;
Select(9, (void *)&numSamples);
}
///////////////////////////////////////////////////////////////////////////////
// Get property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -623,6 +643,12 @@ Line::GetVarName()
return varName;
}
int
Line::GetNumSamples() const
{
return numSamples;
}
///////////////////////////////////////////////////////////////////////////////
// Select property methods
///////////////////////////////////////////////////////////////////////////////
......@@ -670,7 +696,7 @@ Line::SelectVarName()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -690,6 +716,7 @@ Line::GetFieldName(int index) const
case 6: return "interactive";
case 7: return "reflineLabels";
case 8: return "varName";
case 9: return "numSamples";
default: return "invalid index";
}
}
......@@ -703,7 +730,7 @@ Line::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -723,6 +750,7 @@ Line::GetFieldType(int index) const
case 6: return FieldType_bool;
case 7: return FieldType_bool;
case 8: return FieldType_string;
case 9: return FieldType_int;
default: return FieldType_unknown;
}
}
......@@ -736,7 +764,7 @@ Line::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -756,6 +784,7 @@ Line::GetFieldTypeName(int index) const
case 6: return "bool";
case 7: return "bool";
case 8: return "string";
case 9: return "int";
default: return "invalid index";
}
}
......@@ -769,7 +798,7 @@ Line::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -839,6 +868,11 @@ Line::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (varName == obj.varName);
}
break;
case 9:
{ // new scope
retval = (numSamples == obj.numSamples);
}
break;
default: retval = false;
}
......
......@@ -14,7 +14,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:40 PDT 2003
// Creation: Thu Jul 24 12:43:53 PDT 2003
//
// Modifications:
//
......@@ -54,6 +54,7 @@ public:
void SetInteractive(bool interactive_);
void SetReflineLabels(bool reflineLabels_);
void SetVarName(const std::string &varName_);
void SetNumSamples(int numSamples_);
// Property getting methods
const double *GetPoint1() const;
......@@ -70,6 +71,7 @@ public:
bool GetReflineLabels() const;
const std::string &GetVarName() const;
std::string &GetVarName();
int GetNumSamples() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool forceAdd);
......@@ -95,6 +97,7 @@ private:
bool interactive;
bool reflineLabels;
std::string varName;
int numSamples;
};
#endif
<?xml version="1.0"?>
<Attribute name="Line" codefile="Line.code" purpose="Attributes for a line" exportAPI="STATE_API" exportInclude="state_exports.h">
<Field name="point1" type="doubleArray" length="3"> 0. 0. 0. </Field>
<Field name="point2" type="doubleArray" length="3"> 1. 1. 1. </Field>
<Field name="designator" type="string" > </Field>
<Field name="color" type="att" subtype="ColorAttribute" > </Field>
<Field name="lineStyle" type="linestyle" >0 </Field>
<Field name="lineWidth" type="linewidth" >0 </Field>
<Field name="interactive" type="bool" >false </Field>
<Field name="reflineLabels" type="bool" >false </Field>
<Field name="varName" type="string" >"default" </Field>
<Function name="SetPoint1" user="true" ></Function>
<Function name="SetPoint2" user="true" ></Function>
<Attribute name="Line" purpose="Attributes for a line" persistent="true" exportAPI="STATE_API" exportInclude="state_exports.h" codefile="Line.code">
<Field name="point1" label="point1" type="doubleArray" length="3">
0.000000
0.000000
0.000000
</Field>
<Field name="point2" label="point2" type="doubleArray" length="3">
1.000000
1.000000
1.000000
</Field>
<Field name="designator" label="designator" type="string">
</Field>
<Field name="color" label="color" type="att" subtype="ColorAttribute">
</Field>
<Field name="lineStyle" label="lineStyle" type="linestyle">
0
</Field>
<Field name="lineWidth" label="lineWidth" type="linewidth">
0
</Field>
<Field name="interactive" label="interactive" type="bool">
false
</Field>
<Field name="reflineLabels" label="reflineLabels" type="bool">
false
</Field>
<Field name="varName" label="varName" type="string">
default
</Field>
<Field name="numSamples" label="numSamples" type="int">
50
</Field>
<Function name="SetPoint1" user="true" member="true">
</Function>
<Function name="SetPoint2" user="true" member="true">
</Function>
</Attribute>
#include <PickAttributes.h>
#include <DataNode.h>
#include <stdio.h>
#include <float.h>
#include <PickVarInfo.h>
//
......@@ -49,7 +50,7 @@ PickAttributes::PickType_FromString(const std::string &s, PickAttributes::PickTy
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -91,7 +92,7 @@ PickAttributes::PickAttributes() : AttributeSubject("bbsiiiissFFi*s*a*bbs*FFbi")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -161,7 +162,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) : AttributeSubject("bb
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -185,7 +186,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -256,7 +257,7 @@ PickAttributes::operator = (const PickAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -329,7 +330,7 @@ PickAttributes::operator == (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -350,7 +351,7 @@ PickAttributes::operator != (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -371,7 +372,7 @@ PickAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -399,7 +400,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -425,7 +426,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -452,7 +453,7 @@ PickAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -493,7 +494,7 @@ PickAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -518,7 +519,7 @@ PickAttributes::CreateSubAttributeGroup(int)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -681,7 +682,7 @@ PickAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1202,7 +1203,7 @@ PickAttributes::SelectRayPoint2()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1227,7 +1228,7 @@ PickAttributes::AddPickVarInfo(const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1255,7 +1256,7 @@ PickAttributes::ClearPickVarInfos()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1290,7 +1291,7 @@ PickAttributes::RemovePickVarInfo(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1311,7 +1312,7 @@ PickAttributes::GetNumPickVarInfos() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1332,7 +1333,7 @@ PickAttributes::GetPickVarInfo(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1353,7 +1354,7 @@ PickAttributes::GetPickVarInfo(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1374,7 +1375,7 @@ PickAttributes::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1399,7 +1400,7 @@ PickAttributes::operator [] (int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1444,7 +1445,7 @@ PickAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jul 23 11:30:53 PDT 2003
// Creation: Thu Jul 24 12:43:48 PDT 2003
//
// Modifications:
//
......@@ -1489,7 +1490,7 @@ PickAttributes::GetFieldType(int index) const