Commit 4ae64aa0 authored by David Moxey's avatar David Moxey

Tidyup of ParseUtils classes using boost::spirit::qi vs boost::spirit::classic

parent 5133f68e
......@@ -34,7 +34,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <Collections/CollectionOptimisation.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.h>
using namespace std;
......@@ -230,7 +230,7 @@ CollectionOptimisation::CollectionOptimisation(
else
{
vector<unsigned int> orders;
ParseUtils::GenerateSeqVector(order.c_str(), orders);
ParseUtils::GenerateSeqVector(order, orders);
for (int i = 0; i < orders.size(); ++i)
{
......
......@@ -37,6 +37,7 @@
#include <string>
using namespace std;
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/PtsField.h>
#include <LibUtilities/BasicUtils/PtsIO.h>
......@@ -106,8 +107,8 @@ void InputDat::Process(po::variables_map &vm)
// note this expects a comma separated list but
// does not work for white space separated lists!
bool valid = ParseUtils::GenerateOrderedStringVector(
line.substr(pos).c_str(), fieldNames);
bool valid = ParseUtils::GenerateVector(
line.substr(pos), fieldNames);
ASSERTL0(valid, "Unable to process list of field variable in "
" VARIABLES list: " +
line.substr(pos));
......
......@@ -38,6 +38,7 @@
#include <string>
using namespace std;
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/Timer.h>
#include "InputXml.h"
......@@ -115,8 +116,7 @@ void InputXml::Process(po::variables_map &vm)
if (vm.count("range"))
{
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
vm["range"].as<string>().c_str(), values),
ASSERTL0(ParseUtils::GenerateVector(vm["range"].as<string>(), values),
"Failed to interpret range string");
ASSERTL0(values.size() > 1, "Do not have minimum values of xmin,xmax");
......
......@@ -41,7 +41,6 @@ using namespace std;
#include "ProcessAddCompositeID.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessAddFld.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,7 @@ using namespace std;
#include "ProcessBoundaryExtract.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......@@ -107,8 +107,7 @@ void ProcessBoundaryExtract::Process(po::variables_map &vm)
}
else
{
ASSERTL0(ParseUtils::GenerateOrderedVector(bvalues.c_str(),
bndRegions),
ASSERTL0(ParseUtils::GenerateVector(bvalues, bndRegions),
"Failed to interpret bnd values string");
}
......
......@@ -39,7 +39,7 @@ using namespace std;
#include "ProcessC0Projection.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......@@ -155,7 +155,7 @@ void ProcessC0Projection::Process(po::variables_map &vm)
else
{
ASSERTL0(
ParseUtils::GenerateOrderedVector(fields.c_str(), processFields),
ParseUtils::GenerateVector(fields, processFields),
"Failed to interpret field string in C0Projection");
}
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessCombineAvg.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessConcatenateFld.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessCreateExp.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/Timer.h>
......
......@@ -40,7 +40,6 @@ using namespace std;
#include "ProcessDisplacement.h"
#include <LibUtilities/BasicUtils/HashUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LocalRegions/SegExp.h>
#include <LocalRegions/TriExp.h>
......
......@@ -38,7 +38,6 @@ using namespace std;
#include "ProcessEquiSpacedOutput.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Foundations/Interp.h>
#include <StdRegions/StdQuadExp.h>
......
......@@ -41,7 +41,6 @@ using namespace std;
#include "ProcessMapping.h"
#include <GlobalMapping/Mapping.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessHomogeneousPlane.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessHomogeneousStretch.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,7 @@ using namespace std;
#include "ProcessInnerProduct.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......@@ -112,7 +112,7 @@ void ProcessInnerProduct::Process(po::variables_map &vm)
}
else
{
ASSERTL0(ParseUtils::GenerateSeqVector(fields.c_str(), processFields),
ASSERTL0(ParseUtils::GenerateVector(fields, processFields),
"Failed to interpret field string in module innerproduct");
}
......@@ -123,7 +123,7 @@ void ProcessInnerProduct::Process(po::variables_map &vm)
else
{
ASSERTL0(
ParseUtils::GenerateSeqVector(multifldidsstr.c_str(), multiFldIds),
ParseUtils::GenerateSeqVector(multifldidsstr, multiFldIds),
"Failed to interpret multifldids string in module innerproduct");
int end = fromfld.find_first_of('.', 0);
string endstr = fromfld.substr(end, fromfld.size());
......
......@@ -40,7 +40,7 @@ using namespace std;
#include "ProcessInterpField.h"
#include <FieldUtils/Interpolator.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
......@@ -87,8 +87,7 @@ void ProcessInterpField::Process(po::variables_map &vm)
std::vector<std::string> files;
// set up session file for from field
ParseUtils::GenerateOrderedStringVector(
m_config["fromxml"].as<string>().c_str(), files);
ParseUtils::GenerateVector(m_config["fromxml"].as<string>(), files);
fromField->m_session =
LibUtilities::SessionReader::CreateInstance(0, 0, files);
......
......@@ -42,7 +42,6 @@ using namespace std;
#include "ProcessInterpPointDataToFld.h"
#include <FieldUtils/Interpolator.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/PtsField.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/PtsIO.h>
......
......@@ -41,7 +41,7 @@ using namespace std;
#include <boost/geometry.hpp>
#include "ProcessInterpPoints.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/PtsIO.h>
......@@ -107,8 +107,7 @@ void ProcessInterpPoints::Process(po::variables_map &vm)
FieldSharedPtr fromField = std::shared_ptr<Field>(new Field());
std::vector<std::string> files;
ParseUtils::GenerateOrderedStringVector(
m_config["fromxml"].as<string>().c_str(), files);
ParseUtils::GenerateVector(m_config["fromxml"].as<string>(), files);
// set up session file for from field
fromField->m_session =
LibUtilities::SessionReader::CreateInstance(0, 0, files);
......@@ -252,8 +251,8 @@ void ProcessInterpPoints::CreateFieldPts(po::variables_map &vm)
else if (m_config["line"].as<string>().compare("NotSet") != 0)
{
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
m_config["line"].as<string>().c_str(), values),
ASSERTL0(ParseUtils::GenerateVector(
m_config["line"].as<string>(), values),
"Failed to interpret line string");
ASSERTL0(values.size() > 2,
......@@ -307,8 +306,8 @@ void ProcessInterpPoints::CreateFieldPts(po::variables_map &vm)
else if (m_config["plane"].as<string>().compare("NotSet") != 0)
{
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
m_config["plane"].as<string>().c_str(), values),
ASSERTL0(ParseUtils::GenerateVector(
m_config["plane"].as<string>(), values),
"Failed to interpret plane string");
ASSERTL0(values.size() > 9,
......@@ -378,8 +377,8 @@ void ProcessInterpPoints::CreateFieldPts(po::variables_map &vm)
else if (m_config["box"].as<string>().compare("NotSet") != 0)
{
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
m_config["box"].as<string>().c_str(), values),
ASSERTL0(ParseUtils::GenerateVector(
m_config["box"].as<string>(), values),
"Failed to interpret box string");
ASSERTL0(values.size() == 9,
......@@ -499,9 +498,8 @@ void ProcessInterpPoints::calcCp0()
vector<int> velid;
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
m_config["cp"].as<string>().c_str(),values),
"Failed to interpret cp string");
ASSERTL0(ParseUtils::GenerateVector(m_config["cp"].as<string>(), values),
"Failed to interpret cp string");
ASSERTL0(values.size() == 2,
"cp string should contain 2 values "
......
......@@ -38,7 +38,7 @@
using namespace std;
#include <FieldUtils/Interpolator.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/PtsIO.h>
......@@ -157,8 +157,8 @@ void ProcessInterpPtsToPts::CreateFieldPts(po::variables_map &vm)
else if (m_config["line"].as<string>().compare("NotSet") != 0)
{
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
m_config["line"].as<string>().c_str(), values),
ASSERTL0(ParseUtils::GenerateVector(
m_config["line"].as<string>(), values),
"Failed to interpret line string");
ASSERTL0(values.size() > 2,
......@@ -212,8 +212,8 @@ void ProcessInterpPtsToPts::CreateFieldPts(po::variables_map &vm)
else if (m_config["plane"].as<string>().compare("NotSet") != 0)
{
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
m_config["plane"].as<string>().c_str(), values),
ASSERTL0(ParseUtils::GenerateVector(
m_config["plane"].as<string>(), values),
"Failed to interpret plane string");
ASSERTL0(values.size() > 9,
......@@ -283,8 +283,8 @@ void ProcessInterpPtsToPts::CreateFieldPts(po::variables_map &vm)
else if (m_config["box"].as<string>().compare("NotSet") != 0)
{
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
m_config["box"].as<string>().c_str(), values),
ASSERTL0(ParseUtils::GenerateVector(
m_config["box"].as<string>(), values),
"Failed to interpret box string");
ASSERTL0(values.size() == 9,
......@@ -405,8 +405,8 @@ void ProcessInterpPtsToPts::calcCp0()
vector<int> velid;
vector<NekDouble> values;
ASSERTL0(ParseUtils::GenerateUnOrderedVector(
m_config["cp"].as<string>().c_str(),values),
ASSERTL0(ParseUtils::GenerateVector(
m_config["cp"].as<string>(),values),
"Failed to interpret cp string");
ASSERTL0(values.size() == 2,
......
......@@ -44,7 +44,6 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/Timer.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessJacobianEnergy.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessMapping.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessMeanMode.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -40,7 +40,6 @@ using namespace std;
#include "ProcessMultiShear.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <MultiRegions/ExpList.h>
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessNumModes.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <StdRegions/StdQuadExp.h>
......
......@@ -40,9 +40,9 @@ using namespace std;
#include "ProcessPointDataToFld.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
namespace Nektar
{
namespace FieldUtils
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessPrintFldNorms.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessQCriterion.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessQualityMetric.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Foundations/Interp.h>
#include <StdRegions/StdPrismExp.h>
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessScalGrad.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <MultiRegions/ExpList.h>
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessScaleInFld.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -41,7 +41,6 @@ using namespace std;
#include "ProcessVorticity.h"
#include <GlobalMapping/Mapping.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
namespace Nektar
......
......@@ -39,7 +39,6 @@ using namespace std;
#include "ProcessWSS.h"
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <MultiRegions/ExpList.h>
......
......@@ -48,6 +48,7 @@
#endif
#include "ErrorUtil.hpp"
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/FileSystem.h>
using namespace std;
......@@ -122,8 +123,7 @@ void CsvIO::v_ImportFieldData(const std::string inFile, PtsFieldSharedPtr& ptsFi
boost::erase_first(line, "#");
vector<string> fieldNames;
bool valid = ParseUtils::GenerateOrderedStringVector(
line.c_str(), fieldNames);
bool valid = ParseUtils::GenerateVector(line, fieldNames);
ASSERTL0(valid, "Unable to process list of fields from line: " + line);
int dim = 0;
......
......@@ -44,7 +44,6 @@
#include <LibUtilities/Communication/Comm.h>
#include <LibUtilities/BasicUtils/ErrorUtil.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/PtsField.h>
#include <LibUtilities/BasicUtils/PtsIO.h>
......
......@@ -38,7 +38,6 @@
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ShapeType.hpp>
#include <LibUtilities/Foundations/Basis.h>
#include <LibUtilities/Foundations/Points.h>
......
......@@ -34,6 +34,8 @@
////////////////////////////////////////////////////////////////////////////////
#include <LibUtilities/BasicUtils/FieldIOHdf5.h>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <unordered_set>
#include <functional>
......@@ -1145,8 +1147,8 @@ void FieldIOHdf5::ImportFieldDef(
if (strstr(numModesPerDir.c_str(), "UNIORDER:"))
{
def->m_uniOrder = true;
bool valid = ParseUtils::GenerateOrderedVector(
numModesPerDir.c_str() + 9, def->m_numModes);
bool valid = ParseUtils::GenerateVector(
numModesPerDir.substr(9), def->m_numModes);
ASSERTL0(valid,
prfx.str() +
"unable to correctly parse the number of modes.");
......@@ -1159,8 +1161,8 @@ void FieldIOHdf5::ImportFieldDef(
def->m_pointsDef = true;
std::vector<std::string> pointsStrings;
bool valid = ParseUtils::GenerateOrderedStringVector(
pointsString.c_str(), pointsStrings);
bool valid = ParseUtils::GenerateVector(
pointsString, pointsStrings);
ASSERTL0(valid,
prfx.str() +
"unable to correctly parse the points types.");
......@@ -1194,8 +1196,8 @@ void FieldIOHdf5::ImportFieldDef(
field->GetAttribute(attrName, numPointsPerDir);
def->m_numPointsDef = true;
bool valid = ParseUtils::GenerateOrderedVector(
numPointsPerDir.c_str(), def->m_numPoints);
bool valid = ParseUtils::GenerateVector(
numPointsPerDir, def->m_numPoints);
ASSERTL0(valid,
prfx.str() +
"unable to correctly parse the number of points.");
......
......@@ -35,6 +35,7 @@
#include <LibUtilities/BasicUtils/FieldIOXml.h>
#include <LibUtilities/BasicUtils/CompressData.h>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <boost/format.hpp>
......@@ -479,7 +480,7 @@ void FieldIOXml::ImportMultiFldFileIDs(
std::string elementIDsStr(elementIDs);
std::vector<unsigned int> idvec;
ParseUtils::GenerateSeqVector(elementIDsStr.c_str(), idvec);
ParseUtils::GenerateSeqVector(elementIDsStr, idvec);
elementList.push_back(idvec);
......@@ -911,7 +912,7 @@ void FieldIOXml::ImportFieldDefs(
std::vector<unsigned int> elementIds;
{
bool valid =
ParseUtils::GenerateSeqVector(idString.c_str(), elementIds);
ParseUtils::GenerateSeqVector(idString, elementIds);
ASSERTL0(valid, "Unable to correctly parse the element ids.");
}
......@@ -936,8 +937,7 @@ void FieldIOXml::ImportFieldDefs(
// Get the basis
std::vector<std::string> basisStrings;
std::vector<BasisType> basis;
valid = ParseUtils::GenerateOrderedStringVector(basisString.c_str(),
basisStrings);
valid = ParseUtils::GenerateVector(basisString, basisStrings);
ASSERTL0(valid, "Unable to correctly parse the basis types.");
for (std::vector<std::string>::size_type i = 0;
i < basisStrings.size();
......@@ -964,8 +964,8 @@ void FieldIOXml::ImportFieldDefs(
std::vector<NekDouble> homoLengths;
if (numHomoDir)
{
valid = ParseUtils::GenerateUnOrderedVector(
homoLengthsString.c_str(), homoLengths);
valid = ParseUtils::GenerateVector(homoLengthsString,
homoLengths);
ASSERTL0(valid, "Unable to correctly parse the number of "
"homogeneous lengths.");
}
......@@ -974,8 +974,7 @@ void FieldIOXml::ImportFieldDefs(
std::vector<unsigned int> homoSIDs;
if (strips)
{
valid = ParseUtils::GenerateSeqVector(homoSIDsString.c_str(),
homoSIDs);
valid = ParseUtils::GenerateVector(homoSIDsString, homoSIDs);
ASSERTL0(valid,
"Unable to correctly parse homogeneous strips IDs.");
}
......@@ -986,7 +985,7 @@ void FieldIOXml::ImportFieldDefs(
if (numHomoDir == 1)
{
valid = ParseUtils::GenerateSeqVector(homoZIDsString.c_str(),
valid = ParseUtils::GenerateSeqVector(homoZIDsString,
homoZIDs);
ASSERTL0(valid,
"Unable to correctly parse homogeneous planes IDs.");
......@@ -994,11 +993,11 @@ void FieldIOXml::ImportFieldDefs(
if (numHomoDir == 2)
{
valid = ParseUtils::GenerateSeqVector(homoZIDsString.c_str(),
valid = ParseUtils::GenerateSeqVector(homoZIDsString,
homoZIDs);
ASSERTL0(valid, "Unable to correctly parse homogeneous lines "
"IDs in z-direction.");
valid = ParseUtils::GenerateSeqVector(homoYIDsString.c_str(),
valid = ParseUtils::GenerateSeqVector(homoYIDsString,
homoYIDs);
ASSERTL0(valid, "Unable to correctly parse homogeneous lines "
"IDs in y-direction.");
......@@ -1010,8 +1009,7 @@ void FieldIOXml::ImportFieldDefs(
if (pointDef)
{
std::vector<std::string> pointsStrings;
valid = ParseUtils::GenerateOrderedStringVector(
pointsString.c_str(), pointsStrings);
valid = ParseUtils::GenerateVector(pointsString, pointsStrings);
ASSERTL0(valid, "Unable to correctly parse the points types.");
for (std::vector<std::string>::size_type i = 0;
i < pointsStrings.size();
......@@ -1045,24 +1043,22 @@ void FieldIOXml::ImportFieldDefs(
UniOrder = true;
}
valid = ParseUtils::GenerateOrderedVector(
numModesString.c_str() + 9, numModes);
valid = ParseUtils::GenerateVector(
numModesString.substr(9), numModes);
ASSERTL0(valid, "Unable to correctly parse the number of modes.");
// Get numPoints
std::vector<unsigned int> numPoints;
if (numPointDef)
{
valid = ParseUtils::GenerateOrderedVector(
numPointsString.c_str(), numPoints);
valid = ParseUtils::GenerateVector(numPointsString, numPoints);
ASSERTL0(valid,
"Unable to correctly parse the number of points.");
}
// Get fields names
std::vector<std::string> Fields;
valid = ParseUtils::GenerateOrderedStringVector(
fieldsString.c_str(), Fields);
valid = ParseUtils::GenerateVector(fieldsString, Fields);
ASSERTL0(valid, "Unable to correctly parse the number of fields.");
FieldDefinitionsSharedPtr fielddef =
......
......@@ -47,7 +47,7 @@
#include <tinyxml.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
#include <LibUtilities/BasicUtils/ParseUtils.h>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/ShapeType.hpp>
#include <LibUtilities/BasicUtils/FileSystem.h>
......@@ -211,7 +211,7 @@ namespace Nektar
const char *nModesStr = expansion->Attribute("NUMMODES");
ASSERTL0(nModesStr,"NUMMODES was not defined in EXPANSION section of input");