Commit d8790366 authored by Dave Moxey's avatar Dave Moxey
Browse files

Fix compiler errors

parent 65cf8cad
......@@ -37,6 +37,7 @@
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
#include <boost/make_shared.hpp>
#include <boost/format.hpp>
#include <LibUtilities/BasicConst/GitRevision.h>
#include <LibUtilities/BasicUtils/FieldIO.h>
......@@ -55,6 +56,7 @@
#define NEKTAR_VERSION "Unknown"
#endif
namespace berrc = boost::system::errc;
namespace ptime = boost::posix_time;
namespace ip = boost::asio::ip;
......@@ -350,7 +352,7 @@ void FieldIO::AddInfoTag(TagWriterSharedPtr root,
*
* @return Absolute path to resulting file.
*/
std::string FieldIOXml::SetUpOutput(const std::string outname, bool perRank)
std::string FieldIO::SetUpOutput(const std::string outname, bool perRank)
{
ASSERTL0(!outname.empty(), "Empty path given to SetUpOutput()");
......
......@@ -269,7 +269,8 @@ protected:
return "fld";
}
LIB_UTILITIES_EXPORT std::string SetUpOutput(const std::string outname);
LIB_UTILITIES_EXPORT std::string SetUpOutput(
const std::string outname, bool perRank);
/// @copydoc FieldIO::Write
LIB_UTILITIES_EXPORT virtual void v_Write(
......
......@@ -922,8 +922,17 @@ void FieldIOHdf5::ImportFieldData(
"input data is not the same length as header information.");
}
void FieldIOHdf5::v_ImportFieldMetaData(DataSourceSharedPtr dataSource,
FieldMetaDataMap &fieldmetadatamap)
DataSourceSharedPtr FieldIOHdf5::v_ImportFieldMetaData(
std::string filename,
FieldMetaDataMap &fieldmetadatamap)
{
DataSourceSharedPtr ans = H5DataSource::create(filename);
ImportHDF5FieldMetaData(ans, fieldmetadatamap);
return ans;
}
void FieldIOHdf5::ImportHDF5FieldMetaData(DataSourceSharedPtr dataSource,
FieldMetaDataMap &fieldmetadatamap)
{
H5DataSourceSharedPtr hdf =
boost::static_pointer_cast<H5DataSource>(dataSource);
......
......@@ -203,7 +203,10 @@ private:
FieldMetaDataMap &fieldinfomap = NullFieldMetaDataMap,
const Array<OneD, int> ElementiDs = NullInt1DArray);
LIB_UTILITIES_EXPORT void v_ImportFieldMetaData(
LIB_UTILITIES_EXPORT virtual DataSourceSharedPtr v_ImportFieldMetaData(
std::string filename, FieldMetaDataMap &fieldmetadatamap);
LIB_UTILITIES_EXPORT void ImportHDF5FieldMetaData(
DataSourceSharedPtr dataSource, FieldMetaDataMap &fieldmetadatamap);
LIB_UTILITIES_EXPORT void ImportFieldDef(H5::PListSharedPtr readPL,
......
......@@ -191,7 +191,7 @@ void PtsIO::Write(const string &outFile,
int nTotvars = ptsField->GetNFields() + ptsField->GetDim();
int np = ptsField->GetNpoints();
std::string filename = SetUpOutput(outFile);
std::string filename = SetUpOutput(outFile, true);
SetUpFieldMetaData(outFile);
// until tinyxml gains support for line break, write the xml manually
......
......@@ -22,8 +22,8 @@
<PARAMETERS>
<P> TimeStep = 0.002 </P>
<P> NumSteps = 2000000 </P>
<P> IO_CheckSteps = 5000 </P>
<P> NumSteps = 200 </P>
<P> IO_CheckSteps = 10 </P>
<P> IO_InfoSteps = 1 </P>
<P> IO_EnergySteps = 50 </P>
<P> Kinvis = 1.0/3000.0 </P>
......
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