Commit 895c0f70 authored by Robert Maynard's avatar Robert Maynard
Browse files

vtkRungeKutta classes now uses VTK_OVERRIDE.

parent 17e3f953
Pipeline #23222 passed with stage
......@@ -50,8 +50,9 @@ public:
// OutOfDomain = 1,
// NotInitialized = 2,
// UnexpectedValue = 3
virtual int ComputeNextStep(double* xprev, double* xnext, double t,
double& delT, double maxError, double& error)
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT,
double maxError, double& error) VTK_OVERRIDE
{
double minStep = delT;
double maxStep = delT;
......@@ -59,9 +60,9 @@ public:
return this->ComputeNextStep(xprev, 0, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
double maxError, double& error)
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
double maxError, double& error) VTK_OVERRIDE
{
double minStep = delT;
double maxStep = delT;
......@@ -69,18 +70,18 @@ public:
return this->ComputeNextStep(xprev, dxprev, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error)
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error) VTK_OVERRIDE
{
return this->ComputeNextStep(xprev, 0, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error);
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error) VTK_OVERRIDE;
protected:
vtkRungeKutta2();
......
......@@ -52,8 +52,9 @@ public:
// OutOfDomain = 1,
// NotInitialized = 2,
// UnexpectedValue = 3
virtual int ComputeNextStep(double* xprev, double* xnext, double t,
double& delT, double maxError, double& error)
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT,
double maxError, double& error) VTK_OVERRIDE
{
double minStep = delT;
double maxStep = delT;
......@@ -61,9 +62,9 @@ public:
return this->ComputeNextStep(xprev, 0, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
double maxError, double& error)
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
double maxError, double& error) VTK_OVERRIDE
{
double minStep = delT;
double maxStep = delT;
......@@ -71,24 +72,24 @@ public:
return this->ComputeNextStep(xprev, dxprev, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error)
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error) VTK_OVERRIDE
{
return this->ComputeNextStep(xprev, 0, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error);
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error) VTK_OVERRIDE;
protected:
vtkRungeKutta4();
~vtkRungeKutta4();
virtual void Initialize();
void Initialize() VTK_OVERRIDE;
double* NextDerivs[3];
private:
......
......@@ -66,8 +66,9 @@ public:
// OutOfDomain = 1,
// NotInitialized = 2,
// UnexpectedValue = 3
virtual int ComputeNextStep(double* xprev, double* xnext, double t,
double& delT, double maxError, double& error)
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT,
double maxError, double& error) VTK_OVERRIDE
{
double minStep = delT;
double maxStep = delT;
......@@ -75,9 +76,9 @@ public:
return this->ComputeNextStep(xprev, 0, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
double maxError, double& error)
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT,
double maxError, double& error) VTK_OVERRIDE
{
double minStep = delT;
double maxStep = delT;
......@@ -85,24 +86,24 @@ public:
return this->ComputeNextStep(xprev, dxprev, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error)
int ComputeNextStep(double* xprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error) VTK_OVERRIDE
{
return this->ComputeNextStep(xprev, 0, xnext, t, delT, delTActual,
minStep, maxStep, maxError, error);
}
virtual int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error);
int ComputeNextStep(double* xprev, double* dxprev, double* xnext,
double t, double& delT, double& delTActual,
double minStep, double maxStep,
double maxError, double& error) VTK_OVERRIDE;
protected:
vtkRungeKutta45();
~vtkRungeKutta45();
virtual void Initialize();
void Initialize() VTK_OVERRIDE;
// Cash-Karp parameters
static double A[5];
......
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