Commit 6bdc3afa authored by Spencer Sherwin's avatar Spencer Sherwin

Merge branch 'feature/FC-expfromXml' into 'master'

Allow using expansion from session file in FieldConvert

See merge request !842
parents 0db85ee0 f95bc6af
...@@ -74,6 +74,8 @@ v5.0.0 ...@@ -74,6 +74,8 @@ v5.0.0
- Fixed interppoints module (!760) - Fixed interppoints module (!760)
- Fix OutputTecplot in 2DH1D (!818) - Fix OutputTecplot in 2DH1D (!818)
- Move StreamFunction utility to a FieldConvert module (!809) - Move StreamFunction utility to a FieldConvert module (!809)
- Allow using expansion from session file with new `--useSessionExpansion`
command line option (!842)
- Extend wss module to compressible flows (!810) - Extend wss module to compressible flows (!810)
- Allow explicitly setting bool options of FieldConvert modules as false (!811) - Allow explicitly setting bool options of FieldConvert modules as false (!811)
- Enable output to multiple files (!844) - Enable output to multiple files (!844)
......
...@@ -78,11 +78,12 @@ void ProcessCreateExp::Process(po::variables_map &vm) ...@@ -78,11 +78,12 @@ void ProcessCreateExp::Process(po::variables_map &vm)
// check to see if fld file defined so can use in // check to see if fld file defined so can use in
// expansion defintion if required // expansion defintion if required
bool fldfilegiven = (m_f->m_fielddef.size() != 0); bool fldfilegiven = (m_f->m_fielddef.size() != 0);
bool expFromFld = fldfilegiven && !vm.count("useSessionExpansion");
// load fielddef header if fld file is defined. This gives // load fielddef header if fld file is defined. This gives
// precedence to Homogeneous definition in fld file // precedence to Homogeneous definition in fld file
m_f->m_numHomogeneousDir = 0; m_f->m_numHomogeneousDir = 0;
if (fldfilegiven) if (expFromFld)
{ {
m_f->m_numHomogeneousDir = m_f->m_fielddef[0]->m_numHomogeneousDir; m_f->m_numHomogeneousDir = m_f->m_fielddef[0]->m_numHomogeneousDir;
...@@ -169,7 +170,7 @@ void ProcessCreateExp::Process(po::variables_map &vm) ...@@ -169,7 +170,7 @@ void ProcessCreateExp::Process(po::variables_map &vm)
} }
m_f->m_exp[0] = m_f->SetUpFirstExpList(m_f->m_numHomogeneousDir, m_f->m_exp[0] = m_f->SetUpFirstExpList(m_f->m_numHomogeneousDir,
fldfilegiven); expFromFld);
if (m_f->m_verbose) if (m_f->m_verbose)
{ {
......
...@@ -95,6 +95,8 @@ int main(int argc, char* argv[]) ...@@ -95,6 +95,8 @@ int main(int argc, char* argv[])
"Specify modules which are to be used.") "Specify modules which are to be used.")
("useSessionVariables", ("useSessionVariables",
"Use variables defined in session for output") "Use variables defined in session for output")
("useSessionExpansion",
"Use expansion defined in session.")
("verbose,v", ("verbose,v",
"Enable verbose mode."); "Enable verbose mode.");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment