Commit 1eaa8298 authored by Andrew Bauer's avatar Andrew Bauer
Browse files

Renaming CurrentTime to CurrentTimeValue due to windows mangling issues.

Having a method named GetCurrentTime() has a test failure for
vtkFiltersFlowPaths-HeaderTest with the error being
Windows Mangling Violation. Renaming the function name and variable
to get past that test failure.

Change-Id: I909a600c0ab41c310e83dc916176a73324d43b30
parent ca1f2ef8
......@@ -173,7 +173,7 @@ void vtkParticlePathFilter::InitializeExtraPointDataArrays(vtkPointData* outputP
void vtkParticlePathFilter::AppendToExtraPointDataArrays()
{
this->SimulationTime->InsertNextValue(this->GetCurrentTime());
this->SimulationTime->InsertNextValue(this->GetCurrentTimeValue());
}
void vtkParticlePathFilter::Finalize()
......
......@@ -116,7 +116,7 @@ vtkParticleTracerBase::vtkParticleTracerBase()
vtkDataSetAttributes::VECTORS);
this->CurrentTimeStep = 0;
this->CurrentTime = 0;
this->CurrentTimeValue = 0;
this->ForceReinjectionEveryNSteps = 0;
this->ReinjectionCounter = 0;
this->AllFixedGeometry = 1;
......@@ -360,7 +360,7 @@ int vtkParticleTracerBase::RequestUpdateExtent(
if(!this->HasCache)
{
this->CurrentTimeStep = this->StartTimeStep;
this->CurrentTime = -DBL_MAX;
this->CurrentTimeValue = -DBL_MAX;
}
}
......@@ -737,7 +737,7 @@ vtkPolyData* vtkParticleTracerBase::Execute(vtkInformationVector** inputVector)
Assert(this->CurrentTimeStep>=this->StartTimeStep);
double from = this->CurrentTimeStep==this->StartTimeStep? this->StartTime : this->GetCacheDataTime(0);
this->CurrentTime =
this->CurrentTimeValue =
this->CurrentTimeStep==this->StartTimeStep? StartTime:
(this->CurrentTimeStep==this->TerminationTimeStep? this->TerminationTime : this->GetCacheDataTime(1));
......@@ -827,7 +827,7 @@ vtkPolyData* vtkParticleTracerBase::Execute(vtkInformationVector** inputVector)
//
// Make sure the Particle Positions are initialized with Seed particles
//
if (this->StartTime==this->CurrentTime)
if (this->StartTime==this->CurrentTimeValue)
{
Assert(!this->HasCache); //shouldn't have cache if restarting
int seedPointId=0;
......@@ -839,7 +839,7 @@ vtkPolyData* vtkParticleTracerBase::Execute(vtkInformationVector** inputVector)
for (size_t i=0; i<seedSources.size(); i++)
{
this->AssignSeedsToProcessors(this->CurrentTime,seedSources[i], static_cast<int>(i), 0, this->LocalSeeds, seedPointId);
this->AssignSeedsToProcessors(this->CurrentTimeValue,seedSources[i], static_cast<int>(i), 0, this->LocalSeeds, seedPointId);
}
this->ParticleInjectionTime.Modified();
......@@ -888,7 +888,7 @@ vtkPolyData* vtkParticleTracerBase::Execute(vtkInformationVector** inputVector)
// or leaves the domain, the 'current' iterator will be deleted.
it_next = it;
it_next++;
this->IntegrateParticle(it, from, this->CurrentTime, integrator);
this->IntegrateParticle(it, from, this->CurrentTimeValue, integrator);
if (this->GetAbortExecute())
{
break;
......@@ -923,7 +923,7 @@ vtkPolyData* vtkParticleTracerBase::Execute(vtkInformationVector** inputVector)
}
bool injectionFlag(false);
if (this->CurrentTime!=this->StartTime && this->ForceReinjectionEveryNSteps>0)
if (this->CurrentTimeValue!=this->StartTime && this->ForceReinjectionEveryNSteps>0)
{
injectionFlag = (this->CurrentTimeStep - this->StartTimeStep)%this->ForceReinjectionEveryNSteps==0;
}
......@@ -941,7 +941,7 @@ vtkPolyData* vtkParticleTracerBase::Execute(vtkInformationVector** inputVector)
this->LocalSeeds.clear();
for (size_t i=0; i<seedSources.size(); i++)
{
this->AssignSeedsToProcessors(this->CurrentTime,seedSources[i], static_cast<int>(i), 0, this->LocalSeeds, seedPointId);
this->AssignSeedsToProcessors(this->CurrentTimeValue,seedSources[i], static_cast<int>(i), 0, this->LocalSeeds, seedPointId);
}
this->ParticleInjectionTime.Modified();
this->UpdateParticleList(this->LocalSeeds);
......@@ -986,7 +986,7 @@ vtkPolyData* vtkParticleTracerBase::Execute(vtkInformationVector** inputVector)
// save some locator building, by re-using them as time progresses
this->Interpolator->AdvanceOneTimeStep();
output->GetInformation()->Set(vtkDataObject::DATA_TIME_STEP(), this->CurrentTime);
output->GetInformation()->Set(vtkDataObject::DATA_TIME_STEP(), this->CurrentTimeValue);
this->ExecuteTime.Modified();
this->HasCache = true;
PRINT("Output "<<output->GetNumberOfPoints()<<" particles, "<<this->ParticleHistories.size()<<" in cache");
......@@ -1014,7 +1014,7 @@ int vtkParticleTracerBase::RequestData(
vtkInformation *outInfo = outputVector->GetInformationObject(0);
vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
if(this->HasCache && this->CurrentTime == this->TerminationTime)
if(this->HasCache && this->CurrentTimeValue == this->TerminationTime)
{
vtkDataObject* out = outInfo->Get(vtkDataObject::DATA_OBJECT());
out->ShallowCopy(this->Output);
......
......@@ -392,7 +392,7 @@ public:
void GetPointDataArrayNames(vtkDataSet* input, std::vector<std::string>& names);
vtkGetMacro(ReinjectionCounter, int);
vtkGetMacro(CurrentTime, double);
vtkGetMacro(CurrentTimeValue, double);
// Description:
// Methods to append values to existing point data arrays that may
......@@ -437,7 +437,7 @@ private:
std::vector<double> InputTimeValues;
double StartTime;
double TerminationTime;
double CurrentTime;
double CurrentTimeValue;
int StartTimeStep; //InputTimeValues[StartTimeStep] <= StartTime <= InputTimeValues[StartTimeStep+1]
int CurrentTimeStep;
......
......@@ -81,7 +81,7 @@ int vtkPParticlePathFilter::OutputParticles(vtkPolyData* particles)
this->GetInjectedStepIds(tailPD)->InsertValue(tempId, info.InjectedStepId);
this->GetErrorCodeArr(tailPD)->InsertValue(tempId, info.ErrorCode);
this->GetParticleAge(tailPD)->InsertValue(tempId, info.age);
this->SimulationTime->InsertValue(tempId, this->GetCurrentTime());
this->SimulationTime->InsertValue(tempId, this->GetCurrentTimeValue());
if(this->GetComputeVorticity())
{
......@@ -112,7 +112,7 @@ void vtkPParticlePathFilter::InitializeExtraPointDataArrays(vtkPointData* output
void vtkPParticlePathFilter::AppendToExtraPointDataArrays()
{
this->SimulationTime->InsertNextValue(this->GetCurrentTime());
this->SimulationTime->InsertNextValue(this->GetCurrentTimeValue());
}
void vtkPParticlePathFilter::Finalize()
......
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