Commit 86639b34 authored by Douglas Serson's avatar Douglas Serson Committed by Dave Moxey

Fix for C0Projection without BCs

(cherry picked from commit 833b6107)
parent 7fe8984a
......@@ -68,6 +68,7 @@ struct Field {
Field() : m_verbose(false),
m_declareExpansionAsContField(false),
m_declareExpansionAsDisContField(false),
m_requireBoundaryExpansion(false),
m_writeBndFld(false),
m_fldToBnd(false),
m_addNormals(false),
......@@ -89,6 +90,8 @@ struct Field {
bool m_declareExpansionAsContField;
bool m_declareExpansionAsDisContField;
bool m_requireBoundaryExpansion;
bool m_useFFT;
LibUtilities::CommSharedPtr m_comm;
......@@ -402,7 +405,7 @@ struct Field {
string var = "DefaultVar",
bool NewField = false)
{
if(var.compare("DefaultVar") == 0 && m_declareExpansionAsContField)
if(var.compare("DefaultVar") == 0 && m_requireBoundaryExpansion)
{
if (m_session->GetVariables().size())
{
......
......@@ -62,6 +62,7 @@ ProcessBoundaryExtract::ProcessBoundaryExtract(FieldSharedPtr f) : ProcessModule
f->m_writeBndFld = true;
f->m_declareExpansionAsContField = true;
f->m_requireBoundaryExpansion = true;
}
......
......@@ -119,10 +119,13 @@ void ProcessC0Projection::Process(po::variables_map &vm)
{
// generate a C0 expansion field with no boundary conditions.
bool savedef = m_f->m_declareExpansionAsContField;
bool savedef2 = m_f->m_requireBoundaryExpansion;
m_f->m_declareExpansionAsContField = true;
m_f->m_requireBoundaryExpansion = false;
C0ProjectExp[0] = m_f->AppendExpList(m_f->m_fielddef[0]->m_numHomogeneousDir,
"DefaultVar",true);
m_f->m_declareExpansionAsContField = savedef;
m_f->m_requireBoundaryExpansion = savedef2;
for(int i = 1; i < nfields; ++i)
{
C0ProjectExp[i] = C0ProjectExp[0];
......
......@@ -59,6 +59,7 @@ ProcessWSS::ProcessWSS(FieldSharedPtr f) : ProcessModule(f)
m_config["addnormals"] = ConfigOption(true,"NotSet","Add normals to output");
f->m_writeBndFld = true;
f->m_declareExpansionAsContField = true;
f->m_requireBoundaryExpansion = true;
m_f->m_fldToBnd = false;
}
......
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