Commit f72bda92 authored by Kilian Lackhove's avatar Kilian Lackhove
Browse files

ContField1D: Adjust handling of DefaultVar in constructor to 2D/3D

parent 9f5a390e
......@@ -64,7 +64,7 @@ namespace Nektar
MULTI_REGIONS_EXPORT ContField1D(
const LibUtilities::SessionReaderSharedPtr &pSession,
const SpatialDomains::MeshGraphSharedPtr &graph1D,
const std::string &variable);
const std::string &variable = "DefaultVar");
/// Copy constructor.
MULTI_REGIONS_EXPORT ContField1D(const ContField1D &In);
......
......@@ -84,12 +84,15 @@ namespace Nektar
m_bndCondExpansions(),
m_bndConditions()
{
SpatialDomains::BoundaryConditions bcs(m_session, graph1D);
if (variable.compare("DefaultVar") != 0)
{
SpatialDomains::BoundaryConditions bcs(m_session, graph1D);
GenerateBoundaryConditionExpansion(graph1D,bcs,variable);
EvaluateBoundaryConditions(0.0, variable);
ApplyGeomInfo();
FindPeriodicVertices(bcs,variable);
GenerateBoundaryConditionExpansion(graph1D,bcs,variable);
EvaluateBoundaryConditions(0.0, variable);
ApplyGeomInfo();
FindPeriodicVertices(bcs,variable);
}
if(SetUpJustDG)
{
......@@ -455,13 +458,16 @@ namespace Nektar
ExpList1D(pSession,graph1D,domain, true,variable,SetToOneSpaceDimension),
m_bndCondExpansions(),
m_bndConditions()
{
SpatialDomains::BoundaryConditionsSharedPtr DomBCs = GetDomainBCs(domain,Allbcs,variable);
GenerateBoundaryConditionExpansion(graph1D,*DomBCs,variable);
EvaluateBoundaryConditions(0.0, variable);
ApplyGeomInfo();
FindPeriodicVertices(*DomBCs,variable);
{
if (variable.compare("DefaultVar") != 0)
{
SpatialDomains::BoundaryConditionsSharedPtr DomBCs = GetDomainBCs(domain,Allbcs,variable);
GenerateBoundaryConditionExpansion(graph1D,*DomBCs,variable);
EvaluateBoundaryConditions(0.0, variable);
ApplyGeomInfo();
FindPeriodicVertices(*DomBCs,variable);
}
SetUpDG(variable);
}
......
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