Commit 8dbf5969 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Tidy up calls to SolverUtils advection class.

parent a47b91e2
......@@ -53,16 +53,6 @@ namespace Nektar
{
v_InitObject(pSession, pFields);
}
void Advection::Advect(
const int nConvectiveFields,
const Array<OneD, MultiRegions::ExpListSharedPtr> &fields,
const Array<OneD, Array<OneD, NekDouble> > &advVel,
const Array<OneD, Array<OneD, NekDouble> > &inarray,
Array<OneD, Array<OneD, NekDouble> > &outarray)
{
v_Advect(nConvectiveFields, fields, advVel, inarray, outarray, 0.0);
}
void Advection::Advect(
const int nConvectiveFields,
......
......@@ -72,13 +72,6 @@ namespace Nektar
LibUtilities::SessionReaderSharedPtr pSession,
Array<OneD, MultiRegions::ExpListSharedPtr> pFields);
SOLVER_UTILS_EXPORT void Advect(
const int nConvectiveFields,
const Array<OneD, MultiRegions::ExpListSharedPtr> &fields,
const Array<OneD, Array<OneD, NekDouble> > &advVel,
const Array<OneD, Array<OneD, NekDouble> > &inarray,
Array<OneD, Array<OneD, NekDouble> > &outarray);
SOLVER_UTILS_EXPORT void Advect(
const int nConvectiveFields,
const Array<OneD, MultiRegions::ExpListSharedPtr> &fields,
......@@ -125,13 +118,6 @@ namespace Nektar
LibUtilities::SessionReaderSharedPtr pSession,
Array<OneD, MultiRegions::ExpListSharedPtr> pFields);
// virtual void v_Advect(
// const int nConvectiveFields,
// const Array<OneD, MultiRegions::ExpListSharedPtr> &fields,
// const Array<OneD, Array<OneD, NekDouble> > &advVel,
// const Array<OneD, Array<OneD, NekDouble> > &inarray,
// Array<OneD, Array<OneD, NekDouble> > &outarray)=0;
virtual void v_Advect(
const int nConvectiveFields,
const Array<OneD, MultiRegions::ExpListSharedPtr> &fields,
......
......@@ -227,7 +227,7 @@ namespace Nektar
// Compute advection term for this plane.
m_planeAdv->Advect(nConvectiveFields, m_fieldsPlane,
m_advVelPlane, m_inarrayPlane,
m_outarrayPlane);
m_outarrayPlane, time);
}
// Calculate Fourier derivative and add to final result.
......
......@@ -214,7 +214,7 @@ namespace Nektar
// RHS computation using the new advection base class
m_advection->Advect(nVariables, m_fields, m_velocity, inarray,
outarray);
outarray, time);
// Negate the RHS
for (i = 0; i < nVariables; ++i)
......
......@@ -210,7 +210,7 @@ namespace Nektar
// RHS computation using the new advection base class
m_advection->Advect(nVariables, m_fields, m_velocity,
inarray, outarray);
inarray, outarray, time);
// Negate the RHS
for (int i = 0; i < nVariables; ++i)
......
......@@ -193,7 +193,8 @@ namespace Nektar
Array<OneD, Array<OneD, NekDouble> > advVel;
// RHS computation using the new advection base class
m_advection->Advect(nVariables, m_fields, advVel, inarray, outarray);
m_advection->Advect(nVariables, m_fields, advVel, inarray,
outarray, time);
// Negate the RHS
for (i = 0; i < nVariables; ++i)
......
......@@ -122,7 +122,8 @@ namespace Nektar
Array<OneD, Array<OneD, NekDouble> > advVel;
m_advection->Advect(nvariables, m_fields, advVel, inarray, outarray);
m_advection->Advect(nvariables, m_fields, advVel, inarray,
outarray, time);
for (i = 0; i < nvariables; ++i)
{
......
......@@ -167,7 +167,8 @@ namespace Nektar
Array<OneD, Array<OneD, NekDouble> > advVel(m_spacedim);
m_advection->Advect(nvariables, m_fields, advVel, inarray, outarray);
m_advection->Advect(nvariables, m_fields, advVel, inarray,
outarray, time);
for (i = 0; i < nvariables; ++i)
{
......
......@@ -156,7 +156,8 @@ namespace Nektar
}
// Advection term in physical rhs form
m_advection->Advect(nvariables, m_fields, advVel, inarray, outarrayAdv);
m_advection->Advect(nvariables, m_fields, advVel, inarray,
outarrayAdv, time);
for (i = 0; i < nvariables; ++i)
{
......
......@@ -241,7 +241,8 @@ namespace Nektar
// Input and output in physical space
Array<OneD, Array<OneD, NekDouble> > advVel;
m_advection->Advect(nvariables, m_fields, advVel, inarray, outarray);
m_advection->Advect(nvariables, m_fields, advVel, inarray,
outarray, time);
//-------------------------------------------------------
......
......@@ -273,7 +273,8 @@ namespace Nektar
// Input and output in physical space
Array<OneD, Array<OneD, NekDouble> > advVel;
m_advection->Advect(nvariables, m_fields, advVel, inarray, outarray);
m_advection->Advect(nvariables, m_fields, advVel, inarray,
outarray, time);
//-------------------------------------------------------
......
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