Commit eac3da49 authored by hrchilds's avatar hrchilds

Eliminate some old code before making larger streamline changes


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11549 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5cdba2a9
......@@ -115,13 +115,16 @@ avtSLAlgorithm::~avtSLAlgorithm()
// Dave Pugmire, Mon Mar 23 18:33:10 EDT 2009
// Make changes for point decomposed domain databases.
//
// Hank Childs, Thu Jun 3 10:22:16 PDT 2010
// Use new name "GetCurrentLocation".
//
// ****************************************************************************
vtkDataSet *
avtSLAlgorithm::GetDomain(avtStreamlineWrapper *slSeg)
{
avtVector pt;
slSeg->GetEndPoint(pt);
slSeg->GetCurrentLocation(pt);
return GetDomain(slSeg->domain, pt.x, pt.y, pt.z);
}
......
......@@ -113,6 +113,11 @@ avtSerialSLAlgorithm::Initialize(vector<avtStreamlineWrapper *> &seedPts)
// Programmer: Dave Pugmire
// Creation: December 3, 2009
//
// Modifications:
//
// Hank Childs, Thu Jun 3 10:22:16 PDT 2010
// Use new name "GetCurrentLocation".
//
// ****************************************************************************
void
......@@ -153,7 +158,7 @@ avtSerialSLAlgorithm::AddStreamlines(vector<avtStreamlineWrapper *> &sls)
for ( int i = i0; i < i1; i++)
{
avtStreamlineWrapper *s = sls[i];
s->GetEndPoint(endPt);
s->GetCurrentLocation(endPt);
if (PointInDomain(endPt, s->domain))
activeSLs.push_back(s);
else
......
......@@ -329,6 +329,10 @@ avtStreamlineFilter::ComputeRankList(const vector<int> &domList,
//
// Mark C. Miller, Wed Apr 22 13:48:13 PDT 2009
// Changed interface to DebugStream to obtain current debug level.
//
// Hank Childs, Thu Jun 3 10:22:16 PDT 2010
// Use new name "GetCurrentLocation".
//
// ****************************************************************************
void
......@@ -336,7 +340,7 @@ avtStreamlineFilter::SetDomain(avtStreamlineWrapper *slSeg)
{
avtVector endPt;
double t;
slSeg->GetEndPoint(endPt, t);
slSeg->GetCurrentLocation(endPt, t);
double xyz[3] = {endPt.x, endPt.y, endPt.z};
int timeStep = GetTimeStep(t);
......@@ -2124,6 +2128,10 @@ avtStreamlineFilter::IntegrateDomain(avtStreamlineWrapper *slSeg,
//
// Mark C. Miller, Wed Apr 22 13:48:13 PDT 2009
// Changed interface to DebugStream to obtain current debug level.
//
// Hank Childs, Thu Jun 3 10:22:16 PDT 2010
// Use new name "GetCurrentLocation".
//
// ****************************************************************************
void
......@@ -2135,7 +2143,7 @@ avtStreamlineFilter::IntegrateStreamline(avtStreamlineWrapper *slSeg,
//Get the required domain.
avtVector pt;
slSeg->GetEndPoint(pt);
slSeg->GetCurrentLocation(pt);
vtkDataSet *ds = GetDomain(slSeg->domain, pt.x, pt.y, pt.z);
if (DebugStream::Level4())
......@@ -2578,7 +2586,8 @@ avtStreamlineFilter::CreateStreamlinesFromSeeds(std::vector<avtVector> &pts,
{
avtStreamlineWrapper *slSeg = streamlines[i];
if (DebugStream::Level5())
debug5<<"Create seed: id= "<<slSeg->id<<" dom= "<<slSeg->domain<<" pt= "<<slSeg->sl->PtStart()<<endl;
//debug5<<"Create seed: id= "<<slSeg->id<<" dom= "<<slSeg->domain<<" pt= "<<slSeg->sl->PtStart()<<endl;
debug5<<"Create seed: id= "<<slSeg->id<<" dom= "<<slSeg->domain<<endl;
}
}
......
......@@ -245,37 +245,9 @@ avtStreamlineWrapper::Serialize(MemStream::Mode mode,
<< endl;
}
// ****************************************************************************
// Method: avtStreamlineWrapper::GetStartPoint
//
// Purpose:
// Gets the starting point.
//
// Programmer: Dave Pugmire
// Creation: June 16, 2008
//
// Modifications:
//
// Dave Pugmire, Tue Mar 10 12:41:11 EDT 2009
// Generalized domain to include domain/time. Pathine cleanup.
//
// Dave Pugmire, Tue Dec 1 11:50:18 EST 2009
// Switch from avtVec to avtVector.
//
// ****************************************************************************
void
avtStreamlineWrapper::GetStartPoint(avtVector &pt, double &t) const
{
pt = sl->PtStart();
t = sl->TMin();
//debug5<<"avtStreamlineWrapper::GetStartPoint() = "<<pt<<" T= "<<t<<endl;
}
// ****************************************************************************
// Method: avtStreamlineWrapper::GetEndPoint
// Method: avtStreamlineWrapper::GetCurrentLocation
//
// Purpose:
// Gets the ending point.
......@@ -288,21 +260,24 @@ avtStreamlineWrapper::GetStartPoint(avtVector &pt, double &t) const
// Dave Pugmire, Mon Feb 23, 09:11:34 EST 2009
// No longer have fwd/bwd solvers.
//
// Dave Pugmire, Tue Mar 10 12:41:11 EDT 2009
// Generalized domain to include domain/time. Pathine cleanup.
// Dave Pugmire, Tue Mar 10 12:41:11 EDT 2009
// Generalized domain to include domain/time. Pathine cleanup.
//
// Dave Pugmire, Tue Dec 1 11:50:18 EST 2009
// Switch from avtVec to avtVector.
//
// Hank Childs, Thu Jun 3 09:49:43 PDT 2010
// Renamed to GetCurrentLocation.
//
// ****************************************************************************
void
avtStreamlineWrapper::GetEndPoint(avtVector &pt, double &t) const
avtStreamlineWrapper::GetCurrentLocation(avtVector &pt, double &t) const
{
sl->PtEnd(pt);
t = sl->TMax();
sl->CurrentLocation(pt);
t = sl->CurrentTime();
//debug5<<"avtStreamlineWrapper::GetEndPoint() = "<<pt<<" T= "<<t<<endl;
//debug5<<"avtStreamlineWrapper::GetCurrentLocation() = "<<pt<<" T= "<<t<<endl;
}
......
......@@ -129,6 +129,9 @@ class AVTFILTERS_API DomainType
// Dave Pugmire, Tue Feb 23 09:42:25 EST 2010
// Remove the Dir member data.
//
// Hank Childs, Thu Jun 3 10:22:16 PDT 2010
// Renamed GetEndPt to GetCurrentLocation, remove GetStartPt.
//
// ****************************************************************************
class AVTFILTERS_API avtStreamlineWrapper
......@@ -153,10 +156,9 @@ class AVTFILTERS_API avtStreamlineWrapper
void UpdateDomainCount(DomainType &dom);
void ComputeStatistics();
void GetStartPoint(avtVector &pt, double &t) const;
void GetEndPoint(avtVector &pt, double &t) const;
void GetStartPoint(avtVector &pt) const {double t; GetStartPoint(pt,t); }
void GetEndPoint(avtVector &pt) const {double t; GetEndPoint(pt,t); }
void GetCurrentLocation(avtVector &pt, double &t) const;
void GetCurrentLocation(avtVector &pt) const
{double t; GetCurrentLocation(pt,t); }
void Debug();
void Serialize(MemStream::Mode mode,
......
......@@ -60,9 +60,9 @@ const double avtStreamline::minH = 1e-9;
//
// Modifications:
//
// Dave Pugmire, Mon Feb 23, 09:11:34 EST 2009
// Reworked the termination code. Added a type enum and value. Made num steps
// a termination criterion. Code cleanup: We no longer need fwd/bwd solvers.
// Dave Pugmire, Mon Feb 23, 09:11:34 EST 2009
// Reworked the termination code. Added a type enum and value. Made num steps
// a termination criterion. Code cleanup: We no longer need fwd/bwd solvers.
//
// Dave Pugmire, Mon Jun 8 2009, 11:44:01 EDT 2009
// Remove wantVorticity, intialize scalarValueType.
......@@ -73,23 +73,24 @@ const double avtStreamline::minH = 1e-9;
// Dave Pugmire, Tue Aug 18 08:47:40 EDT 2009
// Don't record intersection points, just count them.
//
// Dave Pugmire, Tue Dec 1 11:50:18 EST 2009
// Switch from avtVec to avtVector.
// Dave Pugmire, Tue Dec 1 11:50:18 EST 2009
// Switch from avtVec to avtVector.
//
// Hank Childs, Thu Jun 3 10:58:32 PDT 2010
// Remove _t0 and _p0, which are no longer used.
//
// ****************************************************************************
avtStreamline::avtStreamline(const avtIVPSolver* model, const double& t_start,
const avtVector &p_start, int ID) :
scalarValueType(NONE)
{
_t0 = t_start;
_p0 = p_start;
id = ID;
intersectionsSet = false;
numIntersections = 0;
_ivpSolver = model->Clone();
_ivpSolver->Reset(_t0, _p0);
_ivpSolver->Reset(t_start, p_start);
}
......@@ -496,37 +497,44 @@ avtStreamline::HandleGhostZones(bool forward, double *extents)
// ****************************************************************************
// Method: avtStreamline::TMin
// Method: avtStreamline::CurrentTime
//
// Purpose:
// Returns the minimum t value.
// Returns the current t value.
//
// Programmer: Christoph Garth
// Creation: February 25, 2008
//
// Modifications:
//
// Hank Childs, Thu Jun 3 09:29:32 PDT 2010
// If we haven't taken any steps, then get the time from the solver.
// Renamed to CurrentTime.
//
// ****************************************************************************
double
avtStreamline::TMin() const
double
avtStreamline::CurrentTime() const
{
return _steps.empty() ? _t0 : (*(_steps.begin()))->tStart;
return _ivpSolver->GetCurrentT();
}
// ****************************************************************************
// Method: avtStreamline::TMax
// Method: avtStreamline::CurrentLocation
//
// Purpose:
// Returns the manimum t value.
// Sets the current location of the integration.
//
// Programmer: Christoph Garth
// Creation: February 25, 2008
// Programmer: Hank Childs
// Creation: June 3, 2010
//
// ****************************************************************************
double
avtStreamline::TMax() const
void
avtStreamline::CurrentLocation(avtVector &end)
{
return _steps.empty() ? _t0 : (*(--_steps.end()))->tEnd;
end = _ivpSolver->GetCurrentY();
}
......@@ -584,32 +592,6 @@ avtStreamline::size() const
}
// ****************************************************************************
// Method: avtStreamline::PtEnd
//
// Purpose:
// Sets the ending locations for the forward and backward integrations.
//
// Programmer: Christoph Garth
// Creation: February 25, 2008
//
// Modifications:
//
// Dave Pugmire, Mon Feb 23, 09:11:34 EST 2009
// Reworked the termination code. Added a type enum and value. Made num steps
// a termination criterion. Code cleanup: We no longer need fwd/bwd solvers.
//
// Dave Pugmire, Tue Dec 1 11:50:18 EST 2009
// Switch from avtVec to avtVector.
//
// ****************************************************************************
void
avtStreamline::PtEnd(avtVector &end)
{
end = _ivpSolver->GetCurrentY();
}
// ****************************************************************************
// Method: avtStreamline::SetIntersectionObject
//
......@@ -767,6 +749,9 @@ avtStreamline::IntersectPlane(const avtVector &p0, const avtVector &p1)
// Dave Pugmire, Thu Sep 24 13:52:59 EDT 2009
// Option to serialize steps.
//
// Hank Childs, Thu Jun 3 10:58:32 PDT 2010
// Remove _t0 and _p0, which are no longer used.
//
// ****************************************************************************
void
......@@ -776,8 +761,6 @@ avtStreamline::Serialize(MemStream::Mode mode, MemStream &buff,
{
if (DebugStream::Level5())
debug5<<" avtStreamline::Serialize "<<(mode==MemStream::READ?"READ":"WRITE")<<" serSteps= "<<serializeSteps<<endl;
buff.io(mode, _p0);
buff.io(mode, _t0);
buff.io(mode, scalarValueType);
buff.io(mode, numIntersections);
......
......@@ -126,6 +126,10 @@ class vtkObject;
// Dave Pugmire, Wed May 26 13:48:24 EDT 2010
// New return enum.
//
// Hank Childs, Thu Jun 3 10:44:46 PDT 2010
// Remove TMin, PtStart, TStart, IsForward, IsBackward, and IsBothDir.
// Rename TMax to GetCurrentTime, PtEnd to GetCurrentLocation.
//
// ****************************************************************************
class IVP_API avtStreamline
......@@ -154,17 +158,8 @@ class IVP_API avtStreamline
void SetScalarValueType(ScalarValueType t) {scalarValueType = t;}
void SetIntersectionObject(vtkObject *obj);
// Min/Max T of integrated streamlines.
double TMin() const;
double TMax() const;
avtVector PtStart() const { return _p0; }
void PtEnd(avtVector &end);
double TStart() const { return _t0; }
bool IsForward() const { return true; }
bool IsBackward() const { return false; }
bool IsBothDir() const { return false; }
double CurrentTime() const;
void CurrentLocation(avtVector &end);
// Integration steps.
size_t size() const;
......@@ -205,10 +200,6 @@ class IVP_API avtStreamline
int numIntersections;
double intersectPlaneEq[4];
// Initial T and seed point.
double _t0;
avtVector _p0;
ScalarValueType scalarValueType;
// Solver.
......
#/d/visguests/hchilds/visit/cmake/2.6.4/linux-x86_64_gcc-4.2.4/bin/cmake
# 1. YOU MUST UPGRADE TO cmake 2.6.4 !!!! This script assumes 2.6.4 but it is unknown whether it exists on your system.
#/d/visguests/hchilds/visit/cmake/2.6.4/linux-x86_64_gcc-4.2/bin/cmake
##
## ./build_visit generated host.conf
## created: Fri Jun 5 16:25:20 PDT 2009
## ./build_visit generated host.cmake
## created: Thu Jan 14 09:13:51 PST 2010
## system: Linux hogwarts 2.6.24-24-generic #1 SMP Wed Apr 15 15:11:35 UTC 2009 x86_64 GNU/Linux
## by: hchilds
##
## Set the VISITHOME environment variable.
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /d/visguests/hchilds/visit)
SET(VISITARCH linux-x86_64_gcc-4.2.4)
SET(VISIT_VERBOSE_MAKEFILE TRUE)
SET(VISITARCH linux-x86_64_gcc-4.2)
##
## Specify the location of the mesa include files and libraries.
## Specify the location of the mesa.
##
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/mesa/6.4.2/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/mesa/7.5/${VISITARCH})
##
## Specify the location of the vtk include files and libraries.
##
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/5.0.0c/${VISITARCH}/lib/vtk-5.0)
## Specify the location of the vtk.
##
## Specify the location of cmake.
##
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/5.0.0d/${VISITARCH}/lib/vtk-5.0/)
##
## Specify the location of the qt include files and libraries.
## Specify the Qt4 binary dir.
## (qmake us used to locate & setup Qt4 dependencies)
##
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/qt/4.4.3/${VISITARCH}/bin)
##
## Specify the location of the python include and libraries.
## Specify the location of the python.
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.5/${VISITARCH})
##
## Compiler flags.
##
SET(VISIT_C_COMPILER gcc)
SET(VISIT_C_FLAGS "-m64 -fPIC")
SET(VISIT_CXX_COMPILER g++)
SET(VISIT_CXX_FLAGS "-m64 -fPIC")
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC")
##############################################################
##
## Database reader plugin support libraries
##
##############################################################
##
## Boxlib
##
##
## CFITSIO
##
##
## CGNS
##
##
## Exodus
##
##
## GDAL
##
##
## H5Part
##
##
## FastBit
##
##
## HDF4
##
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.4.2/${VISITARCH})
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.2/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz)
##
## Mili
##
##
## NetCDF
##
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf/3.6.3/${VISITARCH})
##
## SZIP
##
##
## CCMIO
##
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
##
## Silo
##
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP})
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