Commit 4992ab14 authored by Jerry Clarke's avatar Jerry Clarke
Browse files

Added XdmfRegion ... like nodests and sidesets

parent 5e45368b
......@@ -55,6 +55,7 @@ SET( XdmfModelSource
XdmfGrid
XdmfTopology
XdmfTime
XdmfRegion
XdmfGeometry
XdmfH5Driver
XdmfDsm
......
......@@ -44,6 +44,7 @@ swig -v -c++ -make_default -includeall -shadow -java $(ICE_INCLUDES) -o XdmfJava
#include <XdmfGeometry.h>
#include <XdmfGrid.h>
#include <XdmfTime.h>
#include <XdmfRegion.h>
/*
#include <XdmfParameter.h>
#include <XdmfTransform.h>
......@@ -123,6 +124,7 @@ inline XDMF_LONG64 XDMF_strtoll(char *str, void*, int)
%include XdmfGeometry.h
%include XdmfGrid.h
%include XdmfTime.h
%include XdmfRegion.h
/*
%include XdmfParameter.h
%include XdmfTransform.h
......
......@@ -445,6 +445,7 @@ INPUT = \
XdmfHeavyData.h \
XdmfHDF.h \
XdmfH5Driver.h \
XdmfRegion.h \
XdmfTime.h \
XdmfValues.h \
XdmfValuesXML.h \
......
......@@ -116,6 +116,7 @@ XdmfGrid::Insert( XdmfElement *Child){
XDMF_WORD_CMP(Child->GetElementName(), "Geometry") ||
XDMF_WORD_CMP(Child->GetElementName(), "Topology") ||
XDMF_WORD_CMP(Child->GetElementName(), "Attribute") ||
XDMF_WORD_CMP(Child->GetElementName(), "Region") ||
XDMF_WORD_CMP(Child->GetElementName(), "DataItem") ||
XDMF_WORD_CMP(Child->GetElementName(), "Time") ||
XDMF_WORD_CMP(Child->GetElementName(), "Information")
......@@ -134,7 +135,7 @@ XdmfGrid::Insert( XdmfElement *Child){
return(XDMF_SUCCESS);
}
}else{
XdmfErrorMessage("Grid can only Insert Grid | Geometry | Topology | DataItem | Information elements, not a " << Child->GetElementName());
XdmfErrorMessage("Grid can only Insert Grid | Geometry | Topology | Attribute | Region | DataItem | Information elements, not a " << Child->GetElementName());
}
return(XDMF_FAIL);
}
......
......@@ -29,12 +29,13 @@ XdmfRegion::Release(){
XdmfInt32
XdmfRegion::Insert( XdmfElement *Child){
if(Child && (
XDMF_WORD_CMP(Child->GetElementName(), "Attribute") ||
XDMF_WORD_CMP(Child->GetElementName(), "DataItem") ||
XDMF_WORD_CMP(Child->GetElementName(), "Information")
)){
return(XdmfElement::Insert(Child));
}else{
XdmfErrorMessage("Region can only Insert DataItem or Information elements");
XdmfErrorMessage("Region can only Insert Attribute, DataItem or Information elements");
}
return(XDMF_FAIL);
}
......@@ -76,10 +77,13 @@ XdmfRegion::GetRegionTypeAsString( void ){
return( "Edge" );
case XDMF_REGION_TYPE_NODE :
return( "Node" );
case XDMF_REGION_TYPE_UNSET :
return( "Unset" );
default :
break;
}
return( "Node" );
XdmfErrorMessage("Unknown RegionType = " << this->RegionType);
return(0);
}
......
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