Commit 0404497e authored by Bastien Jordi's avatar Bastien Jordi

Compiles and reg. tests passed

parent 83224ffa
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERUTILS_ADVECTION3DHOMOGENEOUS1D
#define NEKTAR_SOLVERUTILS_ADVECTION3DHOMOGENEOUS1D
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/Advection/HomogeneousRSScalar.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
......
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERUTILS_ADVECTIONFR
#define NEKTAR_SOLVERUTILS_ADVECTIONFR
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
......
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERUTILS_ADVECTIONNONCONSERVATIVE
#define NEKTAR_SOLVERUTILS_ADVECTIONNONCONSERVATIVE
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
namespace Nektar
{
......
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERUTILS_ADVECTIONWEAKDG
#define NEKTAR_SOLVERUTILS_ADVECTIONWEAKDG
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
namespace Nektar
{
......
SET(SOLVER_UTILS_SOURCES
Core/Misc.cpp
AdvectionSystem.cpp
Advection/Advection.cpp
Advection/AdvectionTerm.cpp
Advection/Advection3DHomogeneous1D.cpp
Advection/AdvectionFR.cpp
Advection/AdvectionNonConservative.cpp
......@@ -37,7 +39,9 @@ SET(SOLVER_UTILS_SOURCES
SET(SOLVER_UTILS_HEADERS
Core/Misc.h
AdvectionSystem.h
Advection/Advection.h
Advection/AdvectionTerm.h
Advection/AdvectionFR.h
Advection/Advection3DHomogeneous1D.h
Advection/AdvectionNonConservative.h
......
......@@ -34,6 +34,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <SolverUtils/DriverSteadyState.h>
#include <SolverUtils/AdvectionSystem.h>
namespace Nektar
......@@ -78,6 +79,13 @@ namespace Nektar
m_equ[0]->PrintSummary(out);
m_equ[0]->DoInitialise();
////////////////////////////////////////////////////////////////////////////////////////////////////////////
AdvectionSystemSharedPtr A = boost::dynamic_pointer_cast<AdvectionSystem>(m_equ[0]);
////////////////////////////////////////////////////////////////////////////////////////////////////////////
// - SFD Routine -
// Compressible case
NumVar_SFD = m_equ[0]->UpdateFields()[0]->GetCoordim(0);
......@@ -135,6 +143,11 @@ namespace Nektar
Min_MaxNormDiff_q_qBar = MaxNormDiff_q_qBar;
////////////////////////////////////////////////////////////////////////////////////////////////////////////
// A->GetAdvObject()->UpdateBaseFlow(q0);
////////////////////////////////////////////////////////////////////////////////////////////////////////////
while (max(MaxNormDiff_q_qBar, MaxNormDiff_q1_q0) > TOL)
{
//First order Splitting with exact resolution of the filters equation
......
......@@ -49,7 +49,8 @@
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/Diffusion/Diffusion.h>
#include <iostream>
......
......@@ -38,7 +38,8 @@
#include <SolverUtils/UnsteadySystem.h>
#include <SolverUtils/RiemannSolvers/RiemannSolver.h>
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
using namespace Nektar::SolverUtils;
......
......@@ -38,7 +38,8 @@
#include <SolverUtils/UnsteadySystem.h>
#include <SolverUtils/RiemannSolvers/RiemannSolver.h>
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/Diffusion/Diffusion.h>
using namespace Nektar::SolverUtils;
......
......@@ -38,7 +38,8 @@
#include <SolverUtils/UnsteadySystem.h>
#include <SolverUtils/RiemannSolvers/RiemannSolver.h>
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
using namespace Nektar::SolverUtils;
......
......@@ -38,7 +38,8 @@
#include <SolverUtils/UnsteadySystem.h>
#include <SolverUtils/RiemannSolvers/RiemannSolver.h>
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/Diffusion/Diffusion.h>
......
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERS_ADJOINTADVECTION_H
#define NEKTAR_SOLVERS_ADJOINTADVECTION_H
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/Advection/AdvectionTerm.h>
//#define TIMING
......
///////////////////////////////////////////////////////////////////////////////
//
// File AdvectionTerm.cpp
//
// For more information, please see: http://www.nektar.info
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Base class for Navier-Stokes advection term
//
///////////////////////////////////////////////////////////////////////////////
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <string>
namespace Nektar
{
AdvectionTermFactory& GetAdvectionTermFactory()
{
typedef Loki::SingletonHolder<AdvectionTermFactory,
Loki::CreateUsingNew,
Loki::NoDestroy > Type;
return Type::Instance();
}
/**
* Constructor. Creates ...
*
* \param
* \param
*/
AdvectionTerm::AdvectionTerm(
const LibUtilities::SessionReaderSharedPtr& pSession,
const SpatialDomains::MeshGraphSharedPtr& pGraph)
: m_session(pSession),
m_graph(pGraph)
{
}
void AdvectionTerm::v_InitObject()
{
// Set space dimension for use in class
m_spacedim = m_graph->GetSpaceDimension();
m_expdim = m_graph->GetMeshDimension();
// Save the basename of input file name for output details.
m_sessionName = m_session->GetFilename();
m_sessionName = m_sessionName.substr(0, m_sessionName.find_last_of("."));
if(m_session->DefinesSolverInfo("PROJECTION"))
{
std::string ProjectStr
= m_session->GetSolverInfo("PROJECTION");
if((ProjectStr == "Continuous")||(ProjectStr == "Galerkin")||
(ProjectStr == "CONTINUOUS")||(ProjectStr == "GALERKIN"))
{
m_projectionType = MultiRegions::eGalerkin;
}
else if((ProjectStr == "MixedCGDG")||(ProjectStr == "Mixed_CG_Discontinuous"))
{
m_projectionType = MultiRegions::eMixed_CG_Discontinuous;
}
else if(ProjectStr == "DisContinuous")
{
m_projectionType = MultiRegions::eDiscontinuous;
}
else
{
ASSERTL0(false,"PROJECTION value not recognised");
}
}
else
{
cerr << "Projection type not specified in SOLVERINFO,"
"defaulting to continuous Galerkin" << endl;
m_projectionType = MultiRegions::eGalerkin;
}
m_CoeffState = MultiRegions::eLocal;
m_homogen_dealiasing = false;
if(m_session->DefinesSolverInfo("DEALIASING"))
{
m_homogen_dealiasing = true;
}
m_session->MatchSolverInfo("SPECTRALHPDEALIASING","True",m_specHP_dealiasing,false);
if(m_specHP_dealiasing == false)
{
m_session->MatchSolverInfo("SPECTRALHPDEALIASING","On",m_specHP_dealiasing,false);
}
m_session->MatchSolverInfo("ModeType","SingleMode",m_SingleMode,false);
m_session->MatchSolverInfo("ModeType","HalfMode",m_HalfMode,false);
}
AdvectionTerm::~AdvectionTerm()
{
}
void AdvectionTerm::DoAdvection(Array<OneD, MultiRegions::ExpListSharedPtr> &pFields,
const int nConvectiveFields,
const Array<OneD, int> &vel_loc,
const Array<OneD, const Array<OneD, NekDouble> > &pInarray,
Array<OneD, Array<OneD, NekDouble> > &pOutarray,
NekDouble time,
Array<OneD, NekDouble> &pWk)
{
int i,j;
int VelDim = vel_loc.num_elements();
int nqtot = pFields[0]->GetTotPoints();
Array<OneD, Array<OneD, NekDouble> > velocity(VelDim);
ASSERTL1(nConvectiveFields == pInarray.num_elements(),"Number of convective fields and Inarray are not compatible");
for(i = 0; i < VelDim; ++i)
{
if(pFields[i]->GetWaveSpace() && !m_SingleMode && !m_HalfMode)
{
j = vel_loc[i];
velocity[i] = Array<OneD, NekDouble>(nqtot,0.0);
pFields[i]->HomogeneousBwdTrans(pInarray[j],velocity[i]);
}
else
{
velocity[i] = pInarray[vel_loc[i]];
}
}
DoAdvection(pFields,velocity,pInarray,pOutarray,time,pWk);
}
void AdvectionTerm::DoAdvection(Array<OneD, MultiRegions::ExpListSharedPtr> &pFields,
const Array<OneD, const Array<OneD, NekDouble> > &velocity,
const Array<OneD, const Array<OneD, NekDouble> > &pInarray,
Array<OneD, Array<OneD, NekDouble> > &pOutarray,
NekDouble time,
Array<OneD, NekDouble> &pWk)
{
int i;
int nqtot = pFields[0]->GetTotPoints();
int VelDim = velocity.num_elements();
Array<OneD, NekDouble > Deriv;
m_nConvectiveFields = pInarray.num_elements();
// Set up Derivative work space;
if(pWk.num_elements())
{
ASSERTL0(pWk.num_elements() >= nqtot*VelDim,"Workspace is not sufficient");
Deriv = pWk;
}
else
{
Deriv = Array<OneD, NekDouble> (nqtot*VelDim);
}
for(i=0; i< m_nConvectiveFields; ++i)
{
v_ComputeAdvectionTerm(pFields,velocity,pInarray[i],pOutarray[i],i,time,Deriv);
Vmath::Neg(nqtot,pOutarray[i],1);
}
}
} //end of namespace
///////////////////////////////////////////////////////////////////////////////
//
// File AdvectionTerm.h
//
// For more information, please see: http://www.nektar.info
//
// The MIT License
//
// Copyright (c) 2006 Division of Applied Mathematics, Brown University (USA),
// Department of Aeronautics, Imperial College London (UK), and Scientific
// Computing and Imaging Institute, University of Utah (USA).
//
// License for the specific language governing rights and limitations under
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Base class for Navier-Stokes advection term
//
///////////////////////////////////////////////////////////////////////////////
#ifndef NEKTAR_SOLVERS_ADVECTIONTERM_H
#define NEKTAR_SOLVERS_ADVECTIONTERM_H
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/NekFactory.hpp>
#include <LibUtilities/FFT/NektarFFT.h> // for NektarFFTSharedPtr
#include <SpatialDomains/MeshGraph.h> // for MeshGraphSharedPtr
#include <MultiRegions/ExpList.h> // for ExpListSharedPtr
namespace Nektar
{
class AdvectionTerm;
/// A shared pointer to an EquationSystem object
typedef boost::shared_ptr<AdvectionTerm> AdvectionTermSharedPtr;
/// Datatype of the NekFactory used to instantiate classes derived from
/// the EquationSystem class.
typedef LibUtilities::NekFactory<
std::string, AdvectionTerm,
const LibUtilities::SessionReaderSharedPtr&,
const SpatialDomains::MeshGraphSharedPtr&
> AdvectionTermFactory;
AdvectionTermFactory& GetAdvectionTermFactory();
/// Base class for the development of solvers.
class AdvectionTerm
{
public:
/// Destructor
virtual ~AdvectionTerm();
inline void InitObject();
/// Compute advection term
void DoAdvection(Array<OneD, MultiRegions::ExpListSharedPtr > &pFields,
const int nConvectiveFields,
const Array<OneD, int> &vel_loc,
const Array<OneD, const Array<OneD, NekDouble> > &pInarray,
Array<OneD, Array<OneD, NekDouble> > &pOutarray,
NekDouble m_time,
Array<OneD, NekDouble> &pWk = NullNekDouble1DArray);
void DoAdvection(Array<OneD, MultiRegions::ExpListSharedPtr > &pFields,
const Array<OneD, const Array<OneD, NekDouble> > &Velocity,
const Array<OneD, const Array<OneD, NekDouble> > &pInarray,
Array<OneD, Array<OneD, NekDouble> > &pOutarray,
NekDouble m_time,
Array<OneD, NekDouble> &pWk = NullNekDouble1DArray);
bool GetSpecHPDealiasing(void)
{
return m_specHP_dealiasing;
}
void SetSpecHPDealiasing(bool value)
{
m_specHP_dealiasing = value;
}
protected:
LibUtilities::SessionReaderSharedPtr m_session;
/// Name of the session
std::string m_sessionName;
/// Pointer to mesh graph
SpatialDomains::MeshGraphSharedPtr m_graph;
bool m_homogen_dealiasing; ///< flag to determine if use Fourier dealising or not
bool m_specHP_dealiasing; ///< flag to determine if use Spectral/hp element dealising or not
bool m_SingleMode; ///< Flag to determine if use single mode or not
bool m_HalfMode; ///< Flag to determine if use half mode or not
MultiRegions::CoeffState m_CoeffState;
/// Type of projection, i.e. Galerkin or DG.
enum MultiRegions::ProjectionType m_projectionType;
int m_spacedim; ///< Spatial dimension (> expansion dim)
int m_expdim; ///< Dimension of the expansion
int nvariables; ///< Number of variables
int m_nConvectiveFields; /// Number of fields to be convected;
//number of slices
int m_slices;
//period length
NekDouble m_period;
//interpolation vector
Array<OneD, Array<OneD, NekDouble> > m_interp;
//auxiliary variables for time depedent base flows
LibUtilities::NektarFFTSharedPtr m_FFT;
Array<OneD,NekDouble> m_tmpIN;
Array<OneD,NekDouble> m_tmpOUT;
bool m_useFFTW;
/// Constructor
AdvectionTerm(const LibUtilities::SessionReaderSharedPtr& pSession,
const SpatialDomains::MeshGraphSharedPtr& pGraph);
virtual void v_InitObject();
virtual void v_ComputeAdvectionTerm(Array<OneD, MultiRegions::ExpListSharedPtr > &pFields,
const Array<OneD, Array<OneD, NekDouble> > &pV,
const Array<OneD, const NekDouble> &pU,
Array<OneD, NekDouble> &pOutarray,
int pVelocityComponent,
NekDouble m_time,
Array<OneD, NekDouble> &pWk)
{
ASSERTL0(false,"This function is not defined in parent class");
};
};
inline void AdvectionTerm::InitObject()
{
v_InitObject();
}
} //end of namespace
#endif //NEKTAR_SOLVERS_AUXILIARY_ADRBASE_H
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERS_LINEARISEDADVECTION_H
#define NEKTAR_SOLVERS_LINEARISEDADVECTION_H
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/Advection/AdvectionTerm.h>
//#define TIMING
......
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERS_NAVIERSTOKESADVECTION_H
#define NEKTAR_SOLVERS_NAVIERSTOKESADVECTION_H
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/Advection/AdvectionTerm.h>
//#define TIMING
......
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERS_NOADVECTION_H
#define NEKTAR_SOLVERS_NOADVECTION_H
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/Advection/AdvectionTerm.h>
namespace Nektar
{
......
......@@ -36,7 +36,8 @@
#ifndef NEKTAR_SOLVERS_NAVIERSTOKESADVECTION_H
#define NEKTAR_SOLVERS_NAVIERSTOKESADVECTION_H
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/Advection/AdvectionTerm.h>
//#define TIMING
//#ifdef TIMING
......
......@@ -12,7 +12,7 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES )
./EquationSystems/StandardExtrapolate.cpp
./EquationSystems/SubSteppingExtrapolate.cpp
./AdvectionTerms/AdjointAdvection.cpp
./AdvectionTerms/AdvectionTerm.cpp
#./AdvectionTerms/AdvectionTerm.cpp
./AdvectionTerms/LinearisedAdvection.cpp
./AdvectionTerms/NavierStokesAdvection.cpp
./AdvectionTerms/SkewSymmetricAdvection.cpp
......
......@@ -42,7 +42,8 @@
#include <MultiRegions/ExpList.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/TimeIntegration/TimeIntegrationWrapper.h>
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/AdvectionSystem.h>
namespace Nektar
{
......
......@@ -38,7 +38,8 @@
#include <LibUtilities/TimeIntegration/TimeIntegrationWrapper.h>
#include <SolverUtils/UnsteadySystem.h>
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/AdvectionSystem.h>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <IncNavierStokesSolver/EquationSystems/Extrapolate.h>
#include <SolverUtils/Forcing/Forcing.h>
......
......@@ -42,7 +42,8 @@
#include <MultiRegions/ExpList.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/TimeIntegration/TimeIntegrationWrapper.h>
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/AdvectionSystem.h>
#include <IncNavierStokesSolver/EquationSystems/Extrapolate.h>
namespace Nektar
......
......@@ -42,7 +42,8 @@
#include <MultiRegions/ExpList.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/TimeIntegration/TimeIntegrationWrapper.h>
#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
///#include <IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.h>
#include <SolverUtils/AdvectionSystem.h>
#include <IncNavierStokesSolver/EquationSystems/Extrapolate.h>
namespace Nektar
......
......@@ -7,7 +7,7 @@ SET(CFLStepSources CFLStep.cpp
../EquationSystems/StandardExtrapolate.cpp
../EquationSystems/SubSteppingExtrapolate.cpp
../AdvectionTerms/AdjointAdvection.cpp
../AdvectionTerms/AdvectionTerm.cpp
#../AdvectionTerms/AdvectionTerm.cpp
../AdvectionTerms/LinearisedAdvection.cpp
../AdvectionTerms/NavierStokesAdvection.cpp
../AdvectionTerms/SkewSymmetricAdvection.cpp
......@@ -25,7 +25,7 @@ SET(AliasingSources Aliasing.cpp
../EquationSystems/StandardExtrapolate.cpp
../EquationSystems/SubSteppingExtrapolate.cpp
../AdvectionTerms/AdjointAdvection.cpp
../AdvectionTerms/AdvectionTerm.cpp
#../AdvectionTerms/AdvectionTerm.cpp
../AdvectionTerms/LinearisedAdvection.cpp
../AdvectionTerms/NavierStokesAdvection.cpp
../AdvectionTerms/SkewSymmetricAdvection.cpp
......
......@@ -38,7 +38,8 @@
#include <SolverUtils/UnsteadySystem.h>
#include <SolverUtils/RiemannSolvers/RiemannSolver.h>
#include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/Diffusion/Diffusion.h>
namespace Nektar
......
......@@ -13,7 +13,7 @@ IF( NEKTAR_SOLVER_VORTEXWAVE )
../IncNavierStokesSolver/EquationSystems/Extrapolate.cpp
../IncNavierStokesSolver/EquationSystems/StandardExtrapolate.cpp
../IncNavierStokesSolver/EquationSystems/SubSteppingExtrapolate.cpp
../IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.cpp
#../IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.cpp
../IncNavierStokesSolver/AdvectionTerms/NavierStokesAdvection.cpp
../IncNavierStokesSolver/AdvectionTerms/LinearisedAdvection.cpp
../IncNavierStokesSolver/AdvectionTerms/AdjointAdvection.cpp
......@@ -31,7 +31,7 @@ IF( NEKTAR_SOLVER_VORTEXWAVE )
../IncNavierStokesSolver/EquationSystems/Extrapolate.cpp
../IncNavierStokesSolver/EquationSystems/StandardExtrapolate.cpp
../IncNavierStokesSolver/EquationSystems/SubSteppingExtrapolate.cpp
../IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.cpp
#../IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.cpp
../IncNavierStokesSolver/AdvectionTerms/NavierStokesAdvection.cpp
../IncNavierStokesSolver/AdvectionTerms/LinearisedAdvection.cpp
../IncNavierStokesSolver/AdvectionTerms/AdjointAdvection.cpp
......@@ -50,7 +50,7 @@ IF( NEKTAR_SOLVER_VORTEXWAVE )
../IncNavierStokesSolver/EquationSystems/Extrapolate.cpp
../IncNavierStokesSolver/EquationSystems/StandardExtrapolate.cpp
../IncNavierStokesSolver/EquationSystems/SubSteppingExtrapolate.cpp
../IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.cpp
#../IncNavierStokesSolver/AdvectionTerms/AdvectionTerm.cpp
../IncNavierStokesSolver/AdvectionTerms/NavierStokesAdvection.cpp
../IncNavierStokesSolver/AdvectionTerms/LinearisedAdvection.cpp
../IncNavierStokesSolver/AdvectionTerms/AdjointAdvection.cpp
......