Commit 40e47013 authored by allens's avatar allens

Clean up the PICS code to use more generic terms instead of streamline

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21623 18c085ea-50e0-402c-830e-de6fd14e8384
parent 377ba082
......@@ -67,13 +67,17 @@ avtIVPNek5000Field::avtIVPNek5000Field( vtkDataSet* dataset,
// Pick off all of the data stored with the vtk field.
// Get the number of point per spectrial elements
vtkIntArray *semVTK = (vtkIntArray *) fieldData->GetAbstractArray("Nek_SpectralElementData");
vtkIntArray *semVTK =
(vtkIntArray *) fieldData->GetAbstractArray("Nek_SpectralElementData");
sem[0] = semVTK->GetValue(0);
sem[1] = semVTK->GetValue(1);
sem[2] = semVTK->GetValue(2);
if( semVTK )
{
sem[0] = semVTK->GetValue(0);
sem[1] = semVTK->GetValue(1);
sem[2] = semVTK->GetValue(2);
std::cerr << sem[0] << " " << sem[1] << " " << sem[2] << " " << std::endl;
std::cerr << sem[0] << " " << sem[1] << " " << sem[2] << " " << std::endl;
}
// Get the numver of elements for checking the validity of the data.
......@@ -257,7 +261,40 @@ avtIVPNek5000Field::operator()( const double &t,
const avtVector &p,
avtVector &vec ) const
{
return avtIVPVTKField::operator()( t, p, vec );
return avtIVPVTKField::operator()( t, p, vec );
static int el = 0; // element
// Locate the cell that surrounds the point.
avtInterpolationWeights iw[8];
double xpt[3];
xpt[0] = p[0];
xpt[1] = p[1];
xpt[2] = p[2];
el = loc->FindCell( xpt, iw, false );
if( el < 0 )
return OUTSIDE_SPATIAL;
// The above element is based on the linear mesh not the spectral
// mess so find the first linear element of the spectral mesh.
// Note this is integer arthimetic.
el /= sem[0] * sem[1] * sem[2];
double *sem_pts = new double[sem[0] * sem[1] * sem[2] * 3];
// Get the first point from each element.
for( unsigned int i=0; i<sem[0] * sem[1] * sem[2]; ++i )
{
}
// interpolate( );
return OK;
}
......
......@@ -53,7 +53,6 @@
#include <map>
#include <vector>
// ****************************************************************************
// Class: avtIVPNek5000Field
//
......
......@@ -30,7 +30,7 @@
Absolute
FractionOfBBox
</Enum>
<Enum name="StreamlineAlgorithmType">
<Enum name="ParallelizationAlgorithmType">
LoadOnDemand
ParallelStaticDomains
MasterSlave
......@@ -68,7 +68,7 @@
1.000000
1.000000
</Field>
<Field name="streamlineDirection" label="streamlineDirection" type="enum" subtype="IntegrationDirection">
<Field name="integrationDirection" label="integrationDirection" type="enum" subtype="IntegrationDirection">
Forward
</Field>
<Field name="maxSteps" label="Maximum number of steps" type="int">
......@@ -124,10 +124,10 @@
<Field name="integrationType" label="Integrator" type="enum" subtype="IntegrationType">
DormandPrince
</Field>
<Field name="streamlineAlgorithmType" label="Streamline algorithm type" type="enum" subtype="StreamlineAlgorithmType">
<Field name="parallelizationAlgorithmType" label="Parallelization algorithm type" type="enum" subtype="ParallelizationAlgorithmType">
VisItSelects
</Field>
<Field name="maxStreamlineProcessCount" label="maxStreamlineProcessCount" type="int">
<Field name="maxProcessCount" label="maxProcessCount" type="int">
10
</Field>
<Field name="maxDomainCacheSize" label="Max domain cache" type="int">
......
This diff is collapsed.
......@@ -131,7 +131,7 @@ FTLEAttributes::ChangesRequireRecalculation(const FTLEAttributes &obj) const
termDistance != obj.termDistance ||
terminateByTime != obj.terminateByTime ||
termTime != obj.termTime ||
streamlineDirection != obj.streamlineDirection ||
integrationDirection != obj.integrationDirection ||
fieldType != obj.fieldType ||
fieldConstant != obj.fieldConstant ||
integrationType != obj.integrationType ||
......
......@@ -94,7 +94,7 @@ public:
Absolute,
FractionOfBBox
};
enum StreamlineAlgorithmType
enum ParallelizationAlgorithmType
{
LoadOnDemand,
ParallelStaticDomains,
......@@ -150,7 +150,7 @@ public:
void SetStartPosition(const double *StartPosition_);
void SetUseDataSetEnd(bool UseDataSetEnd_);
void SetEndPosition(const double *EndPosition_);
void SetStreamlineDirection(IntegrationDirection streamlineDirection_);
void SetIntegrationDirection(IntegrationDirection integrationDirection_);
void SetMaxSteps(int maxSteps_);
void SetTerminationType(TerminationType terminationType_);
void SetTerminateByDistance(bool terminateByDistance_);
......@@ -168,8 +168,8 @@ public:
void SetFieldConstant(double fieldConstant_);
void SetVelocitySource(const double *velocitySource_);
void SetIntegrationType(IntegrationType integrationType_);
void SetStreamlineAlgorithmType(StreamlineAlgorithmType streamlineAlgorithmType_);
void SetMaxStreamlineProcessCount(int maxStreamlineProcessCount_);
void SetParallelizationAlgorithmType(ParallelizationAlgorithmType parallelizationAlgorithmType_);
void SetMaxProcessCount(int maxProcessCount_);
void SetMaxDomainCacheSize(int maxDomainCacheSize_);
void SetWorkGroupSize(int workGroupSize_);
void SetPathlines(bool pathlines_);
......@@ -197,7 +197,7 @@ public:
bool GetUseDataSetEnd() const;
const double *GetEndPosition() const;
double *GetEndPosition();
IntegrationDirection GetStreamlineDirection() const;
IntegrationDirection GetIntegrationDirection() const;
int GetMaxSteps() const;
TerminationType GetTerminationType() const;
bool GetTerminateByDistance() const;
......@@ -216,8 +216,8 @@ public:
const double *GetVelocitySource() const;
double *GetVelocitySource();
IntegrationType GetIntegrationType() const;
StreamlineAlgorithmType GetStreamlineAlgorithmType() const;
int GetMaxStreamlineProcessCount() const;
ParallelizationAlgorithmType GetParallelizationAlgorithmType() const;
int GetMaxProcessCount() const;
int GetMaxDomainCacheSize() const;
int GetWorkGroupSize() const;
bool GetPathlines() const;
......@@ -266,10 +266,10 @@ public:
protected:
static std::string SizeType_ToString(int);
public:
static std::string StreamlineAlgorithmType_ToString(StreamlineAlgorithmType);
static bool StreamlineAlgorithmType_FromString(const std::string &, StreamlineAlgorithmType &);
static std::string ParallelizationAlgorithmType_ToString(ParallelizationAlgorithmType);
static bool ParallelizationAlgorithmType_FromString(const std::string &, ParallelizationAlgorithmType &);
protected:
static std::string StreamlineAlgorithmType_ToString(int);
static std::string ParallelizationAlgorithmType_ToString(int);
public:
static std::string TerminationType_ToString(TerminationType);
static bool TerminationType_FromString(const std::string &, TerminationType &);
......@@ -299,7 +299,7 @@ public:
ID_StartPosition,
ID_UseDataSetEnd,
ID_EndPosition,
ID_streamlineDirection,
ID_integrationDirection,
ID_maxSteps,
ID_terminationType,
ID_terminateByDistance,
......@@ -317,8 +317,8 @@ public:
ID_fieldConstant,
ID_velocitySource,
ID_integrationType,
ID_streamlineAlgorithmType,
ID_maxStreamlineProcessCount,
ID_parallelizationAlgorithmType,
ID_maxProcessCount,
ID_maxDomainCacheSize,
ID_workGroupSize,
ID_pathlines,
......@@ -345,7 +345,7 @@ private:
double StartPosition[3];
bool UseDataSetEnd;
double EndPosition[3];
int streamlineDirection;
int integrationDirection;
int maxSteps;
int terminationType;
bool terminateByDistance;
......@@ -363,8 +363,8 @@ private:
double fieldConstant;
double velocitySource[3];
int integrationType;
int streamlineAlgorithmType;
int maxStreamlineProcessCount;
int parallelizationAlgorithmType;
int maxProcessCount;
int maxDomainCacheSize;
int workGroupSize;
bool pathlines;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -102,7 +102,7 @@ class QvisFTLEWindow : public QvisOperatorWindow
void fieldTypeChanged(int val);
void fieldConstantProccessText();
void integrationTypeChanged(int val);
void streamlineAlgorithmChanged(int val);
void directionTypeChanged(int val);
void maxStepLengthProcessText();
void maxTimeStepProcessText();
......@@ -117,6 +117,7 @@ class QvisFTLEWindow : public QvisOperatorWindow
void absTolSizeTypeChanged(int);
void velocitySourceProcessText();
void parallelAlgorithmChanged(int val);
void maxSLCountChanged(int val);
void maxDomainCacheChanged(int val);
void workGroupSizeChanged(int val);
......@@ -126,14 +127,14 @@ class QvisFTLEWindow : public QvisOperatorWindow
void pathlineOverrideStartingTimeProcessText();
void pathlineCMFEButtonGroupChanged(int val);
void forceNodalChanged(bool);
void limitMaxTimeStepChanged(bool);
void issueWarningForMaxStepsChanged(bool);
void issueWarningForStiffnessChanged(bool);
void issueWarningForCriticalPointsChanged(bool);
void criticalPointThresholdProcessText();
void forceNodalChanged(bool);
void limitMaxTimeStepChanged(bool);
private:
int plotType;
QComboBox *sourceType;
......@@ -166,22 +167,10 @@ class QvisFTLEWindow : public QvisOperatorWindow
QLineEdit *velocitySource;
QLabel *velocitySourceLabel;
QButtonGroup *icButtonGroup;
QCheckBox *pathlineOverrideStartingTimeFlag;
QLineEdit *pathlineOverrideStartingTime;
QButtonGroup *pathlineCMFEButtonGroup;
QComboBox *fieldType;
QLabel *fieldConstantLabel;
QLineEdit *fieldConstant;
QComboBox *integrationType;
QLabel *slAlgoLabel;
QComboBox *slAlgo;
QLabel *maxSLCountLabel;
QSpinBox *maxSLCount;
QLabel *maxDomainCacheLabel;
QSpinBox *maxDomainCache;
QLabel *workGroupSizeLabel;
QSpinBox *workGroupSize;
QComboBox *displayReferenceType;
QLabel *displayLabel;
......@@ -190,6 +179,19 @@ class QvisFTLEWindow : public QvisOperatorWindow
QLineEdit *displayBeginEdit;
QLineEdit *displayEndEdit;
QLabel *parallelAlgoLabel;
QComboBox *parallelAlgo;
QLabel *maxSLCountLabel;
QSpinBox *maxSLCount;
QLabel *maxDomainCacheLabel;
QSpinBox *maxDomainCache;
QLabel *workGroupSizeLabel;
QSpinBox *workGroupSize;
QButtonGroup *icButtonGroup;
QCheckBox *pathlineOverrideStartingTimeFlag;
QLineEdit *pathlineOverrideStartingTime;
QButtonGroup *pathlineCMFEButtonGroup;
QCheckBox *issueWarningForMaxSteps;
QCheckBox *issueWarningForStiffness;
......
......@@ -163,17 +163,17 @@ avtFTLEFilter::SetAtts(const AttributeGroup *a)
atts.GetPathlinesOverrideStartingTime(),
CMFEType);
SetIntegrationDirection(atts.GetStreamlineDirection());
SetIntegrationDirection(atts.GetIntegrationDirection());
SetFieldType(atts.GetFieldType());
SetFieldConstant(atts.GetFieldConstant());
SetVelocitySource(atts.GetVelocitySource());
SetIntegrationType(atts.GetIntegrationType());
SetStreamlineAlgorithm(atts.GetStreamlineAlgorithmType(),
atts.GetMaxStreamlineProcessCount(),
atts.GetMaxDomainCacheSize(),
atts.GetWorkGroupSize());
SetParallelizationAlgorithm(atts.GetParallelizationAlgorithmType(),
atts.GetMaxProcessCount(),
atts.GetMaxDomainCacheSize(),
atts.GetWorkGroupSize());
if (atts.GetIntegrationType() == FTLEAttributes::DormandPrince)
{
......@@ -403,10 +403,10 @@ avtFTLEFilter::GetInitialLocations()
// ****************************************************************************
// Method: avtStreamlineFilter::SetTermination
// Method: avtFTLEFilter::SetTermination
//
// Purpose:
// Sets the termination criteria for a streamline.
// Sets the termination criteria for an integral curve.
//
// Programmer: Hank Childs
// Creation: October 5, 2010
......@@ -488,10 +488,10 @@ avtFTLEFilter::CreateIntegralCurve(const avtIVPSolver* model,
// ****************************************************************************
// Method: avtStreamlineFilter::SetVelocitySource
// Method: avtFTLEFilter::SetVelocitySource
//
// Purpose:
// Sets the streamline point source.
// Sets the integral curve velocity source.
//
// Arguments:
// vel : The velocity of the point.
......@@ -1217,8 +1217,6 @@ void
avtFTLEFilter::PreExecute(void)
{
SetActiveVariable(outVarName.c_str());
SetStreamlineAlgorithm(STREAMLINE_VISIT_SELECTS, 10, 3, 10);
GetSpatialExtents(global_bounds);
if (GetInput()->GetInfo().GetAttributes().GetSpatialDimension() == 2)
......@@ -1400,7 +1398,7 @@ avtFTLEFilter::CreateResampledCacheString(void)
(atts.GetPathlines() == true ? "unsteady" : "steady");
const char *directionString =
(atts.GetStreamlineDirection() == FTLEAttributes::Forward ? "forward" : "backward");
(atts.GetIntegrationDirection() == FTLEAttributes::Forward ? "forward" : "backward");
char str[1024];
sprintf(str, "FTLE_OF_%s_BOUNDS_%f_%f_%f_%f_%f_%f_RESOLUTION_%d_%d_%d_TERM_TYPE_%s_INTEGRATION_%f_timeindex_%d_FLOW_TYPE_%s_DIRECTION_%s",
......@@ -1449,7 +1447,7 @@ avtFTLEFilter::CreateNativeResolutionCacheString(void)
(atts.GetPathlines() == true ? "unsteady" : "steady");
const char *directionString =
(atts.GetStreamlineDirection() == FTLEAttributes::Forward ? "forward" : "backward");
(atts.GetIntegrationDirection() == FTLEAttributes::Forward ? "forward" : "backward");
char str[1024];
sprintf(str, "FTLE_OF_%s_BOUNDS_%f_%f_%f_%f_%f_%f_TERM_TYPE_%s_INTEGRATION_%f_timeindex_%d_FLOW_TYPE_%s_DIRECTION_%s",
......
......@@ -27,7 +27,7 @@
Leapfrog
DormandPrince
AdamsBashforth
Reserved_4
RK4
M3DC12DIntegrator
</Enum>
<Enum name="SizeType">
......@@ -81,10 +81,15 @@
WindingPointOrder
WindingPointOrderModulo
</Enum>
<Enum name="StreamlineAlgorithmType">
<Enum name="ParallelizationAlgorithmType">
LoadOnDemand
ParallelStaticDomains
MasterSlave
VisItSelects
</Enum>
<Enum name="PathlinesCMFE">
CONN_CMFE
POS_CMFE
</Enum>
<Enum name="PointType">
Box
......@@ -111,7 +116,7 @@
<Field name="puncturePlane" label="Puncture Plane" type="enum" subtype="PuncturePlaneType">
Poloidal
</Field>
<Field name="sourceType" label="Streamline Source" type="enum" subtype="SourceType">
<Field name="sourceType" label="Source" type="enum" subtype="SourceType">
SpecifiedPoint
</Field>
<Field name="pointSource" label="Point Source" type="doubleArray" length="3" enabler="sourceType:SpecifiedPoint">
......@@ -135,6 +140,9 @@
<Field name="fieldType" label="Field" type="enum" subtype="FieldType">
Default
</Field>
<Field name="forceNodeCenteredData" label="forceNodeCenteredData" type="bool">
false
</Field>
<Field name="fieldConstant" label="Constant" type="double" subtype="FieldConstant">
1.0
</Field>
......@@ -299,10 +307,10 @@
<Field name="lightingFlag" label="Lighting" type="bool">
true
</Field>
<Field name="streamlineAlgorithmType" label="Streamline algorithm type" type="enum" subtype="StreamlineAlgorithmType">
LoadOnDemand
<Field name="parallelizationAlgorithmType" label="Parallelization algorithm type" type="enum" subtype="ParallelizationAlgorithmType">
VisItSelects
</Field>
<Field name="maxStreamlineProcessCount" label="maxStreamlineProcessCount" type="int">
<Field name="maxProcessCount" label="maxProcessCount" type="int">
10
</Field>
<Field name="maxDomainCacheSize" label="Max domain cache" type="int">
......@@ -311,9 +319,35 @@
<Field name="workGroupSize" label="Work group size" type="int">
32
</Field>
<Field name="forceNodeCenteredData" label="forceNodeCenteredData" type="bool">
<Field name="pathlines" label="Do pathlines" type="bool">
false
</Field>
<Field name="pathlinesOverrideStartingTimeFlag" label="Override Starting Time" type="bool" enabler="pathlines:true">
false
</Field>
<Field name="pathlinesOverrideStartingTime" label="Starting Time" type="double" enabler="pathlines:true">
0.000000
</Field>
<Field name="pathlinesCMFE" label="CMFE" type="enum" subtype="PathlinesCMFE">
POS_CMFE
</Field>
<Field name="issueTerminationWarnings" label="Issue Warning When Termination Criteria Is Not Met" type="bool">
true
</Field>
<Field name="issueStiffnessWarnings" label="Issue warnings when stiffness is encountered" type="bool">
true
</Field>
<Field name="issueCriticalPointsWarnings" label="Issue warnings when critical points are reached" type="bool">
true
</Field>
<Field name="criticalPointThreshold" label="criticalPointThreshold" type="double" enabler="issueCriticalPointsWarnings:true">
0.001000
</Field>
<Function name="CopyAttributes" user="false" member="true">
</Function>
<Function name="CreateCompatible" user="false" member="true">
......
This diff is collapsed.
......@@ -81,7 +81,7 @@ public:
Leapfrog,
DormandPrince,
AdamsBashforth,
Reserved_4,
RK4,
M3DC12DIntegrator
};
enum SizeType
......@@ -144,11 +144,17 @@ public:
WindingPointOrder,
WindingPointOrderModulo
};
enum StreamlineAlgorithmType
enum ParallelizationAlgorithmType
{
LoadOnDemand,
ParallelStaticDomains,
MasterSlave
MasterSlave,
VisItSelects
};
enum PathlinesCMFE
{
CONN_CMFE,
POS_CMFE
};
enum PointType
{
......@@ -207,6 +213,7 @@ public:
void SetLineEnd(const double *lineEnd_);
void SetPointDensity(int pointDensity_);
void SetFieldType(FieldType fieldType_);
void SetForceNodeCenteredData(bool forceNodeCenteredData_);
void SetFieldConstant(double fieldConstant_);
void SetVelocitySource(const double *velocitySource_);
void SetIntegrationType(IntegrationType integrationType_);
......@@ -260,11 +267,18 @@ public:
void SetPointType(PointType pointType_);
void SetLegendFlag(bool legendFlag_);
void SetLightingFlag(bool lightingFlag_);
void SetStreamlineAlgorithmType(StreamlineAlgorithmType streamlineAlgorithmType_);
void SetMaxStreamlineProcessCount(int maxStreamlineProcessCount_);
void SetParallelizationAlgorithmType(ParallelizationAlgorithmType parallelizationAlgorithmType_);
void SetMaxProcessCount(int maxProcessCount_);
void SetMaxDomainCacheSize(int maxDomainCacheSize_);
void SetWorkGroupSize(int workGroupSize_);
void SetForceNodeCenteredData(bool forceNodeCenteredData_);
void SetPathlines(bool pathlines_);
void SetPathlinesOverrideStartingTimeFlag(bool pathlinesOverrideStartingTimeFlag_);
void SetPathlinesOverrideStartingTime(double pathlinesOverrideStartingTime_);
void SetPathlinesCMFE(PathlinesCMFE pathlinesCMFE_);
void SetIssueTerminationWarnings(bool issueTerminationWarnings_);
void SetIssueStiffnessWarnings(bool issueStiffnessWarnings_);
void SetIssueCriticalPointsWarnings(bool issueCriticalPointsWarnings_);
void SetCriticalPointThreshold(double criticalPointThreshold_);
// Property getting methods
Opacity GetOpacityType() const;
......@@ -281,6 +295,7 @@ public:
double *GetLineEnd();
int GetPointDensity() const;
FieldType GetFieldType() const;
bool GetForceNodeCenteredData() const;
double GetFieldConstant() const;
const double *GetVelocitySource() const;
double *GetVelocitySource();
......@@ -338,11 +353,18 @@ public:
PointType GetPointType() const;
bool GetLegendFlag() const;
bool GetLightingFlag() const;
StreamlineAlgorithmType GetStreamlineAlgorithmType() const;
int GetMaxStreamlineProcessCount() const;
ParallelizationAlgorithmType GetParallelizationAlgorithmType() const;
int GetMaxProcessCount() const;
int GetMaxDomainCacheSize() const;
int GetWorkGroupSize() const;
bool GetForceNodeCenteredData() const;
bool GetPathlines() const;
bool GetPathlinesOverrideStartingTimeFlag() const;
double GetPathlinesOverrideStartingTime() const;
PathlinesCMFE GetPathlinesCMFE() const;
bool GetIssueTerminationWarnings() const;
bool GetIssueStiffnessWarnings() const;
bool GetIssueCriticalPointsWarnings() const;
double GetCriticalPointThreshold() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -409,10 +431,15 @@ public:
protected:
static std::string DataValue_ToString(int);
public:
static std::string StreamlineAlgorithmType_ToString(StreamlineAlgorithmType);
static bool StreamlineAlgorithmType_FromString(const std::string &, StreamlineAlgorithmType &);
static std::string ParallelizationAlgorithmType_ToString(ParallelizationAlgorithmType);
static bool ParallelizationAlgorithmType_FromString(const std::string &, ParallelizationAlgorithmType &);
protected:
static std::string StreamlineAlgorithmType_ToString(int);
static std::string ParallelizationAlgorithmType_ToString(int);
public:
static std::string PathlinesCMFE_ToString(PathlinesCMFE);
static bool PathlinesCMFE_FromString(const std::string &, PathlinesCMFE &);
protected:
static std::string PathlinesCMFE_ToString(int);
public:
static std::string PointType_ToString(PointType);
static bool PointType_FromString(const std::string &, PointType &);
......@@ -444,6 +471,7 @@ public:
ID_lineEnd,
ID_pointDensity,
ID_fieldType,
ID_forceNodeCenteredData,
ID_fieldConstant,
ID_velocitySource,
ID_integrationType,
......@@ -497,11 +525,18 @@ public:
ID_pointType,
ID_legendFlag,
ID_lightingFlag,
ID_streamlineAlgorithmType,
ID_maxStreamlineProcessCount,
ID_parallelizationAlgorithmType,
ID_maxProcessCount,
ID_maxDomainCacheSize,
ID_workGroupSize,
ID_forceNodeCenteredData,
ID_pathlines,
ID_pathlinesOverrideStartingTimeFlag,
ID_pathlinesOverrideStartingTime,
ID_pathlinesCMFE,
ID_issueTerminationWarnings,
ID_issueStiffnessWarnings,
ID_issueCriticalPointsWarnings,
ID_criticalPointThreshold,
ID__LAST
};
......@@ -517,6 +552,7 @@ private:
double lineEnd[3];
int pointDensity;
int fieldType;
bool forceNodeCenteredData;
double fieldConstant;
double velocitySource[3];
int integrationType;
......@@ -570,16 +606,23 @@ private:
int pointType;
bool legendFlag;
bool lightingFlag;
int streamlineAlgorithmType;
int maxStreamlineProcessCount;
int parallelizationAlgorithmType;
int maxProcessCount;
int maxDomainCacheSize;
int workGroupSize;
bool forceNodeCenteredData;
bool pathlines;
bool pathlinesOverrideStartingTimeFlag;
double pathlinesOverrideStartingTime;
int pathlinesCMFE;
bool issueTerminationWarnings;
bool issueStiffnessWarnings;
bool issueCriticalPointsWarnings;
double criticalPointThreshold;
// Static class format string for type map.
static const char *TypeMapFormatString;
static const private_tmfs_t TmfsStruct;
};
#define POINCAREATTRIBUTES_TMFS "idiiiiDDDiidDiidbddiddiiiiddiiiidddbbiasibibibibisbbbbbbiibdiibbiiiib"
#define POINCAREATTRIBUTES_TMFS "idiiiiDDDiibdDiidbddiddiiiiddiiiidddbbiasibibibibisbbbbbbiibdiibbiiiibbdibbbd"
#endif
This diff is collapsed.
This diff is collapsed.
......@@ -44,7 +44,7 @@
//
// Functions exposed to the VisIt module.
//
#define POINCAREATTRIBUTES_NMETH 140
#define POINCAREATTRIBUTES_NMETH 156
void PyPoincareAttributes_StartUp(PoincareAttributes *subj, void *data);
void PyPoincareAttributes_CloseDown();
PyMethodDef * PyPoincareAttributes_GetMethodTable(int *nMethods);
......
This diff is collapsed.
......@@ -99,6 +99,7 @@ class QvisPoincarePlotWindow : public QvisPostableWindowObserver
virtual void makeDefault();
virtual void reset();
protected:
void CreateAdvancedTab(QWidget *pageAdvanced);
void UpdateWindow(bool doAll);
void GetCurrentValues(int which_widget);
void UpdateFieldAttributes();
......@@ -169,10 +170,22 @@ class QvisPoincarePlotWindow : public QvisPostableWindowObserver
void show1DPlotsChanged(bool val);
void legendToggled(bool val);
void lightingToggled(bool val);
void streamlineAlgorithmChanged(int val);
void parallelAlgorithmChanged(int val);
void maxSLCountChanged(int val);
void maxDomainCacheChanged(int val);
void workGroupSizeChanged(int val);
void icButtonGroupChanged(int val);
void pathlineOverrideStartingTimeFlagChanged(bool val);
void pathlineOverrideStartingTimeProcessText();
void pathlineCMFEButtonGroupChanged(int val);
void issueWarningForMaxStepsChanged(bool);
void issueWarningForStiffnessChanged(bool);
void issueWarningForCriticalPointsChanged(bool);
void criticalPointThresholdProcessText();
void forceNodalChanged(bool);
private:
QTabWidget *propertyTabs;
......@@ -296,8 +309,8 @@ class QvisPoincarePlotWindow : public QvisPostableWindowObserver
QLabel *colorTableNameLabel;
QLabel *dataValueLabel;
QLabel *slAlgoLabel;
QComboBox *slAlgo;
QLabel *parallelAlgoLabel;
QComboBox *parallelAlgo;
QLabel *maxSLCountLabel;
QSpinBox *maxSLCount;
QLabel *maxDomainCacheLabel;
......@@ -305,6 +318,17 @@ class QvisPoincarePlotWindow : public QvisPostableWindowObserver
QLabel *workGroupSizeLabel;
QSpinBox *workGroupSize;
QButtonGroup *icButtonGroup;
QCheckBox *pathlineOverrideStartingTimeFlag;
QLineEdit *pathlineOverrideStartingTime;
QButtonGroup *pathlineCMFEButtonGroup;
QCheckBox *issueWarningForMaxSteps;
QCheckBox *issueWarningForStiffness;
QCheckBox *issueWarningForCriticalPoints;
QLineEdit *criticalPointThreshold;
QLabel *criticalPointThresholdLabel;
QWidget *firstTab;
QWidget *secondTab;
QWidget *thirdTab;
......
......@@ -206,9 +206,6 @@ avtPoincareFilter::avtPoincareFilter() :
//
// Modifications:
//
// Dave Pugmire, Wed May 27 15:03:42 EDT 2009
// Zero out streaminePts.
//
// ****************************************************************************
avtPoincareFilter::~avtPoincareFilter()
......@@ -317,9 +314,6 @@ avtPoincareFilter::CreateIntegralCurve( const avtIVPSolver* model,
//
// Modifications:
//