Commit 5aa71a64 authored by Kenneth Leiter's avatar Kenneth Leiter

ENH: Hide use of boost::shared_ptr and boost::shared_dynamic_cast.

Using statements have been added to XdmfSharedPtr.hpp. All used of
boost::shared_ptr and boost::shared_dynamic_cast have been replaced
by shared_ptr and shared_dynamic_cast. Slight modification to XdmfCore.i
to get swig wrapping working again.
parent 518b5838
This diff is collapsed.
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
#include "XdmfAttributeType.hpp" #include "XdmfAttributeType.hpp"
#include "XdmfError.hpp" #include "XdmfError.hpp"
boost::shared_ptr<XdmfAttribute> shared_ptr<XdmfAttribute>
XdmfAttribute::New() XdmfAttribute::New()
{ {
boost::shared_ptr<XdmfAttribute> p(new XdmfAttribute()); shared_ptr<XdmfAttribute> p(new XdmfAttribute());
return p; return p;
} }
...@@ -46,7 +46,7 @@ XdmfAttribute::~XdmfAttribute() ...@@ -46,7 +46,7 @@ XdmfAttribute::~XdmfAttribute()
const std::string XdmfAttribute::ItemTag = "Attribute"; const std::string XdmfAttribute::ItemTag = "Attribute";
boost::shared_ptr<const XdmfAttributeCenter> shared_ptr<const XdmfAttributeCenter>
XdmfAttribute::getCenter() const XdmfAttribute::getCenter() const
{ {
return mCenter; return mCenter;
...@@ -74,7 +74,7 @@ XdmfAttribute::getName() const ...@@ -74,7 +74,7 @@ XdmfAttribute::getName() const
return mName; return mName;
} }
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttribute::getType() const XdmfAttribute::getType() const
{ {
return mType; return mType;
...@@ -82,7 +82,7 @@ XdmfAttribute::getType() const ...@@ -82,7 +82,7 @@ XdmfAttribute::getType() const
void void
XdmfAttribute::populateItem(const std::map<std::string, std::string> & itemProperties, XdmfAttribute::populateItem(const std::map<std::string, std::string> & itemProperties,
std::vector<boost::shared_ptr<XdmfItem> > & childItems, std::vector<shared_ptr<XdmfItem> > & childItems,
const XdmfCoreReader * const reader) const XdmfCoreReader * const reader)
{ {
XdmfItem::populateItem(itemProperties, childItems, reader); XdmfItem::populateItem(itemProperties, childItems, reader);
...@@ -98,12 +98,11 @@ XdmfAttribute::populateItem(const std::map<std::string, std::string> & itemPrope ...@@ -98,12 +98,11 @@ XdmfAttribute::populateItem(const std::map<std::string, std::string> & itemPrope
mCenter = XdmfAttributeCenter::New(itemProperties); mCenter = XdmfAttributeCenter::New(itemProperties);
mType = XdmfAttributeType::New(itemProperties); mType = XdmfAttributeType::New(itemProperties);
for(std::vector<boost::shared_ptr<XdmfItem> >::const_iterator iter = for(std::vector<shared_ptr<XdmfItem> >::const_iterator iter =
childItems.begin(); childItems.begin();
iter != childItems.end(); iter != childItems.end();
++iter) { ++iter) {
if(boost::shared_ptr<XdmfArray> array = if(shared_ptr<XdmfArray> array = shared_dynamic_cast<XdmfArray>(*iter)) {
boost::shared_dynamic_cast<XdmfArray>(*iter)) {
this->swap(array); this->swap(array);
} }
// TODO: If multiple dataitems. // TODO: If multiple dataitems.
...@@ -111,7 +110,7 @@ XdmfAttribute::populateItem(const std::map<std::string, std::string> & itemPrope ...@@ -111,7 +110,7 @@ XdmfAttribute::populateItem(const std::map<std::string, std::string> & itemPrope
} }
void void
XdmfAttribute::setCenter(const boost::shared_ptr<const XdmfAttributeCenter> center) XdmfAttribute::setCenter(const shared_ptr<const XdmfAttributeCenter> center)
{ {
mCenter = center; mCenter = center;
} }
...@@ -123,7 +122,7 @@ XdmfAttribute::setName(const std::string & name) ...@@ -123,7 +122,7 @@ XdmfAttribute::setName(const std::string & name)
} }
void void
XdmfAttribute::setType(const boost::shared_ptr<const XdmfAttributeType> type) XdmfAttribute::setType(const shared_ptr<const XdmfAttributeType> type)
{ {
mType = type; mType = type;
} }
...@@ -43,14 +43,14 @@ class XdmfAttributeType; ...@@ -43,14 +43,14 @@ class XdmfAttributeType;
*/ */
class XDMF_EXPORT XdmfAttribute : public XdmfArray { class XDMF_EXPORT XdmfAttribute : public XdmfArray {
public: public:
/** /**
* Create a new XdmfAttribute. * Create a new XdmfAttribute.
* *
* @return constructed XdmfAttribute. * @return constructed XdmfAttribute.
*/ */
static boost::shared_ptr<XdmfAttribute> New(); static shared_ptr<XdmfAttribute> New();
virtual ~XdmfAttribute(); virtual ~XdmfAttribute();
...@@ -62,7 +62,7 @@ class XDMF_EXPORT XdmfAttribute : public XdmfArray { ...@@ -62,7 +62,7 @@ class XDMF_EXPORT XdmfAttribute : public XdmfArray {
* *
* @return XdmfAttributeCenter of the attribute. * @return XdmfAttributeCenter of the attribute.
*/ */
boost::shared_ptr<const XdmfAttributeCenter> getCenter() const; shared_ptr<const XdmfAttributeCenter> getCenter() const;
std::map<std::string, std::string> getItemProperties() const; std::map<std::string, std::string> getItemProperties() const;
...@@ -80,14 +80,14 @@ class XDMF_EXPORT XdmfAttribute : public XdmfArray { ...@@ -80,14 +80,14 @@ class XDMF_EXPORT XdmfAttribute : public XdmfArray {
* *
* @return XdmfAttributeType of the attribute. * @return XdmfAttributeType of the attribute.
*/ */
boost::shared_ptr<const XdmfAttributeType> getType() const; shared_ptr<const XdmfAttributeType> getType() const;
/** /**
* Set the XdmfAttributeCenter associated with this attribute. * Set the XdmfAttributeCenter associated with this attribute.
* *
* @param center the XdmfAttributeCenter to set. * @param center the XdmfAttributeCenter to set.
*/ */
void setCenter(const boost::shared_ptr<const XdmfAttributeCenter> center); void setCenter(const shared_ptr<const XdmfAttributeCenter> center);
/** /**
* Set the name of the attribute. * Set the name of the attribute.
...@@ -101,32 +101,32 @@ class XDMF_EXPORT XdmfAttribute : public XdmfArray { ...@@ -101,32 +101,32 @@ class XDMF_EXPORT XdmfAttribute : public XdmfArray {
* *
* @param type XdmfAttributeType to set. * @param type XdmfAttributeType to set.
*/ */
void setType(const boost::shared_ptr<const XdmfAttributeType> type); void setType(const shared_ptr<const XdmfAttributeType> type);
protected: protected:
XdmfAttribute(); XdmfAttribute();
virtual void virtual void
populateItem(const std::map<std::string, std::string> & itemProperties, populateItem(const std::map<std::string, std::string> & itemProperties,
std::vector<boost::shared_ptr<XdmfItem> > & childItems, std::vector<shared_ptr<XdmfItem> > & childItems,
const XdmfCoreReader * const reader); const XdmfCoreReader * const reader);
private: private:
XdmfAttribute(const XdmfAttribute &); // Not implemented. XdmfAttribute(const XdmfAttribute &); // Not implemented.
void operator=(const XdmfAttribute &); // Not implemented. void operator=(const XdmfAttribute &); // Not implemented.
boost::shared_ptr<const XdmfAttributeCenter> mCenter; shared_ptr<const XdmfAttributeCenter> mCenter;
std::string mName; std::string mName;
boost::shared_ptr<const XdmfAttributeType> mType; shared_ptr<const XdmfAttributeType> mType;
}; };
#ifdef _WIN32 #ifdef _WIN32
XDMF_TEMPLATE template class XDMF_EXPORT XDMF_TEMPLATE template class XDMF_EXPORT
boost::shared_ptr<const XdmfAttributeType>; shared_ptr<const XdmfAttributeType>;
XDMF_TEMPLATE template class XDMF_EXPORT XDMF_TEMPLATE template class XDMF_EXPORT
boost::shared_ptr<const XdmfAttributeCenter>; shared_ptr<const XdmfAttributeCenter>;
#endif #endif
#endif /* XDMFATTRIBUTE_HPP_ */ #endif /* XDMFATTRIBUTE_HPP_ */
...@@ -25,42 +25,42 @@ ...@@ -25,42 +25,42 @@
#include "XdmfError.hpp" #include "XdmfError.hpp"
// Supported XdmfAttributeCenters // Supported XdmfAttributeCenters
boost::shared_ptr<const XdmfAttributeCenter> shared_ptr<const XdmfAttributeCenter>
XdmfAttributeCenter::Grid() XdmfAttributeCenter::Grid()
{ {
static boost::shared_ptr<const XdmfAttributeCenter> static shared_ptr<const XdmfAttributeCenter>
p(new XdmfAttributeCenter("Grid")); p(new XdmfAttributeCenter("Grid"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeCenter> shared_ptr<const XdmfAttributeCenter>
XdmfAttributeCenter::Cell() XdmfAttributeCenter::Cell()
{ {
static boost::shared_ptr<const XdmfAttributeCenter> static shared_ptr<const XdmfAttributeCenter>
p(new XdmfAttributeCenter("Cell")); p(new XdmfAttributeCenter("Cell"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeCenter> shared_ptr<const XdmfAttributeCenter>
XdmfAttributeCenter::Face() XdmfAttributeCenter::Face()
{ {
static boost::shared_ptr<const XdmfAttributeCenter> static shared_ptr<const XdmfAttributeCenter>
p(new XdmfAttributeCenter("Face")); p(new XdmfAttributeCenter("Face"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeCenter> shared_ptr<const XdmfAttributeCenter>
XdmfAttributeCenter::Edge() XdmfAttributeCenter::Edge()
{ {
static boost::shared_ptr<const XdmfAttributeCenter> static shared_ptr<const XdmfAttributeCenter>
p(new XdmfAttributeCenter("Edge")); p(new XdmfAttributeCenter("Edge"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeCenter> shared_ptr<const XdmfAttributeCenter>
XdmfAttributeCenter::Node() XdmfAttributeCenter::Node()
{ {
static boost::shared_ptr<const XdmfAttributeCenter> static shared_ptr<const XdmfAttributeCenter>
p(new XdmfAttributeCenter("Node")); p(new XdmfAttributeCenter("Node"));
return p; return p;
} }
...@@ -74,7 +74,7 @@ XdmfAttributeCenter::~XdmfAttributeCenter() ...@@ -74,7 +74,7 @@ XdmfAttributeCenter::~XdmfAttributeCenter()
{ {
} }
boost::shared_ptr<const XdmfAttributeCenter> shared_ptr<const XdmfAttributeCenter>
XdmfAttributeCenter::New(const std::map<std::string, std::string> & itemProperties) XdmfAttributeCenter::New(const std::map<std::string, std::string> & itemProperties)
{ {
std::map<std::string, std::string>::const_iterator center = std::map<std::string, std::string>::const_iterator center =
...@@ -97,11 +97,15 @@ XdmfAttributeCenter::New(const std::map<std::string, std::string> & itemProperti ...@@ -97,11 +97,15 @@ XdmfAttributeCenter::New(const std::map<std::string, std::string> & itemProperti
return Node(); return Node();
} }
else { else {
XdmfError::message(XdmfError::FATAL, "Center not of 'Grid','Cell','Face','Edge','Node' in XdmfAttributeCenter::New"); XdmfError::message(XdmfError::FATAL,
"Center not of 'Grid','Cell','Face','Edge','Node' "
"in XdmfAttributeCenter::New");
} }
} }
XdmfError::message(XdmfError::FATAL, "'Center' not found in itemProperties in XdmfAttributeCenter::New"); XdmfError::message(XdmfError::FATAL,
return boost::shared_ptr<const XdmfAttributeCenter>(); "'Center' not found in itemProperties in "
"XdmfAttributeCenter::New");
return shared_ptr<const XdmfAttributeCenter>();
} }
void void
......
...@@ -45,24 +45,24 @@ ...@@ -45,24 +45,24 @@
*/ */
class XDMF_EXPORT XdmfAttributeCenter : public XdmfItemProperty { class XDMF_EXPORT XdmfAttributeCenter : public XdmfItemProperty {
public: public:
virtual ~XdmfAttributeCenter(); virtual ~XdmfAttributeCenter();
friend class XdmfAttribute; friend class XdmfAttribute;
// Supported Xdmf Attribute Centers // Supported Xdmf Attribute Centers
static boost::shared_ptr<const XdmfAttributeCenter> Grid(); static shared_ptr<const XdmfAttributeCenter> Grid();
static boost::shared_ptr<const XdmfAttributeCenter> Cell(); static shared_ptr<const XdmfAttributeCenter> Cell();
static boost::shared_ptr<const XdmfAttributeCenter> Face(); static shared_ptr<const XdmfAttributeCenter> Face();
static boost::shared_ptr<const XdmfAttributeCenter> Edge(); static shared_ptr<const XdmfAttributeCenter> Edge();
static boost::shared_ptr<const XdmfAttributeCenter> Node(); static shared_ptr<const XdmfAttributeCenter> Node();
void void
getProperties(std::map<std::string, std::string> & collectedProperties) const; getProperties(std::map<std::string, std::string> & collectedProperties) const;
protected: protected:
/** /**
* Protected constructor for XdmfAttributeCenter. The constructor * Protected constructor for XdmfAttributeCenter. The constructor
...@@ -75,12 +75,12 @@ class XDMF_EXPORT XdmfAttributeCenter : public XdmfItemProperty { ...@@ -75,12 +75,12 @@ class XDMF_EXPORT XdmfAttributeCenter : public XdmfItemProperty {
*/ */
XdmfAttributeCenter(const std::string & name); XdmfAttributeCenter(const std::string & name);
private: private:
XdmfAttributeCenter(const XdmfAttributeCenter &); // Not implemented. XdmfAttributeCenter(const XdmfAttributeCenter &); // Not implemented.
void operator=(const XdmfAttributeCenter &); // Not implemented. void operator=(const XdmfAttributeCenter &); // Not implemented.
static boost::shared_ptr<const XdmfAttributeCenter> static shared_ptr<const XdmfAttributeCenter>
New(const std::map<std::string, std::string> & itemProperties); New(const std::map<std::string, std::string> & itemProperties);
std::string mName; std::string mName;
......
...@@ -25,58 +25,58 @@ ...@@ -25,58 +25,58 @@
#include "XdmfError.hpp" #include "XdmfError.hpp"
// Supported XdmfAttributeTypes // Supported XdmfAttributeTypes
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttributeType::NoAttributeType() XdmfAttributeType::NoAttributeType()
{ {
static boost::shared_ptr<const XdmfAttributeType> static shared_ptr<const XdmfAttributeType>
p(new XdmfAttributeType("None")); p(new XdmfAttributeType("None"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttributeType::Scalar() XdmfAttributeType::Scalar()
{ {
static boost::shared_ptr<const XdmfAttributeType> static shared_ptr<const XdmfAttributeType>
p(new XdmfAttributeType("Scalar")); p(new XdmfAttributeType("Scalar"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttributeType::Vector() XdmfAttributeType::Vector()
{ {
static boost::shared_ptr<const XdmfAttributeType> static shared_ptr<const XdmfAttributeType>
p(new XdmfAttributeType("Vector")); p(new XdmfAttributeType("Vector"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttributeType::Tensor() XdmfAttributeType::Tensor()
{ {
static boost::shared_ptr<const XdmfAttributeType> static shared_ptr<const XdmfAttributeType>
p(new XdmfAttributeType("Tensor")); p(new XdmfAttributeType("Tensor"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttributeType::Matrix() XdmfAttributeType::Matrix()
{ {
static boost::shared_ptr<const XdmfAttributeType> static shared_ptr<const XdmfAttributeType>
p(new XdmfAttributeType("Matrix")); p(new XdmfAttributeType("Matrix"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttributeType::Tensor6() XdmfAttributeType::Tensor6()
{ {
static boost::shared_ptr<const XdmfAttributeType> static shared_ptr<const XdmfAttributeType>
p(new XdmfAttributeType("Tensor6")); p(new XdmfAttributeType("Tensor6"));
return p; return p;
} }
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttributeType::GlobalId() XdmfAttributeType::GlobalId()
{ {
static boost::shared_ptr<const XdmfAttributeType> static shared_ptr<const XdmfAttributeType>
p(new XdmfAttributeType("GlobalId")); p(new XdmfAttributeType("GlobalId"));
return p; return p;
} }
...@@ -90,7 +90,7 @@ XdmfAttributeType::~XdmfAttributeType() ...@@ -90,7 +90,7 @@ XdmfAttributeType::~XdmfAttributeType()
{ {
} }
boost::shared_ptr<const XdmfAttributeType> shared_ptr<const XdmfAttributeType>
XdmfAttributeType::New(const std::map<std::string, std::string> & itemProperties) XdmfAttributeType::New(const std::map<std::string, std::string> & itemProperties)
{ {
std::map<std::string, std::string>::const_iterator type = std::map<std::string, std::string>::const_iterator type =
...@@ -122,11 +122,16 @@ XdmfAttributeType::New(const std::map<std::string, std::string> & itemProperties ...@@ -122,11 +122,16 @@ XdmfAttributeType::New(const std::map<std::string, std::string> & itemProperties
return GlobalId(); return GlobalId();
} }
else { else {
XdmfError::message(XdmfError::FATAL, "Type not of 'None','Scalar','Vector','Tensor','Matrix','Tensor6', or 'GlobalId' in XdmfAttributeType::New"); XdmfError::message(XdmfError::FATAL,
"Type not of 'None','Scalar','Vector','Tensor', "
"'Matrix','Tensor6', or 'GlobalId' in "
"XdmfAttributeType::New");
} }
} }
XdmfError::message(XdmfError::FATAL, "Neither 'Type' nor 'AttributeType' found in itemProperties in XdmfAttributeType::New"); XdmfError::message(XdmfError::FATAL,
return boost::shared_ptr<const XdmfAttributeType>(); "Neither 'Type' nor 'AttributeType' found in "
"itemProperties in XdmfAttributeType::New");
return shared_ptr<const XdmfAttributeType>();
} }
void void
......
...@@ -48,25 +48,25 @@ ...@@ -48,25 +48,25 @@
*/ */
class XDMF_EXPORT XdmfAttributeType : public XdmfItemProperty { class XDMF_EXPORT XdmfAttributeType : public XdmfItemProperty {
public: public:
virtual ~XdmfAttributeType(); virtual ~XdmfAttributeType();
friend class XdmfAttribute; friend class XdmfAttribute;
// Supported Xdmf Attribute Types // Supported Xdmf Attribute Types
static boost::shared_ptr<const XdmfAttributeType> NoAttributeType(); static shared_ptr<const XdmfAttributeType> NoAttributeType();
static boost::shared_ptr<const XdmfAttributeType> Scalar(); static shared_ptr<const XdmfAttributeType> Scalar();
static boost::shared_ptr<const XdmfAttributeType> Vector(); static shared_ptr<const XdmfAttributeType> Vector();
static boost::shared_ptr<const XdmfAttributeType> Tensor(); static shared_ptr<const XdmfAttributeType> Tensor();
static boost::shared_ptr<const XdmfAttributeType> Matrix(); static shared_ptr<const XdmfAttributeType> Matrix();
static boost::shared_ptr<const XdmfAttributeType> Tensor6(); static shared_ptr<const XdmfAttributeType> Tensor6();
static boost::shared_ptr<const XdmfAttributeType> GlobalId(); static shared_ptr<const XdmfAttributeType> GlobalId();
void void
getProperties(std::map<std::string, std::string> & collectedProperties) const; getProperties(std::map<std::string, std::string> & collectedProperties) const;
protected: protected:
/** /**
* Protected constructor for XdmfAttributeType. The constructor is * Protected constructor for XdmfAttributeType. The constructor is
...@@ -78,12 +78,12 @@ class XDMF_EXPORT XdmfAttributeType : public XdmfItemProperty { ...@@ -78,12 +78,12 @@ class XDMF_EXPORT XdmfAttributeType : public XdmfItemProperty {
*/ */
XdmfAttributeType(const std::string & name); XdmfAttributeType(const std::string & name);
private: private:
XdmfAttributeType(const XdmfAttributeType &); // Not implemented. XdmfAttributeType(const XdmfAttributeType &); // Not implemented.
void operator=(const XdmfAttributeType &); // Not implemented. void operator=(const XdmfAttributeType &); // Not implemented.
static boost::shared_ptr<const XdmfAttributeType> static shared_ptr<const XdmfAttributeType>
New(const std::map<std::string, std::string> & itemProperties); New(const std::map<std::string, std::string> & itemProperties);
std::string mName; std::string mName;
......
...@@ -41,10 +41,10 @@ public: ...@@ -41,10 +41,10 @@ public:
public: public:
static boost::shared_ptr<XdmfTopologyCurvilinear> static shared_ptr<XdmfTopologyCurvilinear>
New(const XdmfCurvilinearGrid * const curvilinearGrid) New(const XdmfCurvilinearGrid * const curvilinearGrid)
{ {
boost::shared_ptr<XdmfTopologyCurvilinear> shared_ptr<XdmfTopologyCurvilinear>
p(new XdmfTopologyCurvilinear(curvilinearGrid)); p(new XdmfTopologyCurvilinear(curvilinearGrid));
return p; return p;
} }
...@@ -52,7 +52,7 @@ public: ...@@ -52,7 +52,7 @@ public:
unsigned int unsigned int
getNumberElements() const getNumberElements() const
{ {
const boost::shared_ptr<const XdmfArray> dimensions = const shared_ptr<const XdmfArray> dimensions =
mCurvilinearGrid->getDimensions(); mCurvilinearGrid->getDimensions();
if(dimensions->getSize() == 0) { if(dimensions->getSize() == 0) {
return 0; return 0;
...@@ -80,10 +80,10 @@ public: ...@@ -80,10 +80,10 @@ public:
public: public:
static boost::shared_ptr<const XdmfTopologyTypeCurvilinear> static shared_ptr<const XdmfTopologyTypeCurvilinear>
New(const XdmfCurvilinearGrid * const curvilinearGrid) New(const XdmfCurvilinearGrid * const curvilinearGrid)
{ {
boost::shared_ptr<const XdmfTopologyTypeCurvilinear> shared_ptr<const XdmfTopologyTypeCurvilinear>
p(new XdmfTopologyTypeCurvilinear(curvilinearGrid)); p(new XdmfTopologyTypeCurvilinear(curvilinearGrid));
return p; return p;
} }
...@@ -100,7 +100,7 @@ public: ...@@ -100,7 +100,7 @@ public:
void void
getProperties(std::map<std::string, std::string> & collectedProperties) const getProperties(std::map<std::string, std::string> & collectedProperties) const
{ {
boost::shared_ptr<const XdmfArray> dimensions = shared_ptr<const XdmfArray> dimensions =
mCurvilinearGrid->getDimensions(); mCurvilinearGrid->getDimensions();
if(dimensions->getSize() == 3) { if(dimensions->getSize() == 3) {
collectedProperties["Type"] = "3DSMesh"; collectedProperties["Type"] = "3DSMesh";
...@@ -109,7 +109,9 @@ public: ...@@ -109,7 +109,9 @@ public:
collectedProperties["Type"] = "2DSMesh"; collectedProperties["Type"] = "2DSMesh";
} }
else { else {
XdmfError::message(XdmfError::FATAL, "Grid dimensions not 2 or 3 in XdmfTopologyTypeCurvilinear::getProperties"); XdmfError::message(XdmfError::FATAL,
"Grid dimensions not 2 or 3 in "
"XdmfTopologyTypeCurvilinear::getProperties");
} }
collectedProperties["Dimensions"] = dimensions->getValuesString();