Commit f8d79643 authored by pugmire's avatar pugmire
Browse files

Removed some old data members.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11630 18c085ea-50e0-402c-830e-de6fd14e8384
parent 73758d20
...@@ -2131,13 +2131,7 @@ avtPICSFilter::ModifyContract(avtContract_p in_contract) ...@@ -2131,13 +2131,7 @@ avtPICSFilter::ModifyContract(avtContract_p in_contract)
out_contract->GetDataRequest()->SetDesiredGhostDataType(GHOST_ZONE_DATA); out_contract->GetDataRequest()->SetDesiredGhostDataType(GHOST_ZONE_DATA);
#ifdef PARALLEL #ifdef PARALLEL
/* //out_contract->SetReplicateSingleDomainOnAllProcessors(true);
if (numDomains == 1)
{
debug5<<"Replicate domains"<<endl;
out_contract->SetReplicateSingleDomainOnAllProcessors(true);
}
*/
#endif #endif
if (doPathlines) if (doPathlines)
......
...@@ -179,19 +179,16 @@ static float random_11() ...@@ -179,19 +179,16 @@ static float random_11()
// Dave Pugmire, Thu Jun 10 10:44:02 EDT 2010 // Dave Pugmire, Thu Jun 10 10:44:02 EDT 2010
// New seed sources. // New seed sources.
// //
// Dave Pugmire, Fri Jun 11 15:12:04 EDT 2010
// Remove seed densities.
//
// **************************************************************************** // ****************************************************************************
avtStreamlineFilter::avtStreamlineFilter() avtStreamlineFilter::avtStreamlineFilter()
{ {
pointDensity1 = 1;
pointDensity2 = 1;
pointDensity3 = 1;
coloringMethod = STREAMLINE_COLOR_SPEED; coloringMethod = STREAMLINE_COLOR_SPEED;
displayMethod = STREAMLINE_DISPLAY_LINES; displayMethod = STREAMLINE_DISPLAY_LINES;
//
// Initialize source values.
//
// //
// Initialize source values. // Initialize source values.
// //
...@@ -742,37 +739,6 @@ avtStreamlineFilter::SeedInfoString() const ...@@ -742,37 +739,6 @@ avtStreamlineFilter::SeedInfoString() const
return str; return str;
} }
// ****************************************************************************
// Method: avtStreamlineFilter::SetPointDensity
//
// Purpose:
// Sets the point density used for streamlines. The meaning depends on the
// source type.
//
// Arguments:
// den : The new point density.
//
// Programmer: Brad Whitlock
// Creation: Wed Nov 6 13:03:12 PST 2002
//
// Modifications:
//
// Dave Pugmire, Thu Dec 18 13:24:23 EST 2008
// Add 3 point density vars.
//
// ****************************************************************************
void
avtStreamlineFilter::SetPointDensity(int den)
{
pointDensity1 = (den > 0) ? den : 1;
pointDensity2 = pointDensity1;
pointDensity3 = pointDensity1;
}
// **************************************************************************** // ****************************************************************************
// Method: avtStreamlineFilter::PostExecute // Method: avtStreamlineFilter::PostExecute
// //
......
...@@ -207,6 +207,9 @@ class vtkAppendPolyData; ...@@ -207,6 +207,9 @@ class vtkAppendPolyData;
// Dave Pugmire, Thu Jun 10 10:44:02 EDT 2010 // Dave Pugmire, Thu Jun 10 10:44:02 EDT 2010
// New seed sources. // New seed sources.
// //
// Dave Pugmire, Fri Jun 11 15:12:04 EDT 2010
// Remove seed densities.
//
// **************************************************************************** // ****************************************************************************
class AVTFILTERS_API avtStreamlineFilter : virtual public avtPICSFilter class AVTFILTERS_API avtStreamlineFilter : virtual public avtPICSFilter
...@@ -247,7 +250,6 @@ class AVTFILTERS_API avtStreamlineFilter : virtual public avtPICSFilter ...@@ -247,7 +250,6 @@ class AVTFILTERS_API avtStreamlineFilter : virtual public avtPICSFilter
void SetPointListSource(const std::vector<double> &); void SetPointListSource(const std::vector<double> &);
void SetDisplayMethod(int d); void SetDisplayMethod(int d);
void SetPointDensity(int den);
void SetColoringMethod(int, const std::string &var=""); void SetColoringMethod(int, const std::string &var="");
void SetOpacityVariable(const std::string &var); void SetOpacityVariable(const std::string &var);
...@@ -258,7 +260,6 @@ class AVTFILTERS_API avtStreamlineFilter : virtual public avtPICSFilter ...@@ -258,7 +260,6 @@ class AVTFILTERS_API avtStreamlineFilter : virtual public avtPICSFilter
protected: protected:
int sourceType; int sourceType;
int displayMethod; int displayMethod;
int pointDensity1, pointDensity2, pointDensity3;
int coloringMethod; int coloringMethod;
std::string coloringVariable, opacityVariable; std::string coloringVariable, opacityVariable;
......
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