Commit f9062237 authored by 's avatar

manifold mesh option

parent e23f455a
......@@ -180,12 +180,13 @@ void InputMCF::ParseFile(string nm)
ASSERTL0(it != information.end(), "no meshtype defined");
m_makeBL = it->second == "3DBndLayer";
m_2D = it->second == "2D";
m_manifold = it->second == "Manifold";
if (it->second == "2DBndLayer")
{
m_makeBL = true;
m_2D = true;
}
if (!m_makeBL && !m_2D)
if (!m_makeBL && !m_2D && !m_manifold)
{
ASSERTL0(it->second == "3D", "unsure on MeshType")
}
......@@ -397,36 +398,44 @@ void InputMCF::Process()
return;
}
////**** VolumeMesh ****////
module = GetModuleFactory().CreateInstance(
ModuleKey(eProcessModule, "volumemesh"), m_mesh);
if (m_makeBL)
if(m_manifold)
{
module->RegisterConfig("blsurfs", m_blsurfs);
module->RegisterConfig("blthick", m_blthick);
module->RegisterConfig("bllayers", m_bllayers);
module->RegisterConfig("blprog", m_blprog);
}
try
{
module->SetDefaults();
module->Process();
//dont want to volume mesh
m_mesh->m_expDim = 2;
}
catch (runtime_error &e)
else
{
cout << "Volume meshing has failed with message:" << endl;
cout << e.what() << endl;
cout << "The linear surface mesh be dumped as a manifold mesh"
<< endl;
m_mesh->m_expDim = 2;
m_mesh->m_element[3].clear();
ProcessVertices();
ProcessEdges();
ProcessFaces();
ProcessElements();
ProcessComposites();
return;
////**** VolumeMesh ****////
module = GetModuleFactory().CreateInstance(
ModuleKey(eProcessModule, "volumemesh"), m_mesh);
if (m_makeBL)
{
module->RegisterConfig("blsurfs", m_blsurfs);
module->RegisterConfig("blthick", m_blthick);
module->RegisterConfig("bllayers", m_bllayers);
module->RegisterConfig("blprog", m_blprog);
}
try
{
module->SetDefaults();
module->Process();
}
catch (runtime_error &e)
{
cout << "Volume meshing has failed with message:" << endl;
cout << e.what() << endl;
cout << "The linear surface mesh be dumped as a manifold mesh"
<< endl;
m_mesh->m_expDim = 2;
m_mesh->m_element[3].clear();
ProcessVertices();
ProcessEdges();
ProcessFaces();
ProcessElements();
ProcessComposites();
return;
}
}
}
......
......@@ -66,7 +66,7 @@ private:
m_nacadomain, m_periodic, m_adjustment;
bool m_makeBL, m_surfopti, m_varopti, m_refine, m_woct, m_2D, m_splitBL,
m_naca, m_adjust, m_adjustall;
m_naca, m_adjust, m_adjustall, m_manifold;
};
}
......
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