Commit 30986d02 authored by Michael Turner's avatar Michael Turner

Merge branch 'fix/CFI-SciTech' into 'master'

Fix CFI code following SciTech work

See merge request !891
parents c9676155 5ad71d21
......@@ -55,6 +55,7 @@ v5.0.0
elements (!877)
- Revert triangle code to ThirdParty library (!883)
- 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)
**FieldConvert**:
......
......@@ -101,7 +101,8 @@ bool CADSystemCFI::LoadCAD()
{
if (m_verbose)
{
cout << "\tHas multibodies and instructions to mesh, this is not "
cout << "\tHas multibodies and instructions to mesh, this is "
"not "
"possible"
<< endl;
}
......@@ -125,7 +126,7 @@ bool CADSystemCFI::LoadCAD()
m_scal = 1.0;
if (model->getUnits() == cfi::UNIT_INCHES)
{
if(m_verbose)
if (m_verbose)
{
cout << "\tModel is in inches, scaling accordingly" << endl;
}
......@@ -134,7 +135,7 @@ bool CADSystemCFI::LoadCAD()
else if (model->getUnits() == cfi::UNIT_MILLIMETERS ||
model->getUnits() == cfi::UNIT_MILLIMETRES)
{
if(m_verbose)
if (m_verbose)
{
cout << "\tModel is in mm, scaling accordingly" << endl;
}
......@@ -155,6 +156,12 @@ bool CADSystemCFI::LoadCAD()
for (int i = 0; i < bodies.size(); i++)
{
// check that it is not a group of bodies
if (bodies[i]->getTopoSubtype() == cfi::SUBTYPE_COMBINED)
{
continue;
}
vector<cfi::Oriented<cfi::TopoEntity *>> *faceList =
bodies[i]->getChildList();
......
......@@ -194,7 +194,7 @@ void CFIMesh::Process()
}
}
ASSERTL0(nodes.size() == cfiIdToTypes.size(), "not all nodes marked");
WARNINGL0(nodes.size() == cfiIdToTypes.size(), "not all nodes marked");
int id = 0;
......@@ -209,17 +209,17 @@ void CFIMesh::Process()
}
}
ASSERTL0(id == nodes.size(), "not all nodes numbered");
WARNINGL0(id == nodes.size(), "not all nodes numbered");
int prefix = m_mesh->m_cad->GetNumSurf() > 100 ? 1000 : 100;
if(m_mesh->m_verbose)
if (m_mesh->m_verbose)
{
cout << "prisms " << prisms->size() << endl;
}
int nm[6] = {3, 2, 5, 0, 1, 4};
for (auto &it : * prisms)
for (auto &it : *prisms)
{
vector<NodeSharedPtr> n(6);
......@@ -240,7 +240,7 @@ void CFIMesh::Process()
m_mesh->m_element[3].push_back(E);
}
if(m_mesh->m_verbose)
if (m_mesh->m_verbose)
{
cout << "tets " << tets->size() << endl;
}
......@@ -264,7 +264,7 @@ void CFIMesh::Process()
m_mesh->m_element[3].push_back(E);
}
if(m_mesh->m_verbose)
if (m_mesh->m_verbose)
{
cout << "hexes " << hexs->size() << endl;
}
......@@ -296,7 +296,7 @@ void CFIMesh::Process()
vector<cfi::ElementDefinition> *tris =
m_model->getElements(cfi::SUBTYPE_TR3, 3);
if(m_mesh->m_verbose)
if (m_mesh->m_verbose)
{
cout << "tris " << tris->size() << endl;
}
......@@ -342,7 +342,7 @@ void CFIMesh::Process()
vector<cfi::ElementDefinition> *quads =
m_model->getElements(cfi::SUBTYPE_QU4, 4);
if(m_mesh->m_verbose)
if (m_mesh->m_verbose)
{
cout << "quads " << quads->size() << endl;
}
......@@ -409,7 +409,7 @@ void CFIMesh::Process()
vector<cfi::ElementDefinition> *beams =
m_model->getElements(cfi::SUBTYPE_BE2, 2);
if(m_mesh->m_verbose)
if (m_mesh->m_verbose)
{
cout << "beams " << beams->size() << endl;
}
......
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