Commit 285e67f1 authored by Dave Moxey's avatar Dave Moxey

Fix a few formatting issues

parent a6635934
......@@ -1052,7 +1052,7 @@ namespace Nektar
"Output vector does not have sufficient dimensions to "
"match coordim");
for(i = 0; i < m_exp->size(); ++i)
for (i = 0; i < m_exp->size(); ++i)
{
LocalRegions::Expansion1DSharedPtr loc_exp =
boost::dynamic_pointer_cast<
......@@ -1061,7 +1061,7 @@ namespace Nektar
LocalRegions::Expansion2DSharedPtr loc_elmt =
loc_exp->GetLeftAdjacentElementExp();
int edgeNumber = loc_exp->GetLeftAdjacentElementEdge();
int edgeNumber = loc_exp->GetLeftAdjacentElementEdge();
// Get the number of points and normals for this expansion.
e_npoints = (*m_exp)[i]->GetNumPoints(0);
......
......@@ -105,7 +105,8 @@ namespace Nektar
void EulerADCFE::v_GenerateSummary(SolverUtils::SummaryList& s)
{
CompressibleFlowSystem::v_GenerateSummary(s);
SolverUtils::AddSummaryItem(s, "Problem Type", ProblemTypeMap[m_problemType]);
SolverUtils::AddSummaryItem(
s, "Problem Type", ProblemTypeMap[m_problemType]);
}
void EulerADCFE::v_SetInitialConditions(
......
......@@ -29,79 +29,82 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// Description: Euler equations in conservative variables wit artificial diffusion
// Description: Euler equations in conservative variables with artificial
// diffusion
//
///////////////////////////////////////////////////////////////////////////////
#ifndef NEKTAR_SOLVERS_COMPRESSIBLEFLOWSOLVER_EQUATIONSYSTEMS_EULERARTIFICIALDIFFUSIONCFE_H
#define NEKTAR_SOLVERS_COMPRESSIBLEFLOWSOLVER_EQUATIONSYSTEMS_EULERARTIFICIALDIFFUSIONCFE_H
#ifndef NEKTAR_SOLVERS_COMPRESSIBLEFLOWSOLVER_EQUATIONSYSTEMS_EULERADCFE_H
#define NEKTAR_SOLVERS_COMPRESSIBLEFLOWSOLVER_EQUATIONSYSTEMS_EULERADCFE_H
#include <CompressibleFlowSolver/EquationSystems/CompressibleFlowSystem.h>
namespace Nektar
{
enum ProblemType
{
eGeneral, ///< No problem defined - Default Inital data
SIZE_ProblemType ///< Length of enum list
};
enum ProblemType
{
eGeneral, ///< No problem defined - Default Inital data
SIZE_ProblemType ///< Length of enum list
};
const char* const ProblemTypeMap[] =
const char* const ProblemTypeMap[] =
{
"General"
"General"
};
/**
*
*
**/
class EulerADCFE : public CompressibleFlowSystem
{
public:
friend class MemoryManager<EulerADCFE>;
/**
*
*
**/
class EulerADCFE : public CompressibleFlowSystem
{
public:
friend class MemoryManager<EulerADCFE>;
/// Creates an instance of this class
static SolverUtils::EquationSystemSharedPtr create(
/// Creates an instance of this class
static SolverUtils::EquationSystemSharedPtr create(
const LibUtilities::SessionReaderSharedPtr& pSession)
{
SolverUtils::EquationSystemSharedPtr p = MemoryManager<EulerADCFE>::AllocateSharedPtr(pSession);
p->InitObject();
return p;
}
/// Name of class
static std::string className;
{
SolverUtils::EquationSystemSharedPtr p = MemoryManager<
EulerADCFE>::AllocateSharedPtr(pSession);
p->InitObject();
return p;
}
/// Name of class
static std::string className;
virtual ~EulerADCFE();
virtual ~EulerADCFE();
///< problem type selector
ProblemType m_problemType;
///< problem type selector
ProblemType m_problemType;
protected:
EulerADCFE(
protected:
EulerADCFE(
const LibUtilities::SessionReaderSharedPtr& pSession);
virtual void v_InitObject();
virtual void v_InitObject();
/// Print a summary of time stepping parameters.
virtual void v_GenerateSummary(SolverUtils::SummaryList& s);
/// Print a summary of time stepping parameters.
virtual void v_GenerateSummary(SolverUtils::SummaryList& s);
void DoOdeRhs(const Array<OneD, const Array<OneD, NekDouble> > &inarray,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble time);
void DoOdeRhs(
const Array<OneD, const Array<OneD, NekDouble> > &inarray,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble time);
void DoOdeProjection(const Array<OneD, const Array<OneD, NekDouble> > &inarray,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble time);
void DoOdeProjection(
const Array<OneD, const Array<OneD, NekDouble> > &inarray,
Array<OneD, Array<OneD, NekDouble> > &outarray,
const NekDouble time);
virtual void v_SetInitialConditions(NekDouble initialtime = 0.0,
bool dumpInitialConditions = true,
const int domain = 0);
private:
virtual void v_SetInitialConditions(
NekDouble initialtime = 0.0,
bool dumpInitialConditions = true,
const int domain = 0);
void SetBoundaryConditions(Array<OneD, Array<OneD, NekDouble> > &physarray, NekDouble time);
};
private:
void SetBoundaryConditions(
Array<OneD, Array<OneD, NekDouble> > &physarray, NekDouble time);
};
}
#endif
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