Commit 6d7123ea authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Tidy formatting, removed commented-out lines.

parent 6c189bc3
......@@ -53,16 +53,17 @@ 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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time)
{
v_Advect(nConvectiveFields, fields, advVel, inarray, outarray, time);
v_Advect(nConvectiveFields, fields, advVel, inarray, outarray,
time);
}
void Advection::v_InitObject(
......
......@@ -77,7 +77,7 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time);
/**
......@@ -141,11 +141,11 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time)=0;
SOLVER_UTILS_EXPORT virtual void v_SetBaseFlow(
const Array<OneD, Array<OneD, NekDouble> > &inarray);
const Array<OneD, Array<OneD, NekDouble> > &inarray);
};
/// A shared pointer to an Advection object.
......
......@@ -191,7 +191,7 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time)
{
Array<OneD, NekDouble> tmp(m_numPoints), tmp2;
......
......@@ -37,7 +37,6 @@
#define NEKTAR_SOLVERUTILS_ADVECTION3DHOMOGENEOUS1D
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/Advection/HomogeneousRSScalar.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
......@@ -84,7 +83,7 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time);
private:
......
......@@ -799,7 +799,7 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time)
{
int i, j, n;
......
......@@ -37,7 +37,6 @@
#define NEKTAR_SOLVERUTILS_ADVECTIONFR
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
......@@ -88,7 +87,7 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time);
virtual void v_SetupMetrics(
......
......@@ -67,7 +67,7 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time)
{
int nDim = advVel.num_elements();
......
......@@ -37,7 +37,6 @@
#define NEKTAR_SOLVERUTILS_ADVECTIONNONCONSERVATIVE
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
namespace Nektar
{
......@@ -65,7 +64,7 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time);
};
}
......
......@@ -37,7 +37,6 @@
#define NEKTAR_SOLVERUTILS_ADVECTIONWEAKDG
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
namespace Nektar
{
......@@ -65,7 +64,7 @@ namespace Nektar
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,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble &time);
};
}
......
/*
* AdvectionSystem.cpp
*
* Created on: 28 May 2014
* Author: cc
*/
///////////////////////////////////////////////////////////////////////////////
//
// File: AdvectionSystem.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: Advection system
//
///////////////////////////////////////////////////////////////////////////////
#include <SolverUtils/AdvectionSystem.h>
namespace Nektar {
namespace SolverUtils {
AdvectionSystem::AdvectionSystem(const LibUtilities::SessionReaderSharedPtr& pSession)
: UnsteadySystem(pSession)
{
}
AdvectionSystem::~AdvectionSystem()
{
}
void AdvectionSystem::v_InitObject()
{
UnsteadySystem::v_InitObject();
......
......@@ -42,13 +42,14 @@
namespace Nektar {
namespace SolverUtils {
class AdvectionSystem: public UnsteadySystem
{
public:
SOLVER_UTILS_EXPORT AdvectionSystem(const LibUtilities::SessionReaderSharedPtr &pSession);
SOLVER_UTILS_EXPORT AdvectionSystem(
const LibUtilities::SessionReaderSharedPtr &pSession);
SOLVER_UTILS_EXPORT virtual ~AdvectionSystem();
SOLVER_UTILS_EXPORT virtual void v_InitObject();
AdvectionSharedPtr GetAdvObject()
......@@ -60,7 +61,7 @@ namespace Nektar {
/// Advection term
SolverUtils::AdvectionSharedPtr m_advObject;
};
typedef boost::shared_ptr<AdvectionSystem> AdvectionSystemSharedPtr;
}
}
......
......@@ -50,7 +50,6 @@
#include <MultiRegions/ExpList3DHomogeneous2D.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/Diffusion/Diffusion.h>
#include <boost/format.hpp>
......
......@@ -39,7 +39,6 @@
#include <SolverUtils/UnsteadySystem.h>
#include <SolverUtils/RiemannSolvers/RiemannSolver.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
using namespace Nektar::SolverUtils;
......
......@@ -39,7 +39,6 @@
#include <SolverUtils/UnsteadySystem.h>
#include <SolverUtils/RiemannSolvers/RiemannSolver.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
#include <SolverUtils/Diffusion/Diffusion.h>
using namespace Nektar::SolverUtils;
......
......@@ -39,7 +39,6 @@
#include <SolverUtils/UnsteadySystem.h>
#include <SolverUtils/RiemannSolvers/RiemannSolver.h>
#include <SolverUtils/AdvectionSystem.h>
/// #include <SolverUtils/Advection/Advection.h>
using namespace Nektar::SolverUtils;
......
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