Skip to content
Snippets Groups Projects
Commit f92fcda1 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Changed way in which InputXml session reader is instantiated.

parent e72ca507
No related branches found
No related tags found
No related merge requests found
...@@ -116,21 +116,17 @@ namespace Nektar ...@@ -116,21 +116,17 @@ namespace Nektar
m_f->m_declareExpansionAsContField = true; m_f->m_declareExpansionAsContField = true;
} }
int argc = m_f->m_inputfiles[xml_ending].size()+m_f->m_inputfiles[xml_gz_ending].size()+1; std::vector<std::string> files;
char *argv[argc];
const char *instring = "ProcessField";
argv[0] = strdup(instring);
// load .xml ending // load .xml ending
int i; for (int i = 0; i < m_f->m_inputfiles[xml_ending].size(); ++i)
for (i = 0; i < m_f->m_inputfiles[xml_ending].size(); ++i)
{ {
argv[i+1] = strdup(m_f->m_inputfiles[xml_ending][i].c_str()); files.push_back(m_f->m_inputfiles[xml_ending][i]);
} }
// load any .xml.gz endings // load any .xml.gz endings
for (int j =0; j < m_f->m_inputfiles[xml_gz_ending].size(); ++j) for (int j =0; j < m_f->m_inputfiles[xml_gz_ending].size(); ++j)
{ {
argv[i+j+1] = strdup(m_f->m_inputfiles[xml_gz_ending][j].c_str()); files.push_back(m_f->m_inputfiles[xml_gz_ending][j]);
} }
...@@ -171,8 +167,7 @@ namespace Nektar ...@@ -171,8 +167,7 @@ namespace Nektar
m_f->m_session = LibUtilities::SessionReader:: m_f->m_session = LibUtilities::SessionReader::
CreateInstance(argc, argv); CreateInstance(0, 0, files);
m_f->m_session->GetComm();
m_f->m_graph = SpatialDomains::MeshGraph::Read(m_f->m_session,rng); m_f->m_graph = SpatialDomains::MeshGraph::Read(m_f->m_session,rng);
m_f->m_fld = MemoryManager<LibUtilities::FieldIO> m_f->m_fld = MemoryManager<LibUtilities::FieldIO>
::AllocateSharedPtr(m_f->m_session->GetComm()); ::AllocateSharedPtr(m_f->m_session->GetComm());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment