Commit d7913164 authored by hrchilds's avatar hrchilds

Update from November 5, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@356 18c085ea-50e0-402c-830e-de6fd14e8384
parent e652ad6f
......@@ -27,7 +27,8 @@ shell prompt.
Mesa 5.0.2 3-D Graphics Library http://www.mesa3d.org/
Python 2.3.3 Scripting Language http://www.python.org
Qt 3.3.1 GUI Toolkit http://www.trolltech.com
Silo 4.4.1 File I/O library http://www.llnl.gov/bdiv/meshtv
Silo 4.4.2 File I/O library http://www.llnl.gov/bdiv/meshtv
ftp://ftp.llnl.gov/pub/visit/3rd_party/silo041018.sh
VTK 20031028 Visualization Toolkit http://www.kitware.com
HDF5 1.6.0 I/O library http://hdf.ncsa.uiuc.edu/HDF5/
......@@ -623,6 +624,13 @@ configure that tests your system for various libraries and programs required
to build VisIt. Follow the directions listed below to build VisIt.
More information about building VisIt follows after that.
#
# Unzipping VisIt's source code distribution
#
gunzip visit041108.tar.gz
tar xf visit041108.tar
cd visit041108
#
# HDF5 and Silo
#
......@@ -640,9 +648,7 @@ save and quit
#
# Configure VisIt
#
gunzip visit040816.tar.gz
tar xf visit040816.tar
cd visit040816/config-site
cd config-site
echo VISITHOME=`cat ../../visitpath` > `hostname`.conf
cat Template.conf >> `hostname`.conf
cd ..
......
......@@ -12,7 +12,7 @@
<Field name="id" type="stringVector">Streamline_1.0 InverseGhostZone_1.0 </Field>
<Field name="enabled" type="intVector">0 0 </Field>
</Object>
<Object name="HostProfileList" childObjects="33">
<Object name="HostProfileList" childObjects="34">
<Object name="HostProfile" childObjects="0">
<Field name="shareOneBatchJob" type="bool">true</Field>
<Field name="profileName" type="string">Q-LANL parallel ldevq</Field>
......@@ -728,6 +728,28 @@
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pdebug</Field>
<Field name="host" type="string">um.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">>um#.asci.llnl.gov um##.asci.llnl.gov um###.asci.llnl.gov um# um## um###</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">8</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">1</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">0</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">poe</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
</Object>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -14,13 +14,6 @@
#include <misc_exports.h>
#if defined(_WIN32) && defined(GetMessage)
// The windows.h header file defines GetMessage to be GetMessageA, which
// interferes with us calling VisItException::GetMessage. Make sure that
// GetMessage is not defined.
#undef GetMessage
#endif
#ifdef FAKE_EXCEPTIONS
#define VISIT_THROW_NOTHING
#else
......@@ -69,6 +62,10 @@
// Brad Whitlock, Mon Aug 25 15:05:14 PST 2003
// Added LogCatch.
//
// Brad Whitlock, Mon Nov 1 16:13:22 PST 2004
// Removed GetMessage method once and for all. Too many times has it
// been confused with GetMessageA on Windows.
//
// ****************************************************************************
class MISC_API VisItException
......@@ -83,7 +80,6 @@ class MISC_API VisItException
void SetThrowLocation(int, char *);
void SetType(char *t) { type = t; };
void SetType(const std::string &t) { type = t; };
const std::string &GetMessage() { return msg; };
const std::string &Message() { return msg; };
const std::string &GetExceptionType() { return type; };
......
......@@ -12,7 +12,7 @@ const int StatusAttributes::DEFAULT_DURATION = 5000;
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -39,7 +39,7 @@ StatusAttributes::StatusAttributes() : AttributeSubject("sbsiisiii")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -49,7 +49,7 @@ StatusAttributes::StatusAttributes(const StatusAttributes &obj) : AttributeSubje
{
sender = obj.sender;
clearStatus = obj.clearStatus;
message = obj.message;
statusMessage = obj.statusMessage;
percent = obj.percent;
currentStage = obj.currentStage;
currentStageName = obj.currentStageName;
......@@ -69,7 +69,7 @@ StatusAttributes::StatusAttributes(const StatusAttributes &obj) : AttributeSubje
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -89,7 +89,7 @@ StatusAttributes::~StatusAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -100,7 +100,7 @@ StatusAttributes::operator = (const StatusAttributes &obj)
{
sender = obj.sender;
clearStatus = obj.clearStatus;
message = obj.message;
statusMessage = obj.statusMessage;
percent = obj.percent;
currentStage = obj.currentStage;
currentStageName = obj.currentStageName;
......@@ -120,7 +120,7 @@ StatusAttributes::operator = (const StatusAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -132,7 +132,7 @@ StatusAttributes::operator == (const StatusAttributes &obj) const
// Create the return value
return ((sender == obj.sender) &&
(clearStatus == obj.clearStatus) &&
(message == obj.message) &&
(statusMessage == obj.statusMessage) &&
(percent == obj.percent) &&
(currentStage == obj.currentStage) &&
(currentStageName == obj.currentStageName) &&
......@@ -150,7 +150,7 @@ StatusAttributes::operator == (const StatusAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -171,7 +171,7 @@ StatusAttributes::operator != (const StatusAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -192,7 +192,7 @@ StatusAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -220,7 +220,7 @@ StatusAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -246,7 +246,7 @@ StatusAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -273,7 +273,7 @@ StatusAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -284,7 +284,7 @@ StatusAttributes::SelectAll()
{
Select(0, (void *)&sender);
Select(1, (void *)&clearStatus);
Select(2, (void *)&message);
Select(2, (void *)&statusMessage);
Select(3, (void *)&percent);
Select(4, (void *)&currentStage);
Select(5, (void *)&currentStageName);
......@@ -306,7 +306,7 @@ StatusAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -338,7 +338,7 @@ StatusAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool force
if(completeSave || !FieldsEqual(2, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("message", message));
node->AddNode(new DataNode("statusMessage", statusMessage));
}
if(completeSave || !FieldsEqual(3, &defaultObject))
......@@ -396,7 +396,7 @@ StatusAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool force
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -418,8 +418,8 @@ StatusAttributes::SetFromNode(DataNode *parentNode)
SetSender(node->AsString());
if((node = searchNode->GetNode("clearStatus")) != 0)
SetClearStatus(node->AsBool());
if((node = searchNode->GetNode("message")) != 0)
SetMessage(node->AsString());
if((node = searchNode->GetNode("statusMessage")) != 0)
SetStatusMessage(node->AsString());
if((node = searchNode->GetNode("percent")) != 0)
SetPercent(node->AsInt());
if((node = searchNode->GetNode("currentStage")) != 0)
......@@ -453,10 +453,10 @@ StatusAttributes::SetClearStatus(bool clearStatus_)
}
void
StatusAttributes::SetMessage(const std::string &message_)
StatusAttributes::SetStatusMessage(const std::string &statusMessage_)
{
message = message_;
Select(2, (void *)&message);
statusMessage = statusMessage_;
Select(2, (void *)&statusMessage);
}
void
......@@ -524,15 +524,15 @@ StatusAttributes::GetClearStatus() const
}
const std::string &
StatusAttributes::GetMessage() const
StatusAttributes::GetStatusMessage() const
{
return message;
return statusMessage;
}
std::string &
StatusAttributes::GetMessage()
StatusAttributes::GetStatusMessage()
{
return message;
return statusMessage;
}
int
......@@ -588,9 +588,9 @@ StatusAttributes::SelectSender()
}
void
StatusAttributes::SelectMessage()
StatusAttributes::SelectStatusMessage()
{
Select(2, (void *)&message);
Select(2, (void *)&statusMessage);
}
void
......@@ -612,7 +612,7 @@ StatusAttributes::SelectCurrentStageName()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -625,7 +625,7 @@ StatusAttributes::GetFieldName(int index) const
{
case 0: return "sender";
case 1: return "clearStatus";
case 2: return "message";
case 2: return "statusMessage";
case 3: return "percent";
case 4: return "currentStage";
case 5: return "currentStageName";
......@@ -645,7 +645,7 @@ StatusAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -678,7 +678,7 @@ StatusAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -711,7 +711,7 @@ StatusAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -736,7 +736,7 @@ StatusAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
break;
case 2:
{ // new scope
retval = (message == obj.message);
retval = (statusMessage == obj.statusMessage);
}
break;
case 3:
......
......@@ -13,7 +13,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:24:33 PDT 2003
// Creation: Mon Nov 1 17:08:56 PST 2004
//
// Modifications:
//
......@@ -40,13 +40,13 @@ public:
// Property selection methods
virtual void SelectAll();
void SelectSender();
void SelectMessage();
void SelectStatusMessage();
void SelectCurrentStageName();
// Property setting methods
void SetSender(const std::string &sender_);
void SetClearStatus(bool clearStatus_);
void SetMessage(const std::string &message_);
void SetStatusMessage(const std::string &statusMessage_);
void SetPercent(int percent_);
void SetCurrentStage(int currentStage_);
void SetCurrentStageName(const std::string &currentStageName_);
......@@ -58,8 +58,8 @@ public:
const std::string &GetSender() const;
std::string &GetSender();
bool GetClearStatus() const;
const std::string &GetMessage() const;
std::string &GetMessage();
const std::string &GetStatusMessage() const;
std::string &GetStatusMessage();
int GetPercent() const;
int GetCurrentStage() const;
const std::string &GetCurrentStageName() const;
......@@ -82,7 +82,7 @@ public:
private:
std::string sender;
bool clearStatus;
std::string message;
std::string statusMessage;
int percent;
int currentStage;
std::string currentStageName;
......
......@@ -6,7 +6,7 @@
<Field name="clearStatus" label="clearStatus" type="bool">
false
</Field>
<Field name="message" label="message" type="string">
<Field name="statusMessage" label="statusMessage" type="string">
</Field>
<Field name="percent" label="percent" type="int">
......
......@@ -49,7 +49,7 @@ VisItRPC::RPCReply::SetMessage(const std::string &msg)
}
const std::string &
VisItRPC::RPCReply::GetMessage() const
VisItRPC::RPCReply::Message() const
{
return message;
}
......@@ -102,9 +102,9 @@ VisItRPC::GetStatus() const
}
const std::string &
VisItRPC::GetMessage() const
VisItRPC::Message() const
{
return reply.GetMessage();
return reply.Message();
}
const std::string &
......
......@@ -37,7 +37,7 @@ public:
int GetStatus() const;
void SetMessage(const std::string &msg);
const std::string &GetMessage() const;
const std::string &Message() const;
void SetExceptionType(const std::string &type);
const std::string &GetExceptionType() const;
......@@ -56,7 +56,7 @@ public:
virtual ~VisItRPC();
int GetStatus() const;
const std::string &GetMessage() const;
const std::string &Message() const;
const std::string &GetExceptionType() const;
RPCReply *GetReply();
......
......@@ -344,7 +344,7 @@ avtGenericDatabase::GetOutput(avtDataSpecification_p spec,
debug1 << "Catching the exception at the generic database level." << endl;
avtDataValidity &v = src->GetOutput()->GetInfo().GetValidity();
v.ErrorOccurred();
string tmp = e.GetMessage(); // Otherwise there is a const problem.
string tmp = e.Message(); // Otherwise there is a const problem.
v.SetErrorMessage(tmp);
}
ENDTRY
......@@ -3263,7 +3263,8 @@ avtGenericDatabase::ReadDataset(avtDatasetCollection &ds, vector<int> &domains,
// Some file formats are interested in knowing about data selections
//
vector<avtDataSelection_p> selList = spec->GetAllDataSelections();
for (int i = 0; i < selList.size(); i++)
int i;
for (i = 0; i < selList.size(); i++)
selectionsApplied.push_back(false);
Interface->RegisterDataSelections(selList, &selectionsApplied);
......@@ -3279,7 +3280,7 @@ avtGenericDatabase::ReadDataset(avtDatasetCollection &ds, vector<int> &domains,
src->DatabaseProgress(0, 0, progressString);
int nDomains = domains.size();
avtSILRestrictionTraverser trav(silr);
for (int i = 0 ; i < nDomains ; i++)
for (i = 0 ; i < nDomains ; i++)
{
vector<string> labels;
vector<string> matnames;
......
......@@ -148,7 +148,7 @@ avtSourceFromDatabase::FetchDataset(avtDataSpecification_p spec,
debug1 << "Catching the exception at the database level." << endl;
avtDataValidity &v = GetOutput()->GetInfo().GetValidity();
v.ErrorOccurred();
string tmp = e.GetMessage(); // Otherwise there is a const problem.
string tmp = e.Message(); // Otherwise there is a const problem.
v.SetErrorMessage(tmp);
tree = new avtDataTree();
}
......
......@@ -380,7 +380,8 @@ avtDataAttributes::Print(ostream &out)
cumulativeCurrentSpatial->Print(out);
}
for (int i = 0 ; i < variables.size() ; i++)
int i;
for (i = 0 ; i < variables.size() ; i++)
{
out << "Variable = " << variables[i].varname.c_str() << endl;
if(variables[i].varunits != "")
......@@ -434,7 +435,7 @@ avtDataAttributes::Print(ostream &out)
}
out << "Selections Applied: ";
for (int i = 0; i < selectionsApplied.size(); i++)
for (i = 0; i < selectionsApplied.size(); i++)
out << (selectionsApplied[i] ? "T " : "F ");
out << endl;
......
......@@ -34,13 +34,18 @@ avtLogicalSelection::avtLogicalSelection()
// Programmer: Mark C. Miller
// Creation: September 22, 2004
//
// Modifications:
// Brad Whitlock, Wed Nov 3 09:40:46 PDT 2004
// Fixed for win32.
//
// ****************************************************************************
void
avtLogicalSelection::SetStarts(const int *_starts)
{
for (int i = 0; i < ndims; i++)
int i;
for (i = 0; i < ndims; i++)
starts[i] = _starts[i];
for (int i = ndims; i < 3; i++)
for (i = ndims; i < 3; i++)
starts[i] = 0;
}
......@@ -50,13 +55,18 @@ avtLogicalSelection::SetStarts(const int *_starts)
// Programmer: Mark C. Miller
// Creation: September 22, 2004
//
// Modifications:
// Brad Whitlock, Wed Nov 3 09:40:46 PDT 2004
// Fixed for win32.
//
// ****************************************************************************
void
avtLogicalSelection::SetStops(const int *_stops)
{
for (int i = 0; i < ndims; i++)
int i;
for (i = 0; i < ndims; i++)
stops[i] = _stops[i];
for (int i = ndims; i < 3; i++)
for (i = ndims; i < 3; i++)
stops[i] = 0;
}
......@@ -66,13 +76,18 @@ avtLogicalSelection::SetStops(const int *_stops)
// Programmer: Mark C. Miller
// Creation: September 22, 2004
//
// Modifications:
// Brad Whitlock, Wed Nov 3 09:40:46 PDT 2004
// Fixed for win32.
//
// ****************************************************************************
void
avtLogicalSelection::SetStrides(const int *_strides)
{
for (int i = 0; i < ndims; i++)
int i;
for (i = 0; i < ndims; i++)
strides[i] = _strides[i];
for (int i = ndims; i < 3; i++)
for (i = ndims; i < 3; i++)
strides[i] = 0;
}
......@@ -82,13 +97,18 @@ avtLogicalSelection::SetStrides(const int *_strides)
// Programmer: Mark C. Miller
// Creation: September 22, 2004
//
// Modifications:
// Brad Whitlock, Wed Nov 3 09:40:46 PDT 2004
// Fixed for win32.
//
// ****************************************************************************
void
avtLogicalSelection::GetStarts(int *_starts) const
{
for (int i = 0; i < ndims; i++)
int i;
for (i = 0; i < ndims; i++)
_starts[i] = starts[i];
for (int i = ndims; i < 3; i++)
for (i = ndims; i < 3; i++)
_starts[i] = 0;
}
......@@ -98,13 +118,18 @@ avtLogicalSelection::GetStarts(int *_starts) const
// Programmer: Mark C. Miller
// Creation: September 22, 2004
//
// Modifications:
// Brad Whitlock, Wed Nov 3 09:40:46 PDT 2004
// Fixed for win32.
//
// ****************************************************************************
void
avtLogicalSelection::GetStops(int *_stops) const
{
for (int i = 0; i < ndims; i++)
int i;
for (i = 0; i < ndims; i++)
_stops[i] = stops[i];
for (int i = ndims; i < 3; i++)
for (i = ndims; i < 3; i++)
_stops[i] = 0;
}
......@@ -114,13 +139,18 @@ avtLogicalSelection::GetStops(int *_stops) const
// Programmer: Mark C. Miller
// Creation: September 22, 2004
//
// Modifications:
// Brad Whitlock, Wed Nov 3 09:40:46 PDT 2004
// Fixed for win32.
//
// ****************************************************************************
void
avtLogicalSelection::GetStrides(int *_strides) const
{
for (int i = 0; i < ndims; i++)
int i;
for (i = 0; i < ndims; i++)
_strides[i] = strides[i];
for (int i = ndims; i < 3; i++)
for (i = ndims; i < 3; i++)
_strides[i] = 0;
}
......@@ -198,20 +228,24 @@ avtLogicalSelection::Compose(const avtLogicalSelection &sel)
// Programmer: Mark C. Miller
// Creation: September 26, 2004
//
// Modifications:
// Brad Whitlock, Wed Nov 3 09:40:46 PDT 2004
// Fixed for win32.
//
// ****************************************************************************
bool
avtLogicalSelection::FactorBestPowerOf2(avtLogicalSelection &pow2Sel,
avtLogicalSelection &otherSel) const
{
int pow2Strides[31];
for (int i = 0; i < 31; i++)
int i, pow2Strides[31];
for (i = 0; i < 31; i++)
pow2Strides[i] = 1<<i;
int pow2SelStrides[3] = {1, 1, 1};
bool foundFactor = false;
for (int i = 0; i < 3; i++)
for (i = 0; i < 3; i++)
{
for (int j = 30; j > 0; j--)
{
......@@ -227,7 +261,7 @@ avtLogicalSelection::FactorBestPowerOf2(avtLogicalSelection &pow2Sel,
if (foundFactor == false)
return false;
for (int i = 0; i < 3; i++)
for (i = 0; i < 3; i++)
{
pow2Sel.starts[i] = starts[i];
pow2Sel.stops[i] = stops[i];
......
......@@ -18,9 +18,22 @@
#pragma warning(disable:4786)
// Turn off warning about forcing value to bool 'true' or 'false'
#pragma warning(disable:4800)