Commit e9009556 authored by Kilian Lackhove's avatar Kilian Lackhove

Merge branch 'master' into fix/virtual-destructors

# Conflicts:
#	CHANGELOG.md
parents 18eae346 de65c6b6
......@@ -50,7 +50,7 @@ v5.0.0
alignment (!921)
- Fix naming issue of duplicate Unit tests (!924)
- Fix warnings about missing virtual destructors in abstract classes (!932)
**NekMesh**:
- Add feature to read basic 2D geo files as CAD (!731)
- Add periodic boundary condition meshing in 2D (!733)
......@@ -79,6 +79,7 @@ v5.0.0
- Support CFI combined lines (!917)
- Order nodes in Gmsh output (!912)
- Fix manifold face curvature nodes (!913)
- Fix writing 1D surfaces (!930)
**FieldConvert**:
- Add input module for Semtex field files (!777)
......
......@@ -1032,8 +1032,7 @@ void MeshGraphXmlCompressed::WriteEdges(TiXmlElement *geomTag,
}
TiXmlElement *edgeTag =
new TiXmlElement(m_meshDimension == 1 ? "ELEMENT" : "EDGE");
string tag = m_meshDimension == 1 ? "S" : "E";
new TiXmlElement(m_meshDimension == 1 ? "S" : "EDGE");
vector<MeshEdge> edgeInfo;
......@@ -1056,7 +1055,16 @@ void MeshGraphXmlCompressed::WriteEdges(TiXmlElement *geomTag,
edgeTag->LinkEndChild(new TiXmlText(edgeStr));
geomTag->LinkEndChild(edgeTag);
if (m_meshDimension == 1)
{
TiXmlElement *tmp = new TiXmlElement("ELEMENT");
tmp->LinkEndChild(edgeTag);
geomTag->LinkEndChild(tmp);
}
else
{
geomTag->LinkEndChild(edgeTag);
}
}
void MeshGraphXmlCompressed::WriteTris(TiXmlElement *faceTag, TriGeomMap &tris)
......
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