Commit 5b1c3e2a authored by Michael Turner's avatar Michael Turner

Merge branch 'fix/periodic-2D-peralign' into 'master'

Fix automatic peralign call in 2D periodic meshing

See merge request !888
parents 627e37fc bf1b8dc8
......@@ -57,6 +57,7 @@ v5.0.0
- Fix coinciding nodes issue with very fine meshes (!883)
- Skip CFI groups of bodies and non-numbered nodes (!891)
- Add ability to space out 2D BL nodes to better fit local target Delta (!890)
- Fix automatic peralign call in 2D periodic meshing (!888)
**FieldConvert**:
- Add input module for Semtex field files (!777)
......
......@@ -587,6 +587,22 @@ void InputMCF::Process()
}
}
// apply surface labels
for (auto &it : m_mesh->m_composite)
{
ElementSharedPtr el = it.second->m_items[0];
if (el->m_parentCAD)
{
string name = el->m_parentCAD->GetName();
if (name.size() > 0)
{
m_mesh->m_faceLabels.insert(
make_pair(el->GetTagList()[0], name));
}
}
}
ProcessComposites();
////**** Peralign ****////
if (m_2D && m_periodic.size())
{
......@@ -602,27 +618,11 @@ void InputMCF::Process()
boost::split(tmp, il, boost::is_any_of(","));
module->RegisterConfig("surf1", tmp[0]);
module->RegisterConfig("surf2", tmp[1]);
}
module->SetDefaults();
module->Process();
}
// apply surface labels
for (auto &it : m_mesh->m_composite)
{
ElementSharedPtr el = it.second->m_items[0];
if (el->m_parentCAD)
{
string name = el->m_parentCAD->GetName();
if (name.size() > 0)
{
m_mesh->m_faceLabels.insert(
make_pair(el->GetTagList()[0], name));
}
module->SetDefaults();
module->Process();
}
}
ProcessComposites();
}
}
}
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