Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nektar
Nektar
Commits
885e20e6
Commit
885e20e6
authored
Jan 08, 2018
by
Dave Moxey
Browse files
Fix HDF5 files so that they compile
parent
9fd5b555
Changes
3
Hide whitespace changes
Inline
Side-by-side
library/SpatialDomains/CMakeLists.txt
View file @
885e20e6
...
...
@@ -49,8 +49,8 @@ SpatialDomains.hpp
)
IF
(
NEKTAR_USE_HDF5
)
SET
(
SPATIAL_DOMAINS_HEADERS
${
SPATIAL_DOMAINS_HEADERS
}
MeshGraphHDF5.h
FieldIOHdf5.h
)
SET
(
SPATIAL_DOMAINS_SOURCES
${
SPATIAL_DOMAINS_SOURCES
}
MeshGraphHDF5.cpp
FieldIOHdf5.cpp
)
SET
(
SPATIAL_DOMAINS_HEADERS
${
SPATIAL_DOMAINS_HEADERS
}
MeshGraphHDF5.h
)
SET
(
SPATIAL_DOMAINS_SOURCES
${
SPATIAL_DOMAINS_SOURCES
}
MeshGraphHDF5.cpp
)
ENDIF
()
IF
(
NEKTAR_USE_SCOTCH
)
...
...
library/SpatialDomains/MeshGraphHDF5.cpp
View file @
885e20e6
...
...
@@ -37,7 +37,6 @@
#include "MeshGraphHDF5.h"
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <SpatialDomains/Equation.h>
#include <SpatialDomains/MeshEntities.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp>
...
...
@@ -51,18 +50,17 @@ namespace Nektar
namespace
SpatialDomains
{
MeshFileType
MeshGraphHDF5
::
className
=
std
::
string
MeshGraphHDF5
::
className
=
GetMeshGraphFactory
().
RegisterCreatorFunction
(
e
HDF5
Mesh
,
MeshGraphHDF5
::
create
,
"IO with HDF5 geometry"
);
"
HDF5
"
,
MeshGraphHDF5
::
create
,
"IO with HDF5 geometry"
);
void
MeshGraphHDF5
::
ReadGeometry
(
const
SessionReaderSharedPtr
&
pSession
,
DomainRangeShPtr
&
rng
,
bool
fillGraph
)
void
MeshGraphHDF5
::
ReadGeometry
(
DomainRangeShPtr
rng
,
bool
fillGraph
)
{
m_session
=
pSession
;
int
err
;
//we use the xml geom to find information about the HDF5 file
m_xmlGeom
=
pS
ession
->
GetElement
(
"NEKTAR/GEOMETRY"
);
m_xmlGeom
=
m_s
ession
->
GetElement
(
"NEKTAR/GEOMETRY"
);
TiXmlAttribute
*
attr
=
m_xmlGeom
->
FirstAttribute
();
m_meshPartitioned
=
false
;
m_meshDimension
=
3
;
...
...
@@ -135,6 +133,11 @@ void MeshGraphHDF5::ReadGeometry(const SessionReaderSharedPtr &pSession,
ReadDomain
();
}
void
MeshGraphHDF5
::
PartitionMesh
(
LibUtilities
::
SessionReaderSharedPtr
session
)
{
// Don't do anything yet!
}
void
MeshGraphHDF5
::
ReadVertices
()
{
string
nm
=
"vert"
;
...
...
library/SpatialDomains/MeshGraphH
df
5.h
→
library/SpatialDomains/MeshGraphH
DF
5.h
View file @
885e20e6
...
...
@@ -68,12 +68,14 @@ public:
return
MemoryManager
<
MeshGraphHDF5
>::
AllocateSharedPtr
();
}
static
MeshFileType
className
;
static
std
::
string
className
;
protected:
void
ReadGeometry
(
const
SessionReaderSharedPtr
&
pSession
,
DomainRangeShPtr
&
rng
=
NullDomainRangeShPtr
,
bool
fillGraph
=
true
);
virtual
void
ReadGeometry
(
DomainRangeShPtr
rng
,
bool
fillGraph
);
virtual
void
PartitionMesh
(
LibUtilities
::
SessionReaderSharedPtr
session
);
private:
...
...
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