Commit 52064bb3 authored by Dave Moxey's avatar Dave Moxey
Browse files

Fix some buildbot issues, add initialisation of default values in FieldDefinitions

parent c2b63977
......@@ -111,7 +111,14 @@ typedef boost::shared_ptr<DataSource> DataSourceSharedPtr;
struct FieldDefinitions
{
/// Default constructor
FieldDefinitions() {}
FieldDefinitions() : m_shapeType(eNoShapeType),
m_numHomogeneousDir(0),
m_homoStrips(false),
m_pointsDef(false),
m_uniOrder(true),
m_numPointsDef(false)
{
}
/// Simple constructor to allocate all internal properties.
FieldDefinitions(
......
......@@ -972,8 +972,7 @@ void FieldIOHdf5::ImportFieldDef(
H5::GroupSharedPtr field = root->OpenGroup(group);
ASSERTL1(field, prfx.str() + "cannot open field group, " + group + '.');
def->m_homoStrips = false;
def->m_uniOrder = false;
def->m_uniOrder = false;
H5::Group::AttrIterator attrIt = field->attr_begin();
H5::Group::AttrIterator attrEnd = field->attr_end();
......
......@@ -32,7 +32,9 @@
// Description: Define static members for the different data types
//
///////////////////////////////////////////////////////////////////////////////
#include <LibUtilities/Communication/CommDataType.h>
#include <LibUtilities/BasicUtils/ErrorUtil.hpp>
namespace Nektar
{
......
......@@ -11,6 +11,7 @@
namespace po = boost::program_options;
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/FieldIO.h>
#include <LibUtilities/Communication/Comm.h>
#include <SpatialDomains/MeshGraph2D.h>
#include <MultiRegions/ExpList2D.h>
......@@ -286,8 +287,8 @@ int main(int argc, char* argv[])
Exp->AppendFieldData(FieldDef[i], FieldData[i]);
}
LibUtilities::FieldIOSharedPtr vFld = LibUtilities::MakeDefaultFieldIO(
vSession);
LibUtilities::FieldIOSharedPtr vFld =
LibUtilities::FieldIO::CreateDefault(vSession);
vFld->Write(outfile, FieldDef, FieldData);
//-----------------------------------------------
}
......
Supports Markdown
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