Commit 65750748 authored by Douglas Serson's avatar Douglas Serson

Rename ForcingNozzle to ForcingQuasi1D

parent 94d51826
......@@ -29,7 +29,7 @@ IF( NEKTAR_SOLVER_COMPRESSIBLE_FLOW )
./EquationSystems/RinglebFlow.cpp
./Filters/FilterEnergy.cpp
./Forcing/ForcingAxiSymmetric.cpp
./Forcing/ForcingNozzle.cpp
./Forcing/ForcingQuasi1D.cpp
./Misc/VariableConverter.cpp
./RiemannSolvers/AverageSolver.cpp
./RiemannSolvers/AUSM0Solver.cpp
......
......@@ -42,7 +42,7 @@ namespace Nektar
std::string ForcingAxiSymmetric::className = SolverUtils::GetForcingFactory().
RegisterCreatorFunction("AxiSymmetric",
ForcingAxiSymmetric::create,
"Forcing for axi-symmetric flow (around x=0");
"Forcing for axi-symmetric flow (around x=0)");
ForcingAxiSymmetric::ForcingAxiSymmetric(
const LibUtilities::SessionReaderSharedPtr& pSession)
......
///////////////////////////////////////////////////////////////////////////////
//
// File: ForcingNozzle.cpp
// File: ForcingQuasi1D.cpp
//
// For more information, please see: http://www.nektar.info
//
......@@ -33,24 +33,24 @@
//
///////////////////////////////////////////////////////////////////////////////
#include <CompressibleFlowSolver/Forcing/ForcingNozzle.h>
#include <CompressibleFlowSolver/Forcing/ForcingQuasi1D.h>
using namespace std;
namespace Nektar
{
std::string ForcingNozzle::className = SolverUtils::GetForcingFactory().
RegisterCreatorFunction("Nozzle",
ForcingNozzle::create,
std::string ForcingQuasi1D::className = SolverUtils::GetForcingFactory().
RegisterCreatorFunction("Quasi1D",
ForcingQuasi1D::create,
"Quasi-1D nozzle Forcing");
ForcingNozzle::ForcingNozzle(
ForcingQuasi1D::ForcingQuasi1D(
const LibUtilities::SessionReaderSharedPtr& pSession)
: Forcing(pSession)
{
}
void ForcingNozzle::v_InitObject(
void ForcingQuasi1D::v_InitObject(
const Array<OneD, MultiRegions::ExpListSharedPtr>& pFields,
const unsigned int& pNumForcingFields,
const TiXmlElement* pForce)
......@@ -60,7 +60,7 @@ void ForcingNozzle::v_InitObject(
m_session, 1);
ASSERTL0( pFields[0]->GetGraph()->GetSpaceDimension() == 1,
"NozzleForcing requires a 1D problem.");
"ForcingQuasi1D requires a 1D problem.");
const TiXmlElement* funcNameElmt = pForce->FirstChildElement("AREAFCN");
if(!funcNameElmt)
......@@ -95,7 +95,7 @@ void ForcingNozzle::v_InitObject(
}
}
void ForcingNozzle::v_Apply(
void ForcingQuasi1D::v_Apply(
const Array<OneD, MultiRegions::ExpListSharedPtr>& pFields,
const Array<OneD, Array<OneD, NekDouble> >& inarray,
Array<OneD, Array<OneD, NekDouble> >& outarray,
......
///////////////////////////////////////////////////////////////////////////////
//
// File: ForcingNozzle.h
// File: ForcingQuasi1D.h
//
// For more information, please see: http://www.nektar.info
//
......@@ -33,8 +33,8 @@
//
///////////////////////////////////////////////////////////////////////////////
#ifndef NEKTAR_SOLVERUTILS_FORCINGNOZZLE
#define NEKTAR_SOLVERUTILS_FORCINGNOZZLE
#ifndef NEKTAR_SOLVERUTILS_FORCINGQUASI1D
#define NEKTAR_SOLVERUTILS_FORCINGQUASI1D
#include <SolverUtils/Forcing/Forcing.h>
#include <CompressibleFlowSolver/Misc/VariableConverter.h>
......@@ -42,11 +42,11 @@
namespace Nektar
{
class ForcingNozzle : public SolverUtils::Forcing
class ForcingQuasi1D : public SolverUtils::Forcing
{
public:
friend class MemoryManager<ForcingNozzle>;
friend class MemoryManager<ForcingQuasi1D>;
/// Creates an instance of this class
static SolverUtils::ForcingSharedPtr create(
......@@ -56,7 +56,7 @@ class ForcingNozzle : public SolverUtils::Forcing
const TiXmlElement* pForce)
{
SolverUtils::ForcingSharedPtr p =
MemoryManager<ForcingNozzle>::
MemoryManager<ForcingQuasi1D>::
AllocateSharedPtr(pSession);
p->InitObject(pFields, pNumForcingFields, pForce);
return p;
......@@ -79,7 +79,7 @@ class ForcingNozzle : public SolverUtils::Forcing
private:
ForcingNozzle(
ForcingQuasi1D(
const LibUtilities::SessionReaderSharedPtr& pSession);
Array<OneD, NekDouble> m_geomFactor;
......
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