Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Nektar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
88
Issues
88
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
43
Merge Requests
43
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nektar
Nektar
Commits
e9009556
Commit
e9009556
authored
Apr 20, 2018
by
Kilian Lackhove
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into fix/virtual-destructors
# Conflicts: # CHANGELOG.md
parents
18eae346
de65c6b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
CHANGELOG.md
CHANGELOG.md
+2
-1
library/SpatialDomains/MeshGraphXmlCompressed.cpp
library/SpatialDomains/MeshGraphXmlCompressed.cpp
+11
-3
No files found.
CHANGELOG.md
View file @
e9009556
...
...
@@ -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)
...
...
library/SpatialDomains/MeshGraphXmlCompressed.cpp
View file @
e9009556
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment