Commit 3b1843d9 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'fix/multi-xml' into 'master'

Fix multiple xml files in FieldConvert



See merge request !705
parents 5dcbfaa1 1b24bcf8
......@@ -48,6 +48,7 @@ v4.4.0
**FieldConvert:**
- Allow equi-spaced output for 1D and 2DH1D fields (!613)
- Update quality metric to include scaled Jacobian output (!695)
- Allow multiple XML files to be specified in InterpField module (!705)
**NekMesh:**
- Modify curve module to allow for spline input (!628)
......
......@@ -90,7 +90,7 @@ void ProcessInterpField::Process(po::variables_map &vm)
std::vector<std::string> files;
// set up session file for from field
files.push_back(m_config["fromxml"].as<string>());
ParseUtils::GenerateOrderedStringVector(m_config["fromxml"].as<string>().c_str(), files);
m_fromField->m_session =
LibUtilities::SessionReader::CreateInstance(0, 0, files);
......
......@@ -445,8 +445,8 @@ void ProcessInterpPoints::Process(po::variables_map &vm)
FieldSharedPtr fromField = boost::shared_ptr<Field>(new Field());
std::vector<std::string> files;
ParseUtils::GenerateOrderedStringVector(m_config["fromxml"].as<string>().c_str(), files);
// set up session file for from field
files.push_back(m_config["fromxml"].as<string>());
fromField->m_session =
LibUtilities::SessionReader::CreateInstance(0, 0, files);
......
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