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
Jennifer Ryan
Nektar
Commits
e7f6e038
Commit
e7f6e038
authored
May 05, 2017
by
Douglas Serson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix FilterFieldConvert for Hdf5 output
parent
900acb8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
library/FieldUtils/OutputModules/OutputFld.cpp
library/FieldUtils/OutputModules/OutputFld.cpp
+16
-2
library/SolverUtils/Filters/FilterFieldConvert.cpp
library/SolverUtils/Filters/FilterFieldConvert.cpp
+4
-0
No files found.
library/FieldUtils/OutputModules/OutputFld.cpp
View file @
e7f6e038
...
...
@@ -69,12 +69,26 @@ void OutputFld::Process(po::variables_map &vm)
// Extract the output filename and extension
string
filename
=
m_config
[
"outfile"
].
as
<
string
>
();
// Get IO format
std
::
string
iofmt
(
"Xml"
);
if
(
m_f
->
m_session
->
DefinesSolverInfo
(
"IOFormat"
))
{
iofmt
=
m_f
->
m_session
->
GetSolverInfo
(
"IOFormat"
);
}
if
(
m_f
->
m_session
->
DefinesCmdLineArgument
(
"io-format"
))
{
iofmt
=
m_f
->
m_session
->
GetCmdLineArgument
<
std
::
string
>
(
"io-format"
);
}
if
(
m_config
[
"format"
].
m_beenSet
)
{
iofmt
=
m_config
[
"format"
].
as
<
string
>
();
}
// Set up communicator and FieldIO object.
LibUtilities
::
CommSharedPtr
c
=
m_f
->
m_session
?
m_f
->
m_session
->
GetComm
()
:
LibUtilities
::
GetCommFactory
().
CreateInstance
(
"Serial"
,
0
,
0
);
LibUtilities
::
FieldIOSharedPtr
fld
=
LibUtilities
::
GetFieldIOFactory
().
CreateInstance
(
m_config
[
"format"
].
as
<
string
>
(),
c
,
true
);
LibUtilities
::
GetFieldIOFactory
().
CreateInstance
(
iofmt
,
c
,
true
);
if
(
m_f
->
m_writeBndFld
)
{
...
...
library/SolverUtils/Filters/FilterFieldConvert.cpp
View file @
e7f6e038
...
...
@@ -149,6 +149,10 @@ FilterFieldConvert::FilterFieldConvert(
modcmds
.
push_back
(
m_outputFile
);
// Create modules
CreateModules
(
modcmds
);
// Strip options from m_outputFile
vector
<
string
>
tmp
;
boost
::
split
(
tmp
,
m_outputFile
,
boost
::
is_any_of
(
":"
));
m_outputFile
=
tmp
[
0
];
}
FilterFieldConvert
::~
FilterFieldConvert
()
...
...
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