Commit ca9ab949 authored by hrchilds's avatar hrchilds

Update from March 9, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@633 18c085ea-50e0-402c-830e-de6fd14e8384
parent ca8bf152
......@@ -50,7 +50,7 @@ View2DAttributes::TriStateMode_FromString(const std::string &s, View2DAttributes
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -79,7 +79,7 @@ View2DAttributes::View2DAttributes() : AttributeSubject("DDid")
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -110,7 +110,7 @@ View2DAttributes::View2DAttributes(const View2DAttributes &obj) : AttributeSubje
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -130,7 +130,7 @@ View2DAttributes::~View2DAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -164,7 +164,7 @@ View2DAttributes::operator = (const View2DAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -201,7 +201,7 @@ View2DAttributes::operator == (const View2DAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -222,7 +222,7 @@ View2DAttributes::operator != (const View2DAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -243,7 +243,7 @@ View2DAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -271,7 +271,7 @@ View2DAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -297,7 +297,7 @@ View2DAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -324,7 +324,7 @@ View2DAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -352,7 +352,7 @@ View2DAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -412,7 +412,7 @@ View2DAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool force
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -561,7 +561,7 @@ View2DAttributes::SelectViewportCoords()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -589,7 +589,7 @@ View2DAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -617,7 +617,7 @@ View2DAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -645,7 +645,7 @@ View2DAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Tue Mar 7 11:30:08 PDT 2006
// Creation: Wed Mar 8 15:02:46 PST 2006
//
// Modifications:
//
......@@ -721,7 +721,7 @@ View2DAttributes::GetUseFullFrame(const double *limits) const
return true;
if (limits == 0)
return true;
return false;
double dlimit1 = limits[1] - limits[0];
double dlimit2 = limits[3] - limits[2];
......
......@@ -27,7 +27,7 @@ View2DAttributes::GetUseFullFrame(const double *limits) const
return true;
if (limits == 0)
return true;
return false;
double dlimit1 = limits[1] - limits[0];
double dlimit2 = limits[3] - limits[2];
......
......@@ -293,6 +293,9 @@ avtMiliFileFormat::avtMiliFileFormat(const char *fname)
//
// Mark C. Miller, Mon Jul 18 13:41:13 PDT 2005
// Free structures having to do with free nodes mesh
//
// Mark C. Miller, Wed Mar 8 08:40:55 PST 2006
// Added code to cleanse Mili subrecords
// ****************************************************************************
avtMiliFileFormat::~avtMiliFileFormat()
......@@ -324,6 +327,9 @@ avtMiliFileFormat::~avtMiliFileFormat()
}
connectivity.clear();
materials.clear();
for (i = 0; i < sub_records.size(); ++i)
for (j = 0; j < sub_records[i].size(); ++j)
mc_cleanse_subrec(&sub_records[i][j]);
//
// Reset flags to indicate the meshes needs to be read in again.
......@@ -1259,6 +1265,9 @@ avtMiliFileFormat::ReadMesh(int dom)
// Mark C. Miller, Mon Mar 6 14:25:49 PST 2006
// Added call to cleanse subrec at end of loop to fix a memory leak
//
// Mark C. Miller, Wed Mar 8 08:40:55 PST 2006
// Moved code to cleanse subrec to destructor
//
// ****************************************************************************
void
......@@ -1344,7 +1353,6 @@ avtMiliFileFormat::ValidateVariables(int dom)
mc_cleanse_st_variable(&sv);
}
mc_cleanse_subrec(&sr);
}
}
......
......@@ -186,6 +186,9 @@ c Create a moving curvilinear mesh by filling cx, cy
cy(i,j) = ((j - 1) / 99.) * 5. + sin(angle + displ)
71 continue
70 continue
c Delay a little so it's like it took more to process the cycle
call sleep(1)
write (6,*) 'Finished cycle', simcycle, ' time', simtime
......
......@@ -784,13 +784,16 @@ ViewerEngineManager::ConnectSim(const EngineKey &ek,
//
// Launch the engine.
//
typedef struct {string h; int p; string k;} SimData;
typedef struct {
string h; int p; string k;
ViewerConnectionProgressDialog *d;} SimData;
SimData simData;
// The windows compiler can't accept non aggregate types in an
// initializer list so initialize them like this:
simData.h = simHost;
simData.p = simPort;
simData.k = simSecurityKey;
simData.d = SetupConnectionProgressWindow(newEngine.proxy, ek.HostName());
newEngine.proxy->Create(ek.HostName(), chd, clientHostName,
manualSSHPort, sshPort,
......
......@@ -8034,6 +8034,14 @@ ViewerPlotList::GetWindowId() const
// Programmer: Mark C. Miller
// Creation: July 15, 2005
//
// Modifications:
//
// Mark C. Miller, Wed Mar 8 18:14:40 PST 2006
// Changed to look at only x,y (first two of the three axes) because
// in 2D plots, only 2 of the three axes matter AND, apparently, by the
// time data attributes arrive here, they have been manipulated such that
// the two being used are always the first two.
//
// ****************************************************************************
bool
ViewerPlotList::DoAllPlotsAxesHaveSameUnits() const
......@@ -8060,14 +8068,11 @@ ViewerPlotList::DoAllPlotsAxesHaveSameUnits() const
theUnits = datts.GetXUnits();
else if (datts.GetYUnits() != "")
theUnits = datts.GetYUnits();
else if (datts.GetZUnits() != "")
theUnits = datts.GetZUnits();
if (theUnits != "")
first = false;
}
if ((datts.GetXUnits() != "" && datts.GetXUnits() != theUnits) ||
(datts.GetYUnits() != "" && datts.GetYUnits() != theUnits) ||
(datts.GetZUnits() != "" && datts.GetZUnits() != theUnits))
(datts.GetYUnits() != "" && datts.GetYUnits() != theUnits))
return false;
}
}
......
......@@ -8,6 +8,7 @@
#include <RemoteProxyBase.h>
#include <LostConnectionException.h>
#include <CouldNotConnectException.h>
#include <CancelledConnectException.h>
#include <ViewerConnectionProgressDialog.h>
#include <ViewerPasswordWindow.h>
#include <ViewerSubject.h>
......@@ -669,6 +670,11 @@ ViewerServerManager::StartLauncher(const std::string &host,
// Brad Whitlock, Tue Jun 10 14:22:01 PST 2003
// I made it extract the path to VisIt from the arguments.
//
// Brad Whitlock, Thu Mar 9 10:35:40 PDT 2006
// I made it throw a CancelledConnect exception in the event that we're
// launching on a machine that shares mdserver and engine batch jobs. That
// way, if the launch was cancelled, we don't crash!
//
// ****************************************************************************
void
......@@ -679,6 +685,7 @@ ViewerServerManager::OpenWithLauncher(
bool retry = false;
int numAttempts = 0;
bool launched = false;
bool cancelled = false;
do
{
......@@ -705,10 +712,15 @@ ViewerServerManager::OpenWithLauncher(
StartLauncher(remoteHost, visitPath, dialog);
// Try to make the launcher launch the process.
launchers[remoteHost]->LaunchProcess(args);
if(launchers.find(remoteHost) == launchers.end())
cancelled = true;
else
{
launchers[remoteHost]->LaunchProcess(args);
// Indicate success.
launched = true;
}
// Indicate success.
launched = true;
retry = false;
}
CATCH(LostConnectionException)
......@@ -729,6 +741,11 @@ ViewerServerManager::OpenWithLauncher(
ENDTRY
} while(retry && numAttempts < 2);
if(cancelled)
{
EXCEPTION0(CancelledConnectException);
}
if(!launched)
{
EXCEPTION0(CouldNotConnectException);
......@@ -758,6 +775,14 @@ ViewerServerManager::OpenWithLauncher(
// Jeremy Meredith, Wed May 11 09:04:52 PDT 2005
// Added security key to simulation connection.
//
// Brad Whitlock, Thu Mar 9 10:35:40 PDT 2006
// I made it throw a CancelledConnect exception in the event that we're
// launching on a machine that shares mdserver and engine batch jobs. That
// way, if the launch was cancelled, we don't crash! I also added support
// for a connection progress dialog when launching VCL. A connection
// progress dialog for aborting the connection to the sim will take quite
// a bit more work.
//
// ****************************************************************************
void
......@@ -768,6 +793,7 @@ ViewerServerManager::SimConnectThroughLauncher(const std::string &remoteHost,
bool retry = false;
int numAttempts = 0;
bool launched = false;
bool cancelled = false;
do
{
......@@ -775,7 +801,9 @@ ViewerServerManager::SimConnectThroughLauncher(const std::string &remoteHost,
{
// We use the data argument to pass in a pointer to the connection
// progress window.
typedef struct {std::string h; int p; std::string k;} SimData;
typedef struct {
string h; int p; string k;
ViewerConnectionProgressDialog *d;} SimData;
SimData *simData = (SimData*)data;
// Search the args list and see if we've supplied the path to
......@@ -791,16 +819,21 @@ ViewerServerManager::SimConnectThroughLauncher(const std::string &remoteHost,
}
// Try to start a launcher on remoteHost.
StartLauncher(remoteHost, visitPath, NULL);
StartLauncher(remoteHost, visitPath, simData->d);
// Try to make the launcher launch the process.
launchers[remoteHost]->ConnectSimulation(args,
simData->h,
simData->p,
simData->k);
if(launchers.find(remoteHost) == launchers.end())
cancelled = true;
else
{
launchers[remoteHost]->ConnectSimulation(args,
simData->h,
simData->p,
simData->k);
// Indicate success.
launched = true;
}
// Indicate success.
launched = true;
retry = false;
}
CATCH(LostConnectionException)
......@@ -821,6 +854,11 @@ ViewerServerManager::SimConnectThroughLauncher(const std::string &remoteHost,
ENDTRY
} while(retry && numAttempts < 2);
if(cancelled)
{
EXCEPTION0(CancelledConnectException);
}
if(!launched)
{
EXCEPTION0(CouldNotConnectException);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment