Commit 4d6b9c53 authored by Douglas Serson's avatar Douglas Serson

Changes to make extract surface work with 3DH1D expansions

parent 7aab8413
...@@ -157,6 +157,14 @@ namespace Nektar ...@@ -157,6 +157,14 @@ namespace Nektar
} }
} }
void ContField3DHomogeneous1D::v_FillBndCondFromField(void)
{
for(int n = 0; n < m_planes.num_elements(); ++n)
{
m_planes[n]->FillBndCondFromField();
}
}
/** /**
* *
*/ */
......
...@@ -73,6 +73,8 @@ namespace Nektar ...@@ -73,6 +73,8 @@ namespace Nektar
private: private:
virtual void v_ImposeDirichletConditions(Array<OneD,NekDouble>& outarray); virtual void v_ImposeDirichletConditions(Array<OneD,NekDouble>& outarray);
virtual void v_FillBndCondFromField();
/// Template method virtual forwarded for LocalToGlobal() /// Template method virtual forwarded for LocalToGlobal()
virtual void v_LocalToGlobal(void); virtual void v_LocalToGlobal(void);
......
...@@ -68,6 +68,7 @@ struct Field { ...@@ -68,6 +68,7 @@ struct Field {
Field() : m_verbose(false), Field() : m_verbose(false),
m_declareExpansionAsContField(false), m_declareExpansionAsContField(false),
m_declareExpansionAsDisContField(false), m_declareExpansionAsDisContField(false),
m_declareAsNewField(false),
m_writeBndFld(false), m_writeBndFld(false),
m_fldToBnd(false), m_fldToBnd(false),
m_addNormals(false), m_addNormals(false),
...@@ -88,6 +89,7 @@ struct Field { ...@@ -88,6 +89,7 @@ struct Field {
bool m_declareExpansionAsContField; bool m_declareExpansionAsContField;
bool m_declareExpansionAsDisContField; bool m_declareExpansionAsDisContField;
bool m_declareAsNewField;
bool m_useFFT; bool m_useFFT;
...@@ -391,6 +393,11 @@ struct Field { ...@@ -391,6 +393,11 @@ struct Field {
string var = "DefaultVar", string var = "DefaultVar",
bool NewField = false) bool NewField = false)
{ {
if (m_declareAsNewField)
{
NewField = true;
var = m_session->GetVariables()[0];
}
MultiRegions::ExpListSharedPtr tmp; MultiRegions::ExpListSharedPtr tmp;
switch (m_graph->GetMeshDimension()) switch (m_graph->GetMeshDimension())
{ {
...@@ -398,8 +405,8 @@ struct Field { ...@@ -398,8 +405,8 @@ struct Field {
{ {
if (NumHomogeneousDir == 1) if (NumHomogeneousDir == 1)
{ {
ASSERTL0(m_declareExpansionAsContField || ASSERTL0( !(m_declareExpansionAsContField ||
m_declareExpansionAsDisContField, m_declareExpansionAsDisContField),
"ContField2DHomogeneous1D or " "ContField2DHomogeneous1D or "
"DisContField2DHomogenenous1D has not been " "DisContField2DHomogenenous1D has not been "
"implemented"); "implemented");
......
...@@ -62,6 +62,7 @@ ProcessBoundaryExtract::ProcessBoundaryExtract(FieldSharedPtr f) : ProcessModule ...@@ -62,6 +62,7 @@ ProcessBoundaryExtract::ProcessBoundaryExtract(FieldSharedPtr f) : ProcessModule
f->m_writeBndFld = true; f->m_writeBndFld = true;
f->m_declareExpansionAsContField = true; f->m_declareExpansionAsContField = true;
f->m_declareAsNewField = true;
// check for correct input files // check for correct input files
if((f->m_inputfiles.count("xml") == 0)&&(f->m_inputfiles.count("xml.gz") == 0)) if((f->m_inputfiles.count("xml") == 0)&&(f->m_inputfiles.count("xml.gz") == 0))
......
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