Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Bing Yuan
Nektar
Commits
236cb5f9
Commit
236cb5f9
authored
Apr 05, 2017
by
Michael Turner
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/xml-output' into 'master'
Fix XML output when range flag used See merge request !761
parents
9825170f
276f930b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
0 deletions
+21
-0
CHANGELOG.md
CHANGELOG.md
+3
-0
library/SpatialDomains/MeshGraph.cpp
library/SpatialDomains/MeshGraph.cpp
+6
-0
utilities/FieldConvert/CMakeLists.txt
utilities/FieldConvert/CMakeLists.txt
+1
-0
utilities/FieldConvert/Tests/cube_prismhex_range.tst
utilities/FieldConvert/Tests/cube_prismhex_range.tst
+11
-0
No files found.
CHANGELOG.md
View file @
236cb5f9
...
...
@@ -15,6 +15,9 @@ v4.4.1
**Library**
-
Remove the duplicate output of errorutil (!756)
**FieldConvert**
:
-
Fix issue with FieldConvert when range flag used (!761)
**NekMesh**
:
-
Fix memory consumption issue with Gmsh output (!747, !762)
-
Rework meshing control so that if possible viewable meshes will be dumped
...
...
library/SpatialDomains/MeshGraph.cpp
View file @
236cb5f9
...
...
@@ -1925,6 +1925,12 @@ namespace Nektar
{
stringstream
s
;
TiXmlElement
*
c
=
new
TiXmlElement
(
"C"
);
if
(
cIt
->
second
->
size
()
==
0
)
{
continue
;
}
GeometrySharedPtr
firstGeom
=
cIt
->
second
->
at
(
0
);
int
shapeDim
=
firstGeom
->
GetShapeDim
();
string
tag
=
(
shapeDim
<
m_meshDimension
)
?
...
...
utilities/FieldConvert/CMakeLists.txt
View file @
236cb5f9
...
...
@@ -24,6 +24,7 @@ ADD_NEKTAR_TEST(chan3DH1D_plane)
ADD_NEKTAR_TEST
(
chan3DH1D_stretch
)
ADD_NEKTAR_TEST
(
chan3D_probe
)
ADD_NEKTAR_TEST
(
cube_prismhex
)
ADD_NEKTAR_TEST
(
cube_prismhex_range
)
ADD_NEKTAR_TEST
(
outflow_pointdatatofld
)
ADD_NEKTAR_TEST
(
chan3D_equispacedoutput
)
ADD_NEKTAR_TEST
(
chan3D_isocontour
)
...
...
utilities/FieldConvert/Tests/cube_prismhex_range.tst
0 → 100644
View file @
236cb5f9
<?xml version="1.0" encoding="utf-8" ?>
<test>
<description>
Test XML output using a range filter
</description>
<executable>
FieldConvert
</executable>
<parameters>
-r 0,0.5,0,0.5,0,0.5 cube_prismhex.xml out.xml
</parameters>
<files>
<file
description=
"Session File"
>
cube_prismhex.xml
</file>
</files>
<metrics>
</metrics>
</test>
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