Commit 70a3674c authored by Ken Martin's avatar Ken Martin
Browse files

merge from the main tree

parent 256ac677
......@@ -2543,3 +2543,10 @@
obj:/lib/libc-2.3.3.so
fun:__sysconf
}
{
<insert a suppression name here>
Memcheck:Overlap
fun:memcpy
obj:/usr/X11R6/lib/libXt.so.6.0
fun:_XtGetResources
}
......@@ -183,11 +183,11 @@ int MyMain(int argc, char *argv[])
}
else if (app->GetClientMode())
{ // Client server, no tiled display.
#if defined(PARAVIEW_USE_ICE_T) && defined(VTK_USE_MPI)
app->SetRenderModuleName("DeskTopRenderModule");
#else
//#if defined(PARAVIEW_USE_ICE_T) && defined(VTK_USE_MPI)
//app->SetRenderModuleName("DeskTopRenderModule");
//#else
app->SetRenderModuleName("MPIRenderModule");
#endif
//#endif
}
else
{ // Single process, or one MPI program
......
......@@ -141,9 +141,19 @@ int pvTestDriver::ProcessCommandLine(int argc, char* argv[])
fprintf(stderr, "Test With one mpi process.\n");
}
}
int i;
for(i =1; i < argc - 1; ++i)
{
if(strcmp(argv[i], "--timeout") == 0)
{
this->ArgStart = i+2;
this->TimeOut = atoi(argv[i+1]);
}
}
// check for the Other.pvs test
// This test should allow error to be in the output of the test.
for(int i =1; i < argc; ++i)
for(i =1; i < argc; ++i)
{
int len = strlen(argv[i]) - 9;
if(len > 0 && strncmp(argv[i]+len, "Other.pvs", 9) == 0)
......
......@@ -35,7 +35,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVCompositePartDisplay);
vtkCxxRevisionMacro(vtkPVCompositePartDisplay, "1.26");
vtkCxxRevisionMacro(vtkPVCompositePartDisplay, "1.26.2.1");
//----------------------------------------------------------------------------
......@@ -177,7 +177,7 @@ void vtkPVCompositePartDisplay::CreateParallelTclObjects(vtkPVApplication *pvApp
<< this->CollectID << "SetMPIMToNSocketConnection"
<< pm->GetMPIMToNSocketConnectionID()
<< vtkClientServerStream::End;
pm->SendStream(vtkProcessModule::RENDER_SERVER|vtkProcessModule::DATA_SERVER);
pm->SendStream(vtkProcessModule::CLIENT_AND_SERVERS);
}
else
{
......
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