Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nektar
Nektar
Commits
312cc844
Commit
312cc844
authored
Aug 18, 2016
by
Douglas Serson
Browse files
Adjust expansion from file to Hdf5
parent
67ed2eb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
library/LibUtilities/BasicUtils/MeshPartition.cpp
View file @
312cc844
...
...
@@ -298,10 +298,20 @@ namespace Nektar
"A filename must be specified for the FILE "
"attribute of expansion"
);
// Create fieldIO object to load file
// need a serial communicator to avoid problems with
// shared file system
CommSharedPtr
comm
=
GetCommFactory
().
CreateInstance
(
"Serial"
,
0
,
0
);
std
::
string
iofmt
=
FieldIO
::
GetFileType
(
filenameStr
,
comm
);
FieldIOSharedPtr
f
=
GetFieldIOFactory
().
CreateInstance
(
iofmt
,
comm
,
pSession
->
GetSharedFilesystem
());
// Load field definitions from file
std
::
vector
<
LibUtilities
::
FieldDefinitionsSharedPtr
>
fielddefs
;
LibUtilities
::
FieldIO
f
(
pSession
->
GetComm
());
f
.
Import
(
filenameStr
,
fielddefs
);
f
->
Import
(
filenameStr
,
fielddefs
);
// Parse field definitions
for
(
int
i
=
0
;
i
<
fielddefs
.
size
();
++
i
)
...
...
library/SpatialDomains/MeshGraph.cpp
View file @
312cc844
...
...
@@ -1067,8 +1067,10 @@ namespace Nektar
"attribute of expansion"
);
std
::
vector
<
LibUtilities
::
FieldDefinitionsSharedPtr
>
fielddefs
;
LibUtilities
::
FieldIO
f
(
m_session
->
GetComm
());
f
.
Import
(
filenameStr
,
fielddefs
);
LibUtilities
::
FieldIOSharedPtr
f
=
LibUtilities
::
FieldIO
::
CreateForFile
(
m_session
,
filenameStr
);
f
->
Import
(
filenameStr
,
fielddefs
);
SetExpansions
(
fielddefs
);
}
else
...
...
Write
Preview
Supports
Markdown
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