ENH: Commit some Fortran tests.

63798d2b · Kenneth Leiter · 7c2cfccf · 63798d2b · 63798d2b · 63798d2b
Commit 63798d2b authored Nov 01, 2012 by Kenneth Leiter
16 changed files
--- a/core/tests/Python/TestXdmfArrayMultidimensional.py
+++ b/core/tests/Python/TestXdmfArrayMultidimensional.py
@@ -24,7 +24,7 @@ if __name__ == "__main__":
    # Create 2D arrays
    #
    array2 = XdmfArray.New()
-    newDimensions = UIntVector(2, 2)
+    newDimensions = UInt32Vector(2, 2)
    array2.initialize(XdmfArrayType.UInt16(), newDimensions)
    assert array2.getArrayType() == XdmfArrayType.UInt16()
    assert array2.getSize() == 4
@@ -34,7 +34,7 @@ if __name__ == "__main__":
    dimensionsString = array2.getDimensionsString()
    assert dimensionsString == "2 2"

-    newDimensions = UIntVector(3, 3)
+    newDimensions = UInt32Vector(3, 3)
    array2.resizeAsUInt16(newDimensions)
    assert array2.getSize() == 27
    dimensions = array2.getDimensions()

--- a/tests/Cxx/TestXdmfGeometry.cpp
+++ b/tests/Cxx/TestXdmfGeometry.cpp
 #include "XdmfGeometry.hpp"
 #include "XdmfGeometryType.hpp"
+#include "XdmfSharedPtr.hpp"

 int main(int, char **)
 {

--- a/tests/Java/TestXdmfEquals.java
+++ b/tests/Java/TestXdmfEquals.java
 import mil.army.arl.xdmf.*;

-public class TestXdmfEquals {
-    public static void main (String argv[]) {
+public class TestXdmfEquals
+{
+    public static void main (String argv[])
+	{
        System.out.println("Hello World");

 	System.out.println("Checking XdmfAttributeCenter");	

--- a/tests/Python/TestXdmfWriter.py
+++ b/tests/Python/TestXdmfWriter.py
@@ -5,14 +5,45 @@ if __name__ == "__main__":
    writer = XdmfWriter.New("output.xmf")
    writer.setLightDataLimit(10)

+    heavyFile = "testoutput.h5"
+    replaceFile = True
+    exampleHeavyWriter = XdmfHDF5Writer.New(heavyFile, replaceFile)
+    exampleWriter = XdmfWriter.New("testoutput.xmf", exampleHeavyWriter)
+
    grid = XdmfUnstructuredGrid.New()
    grid.setName("test")
    points = [0.1, 0.1, 1.1, 1.1, 0.1, 1.1, 3.1, 0.1, 2.1, 0.1, 1.1, 1.1, 1.1,
              1.1, 1.1, 3.1, 2.1, 2.1, 0.1, 0.1, -1.1, 1.1, 0.1, -1.1, 3.1,
              0.1, -2.1, 0.1, 1.1, -1.1, 1.1, 1.1, -1.1, 3.1, 2.1, -2.1]

+    testArray = XdmfArray.New()
+
+    dimensionVector = UInt32Vector()
+    dimensionVector.push_back(3)
+    dimensionVector.push_back(12)
+
+    testArray.initialize(XdmfArrayType.Float64(), dimensionVector)
+#    testArray.initialize(XdmfArrayType.Float64(), 36)
+
+    testVals = [float(piece) for piece in testArray.getValuesString().split()]
+    print testVals
+    print "These values are not exact because of the way that python handles floats"
+
+    testArray.insertAsFloat64(0, points)
+
+    arrayDimensions = testArray.getDimensions()
+
+    for val in arrayDimensions:
+      print val
+
+    testVals = [float(piece) for piece in testArray.getValuesString().split()]
+    print testVals
+    print "These values are not exact because of the way that python handles floats"
+
    grid.getGeometry().setType(XdmfGeometryType.XYZ())
-    grid.getGeometry().insertAsFloat64(0, points)
+    grid.getGeometry().insert(0, testArray, 0, 36, 1, 1);
+# or insert points directly
+#    grid.getGeometry().insertAsFloat64(0, points)

    connectivity = [0, 1, 7, 6, 3, 4, 10, 9, 1, 2, 8, 7, 4, 5, 11, 10]
    grid.getTopology().setType(XdmfTopologyType.Hexahedron())
@@ -32,9 +63,101 @@ if __name__ == "__main__":
    cellVals = [100, 200]
    cellAttribute.insertAsFloat64(0, cellVals)

+    map1Attribute = XdmfAttribute.New()
+    map1Attribute.setName("Test Attribute")
+    map1Attribute.setType(XdmfAttributeType.Scalar())
+    map1Attribute.setCenter(XdmfAttributeCenter.Node())
+    map1Vals = [1,2,3,4,5,7,9]
+    map1Attribute.insertAsInt32(0, map1Vals)
+
+    map2Attribute = XdmfAttribute.New()
+    map2Attribute.setName("Test Attribute")
+    map2Attribute.setType(XdmfAttributeType.Scalar())
+    map2Attribute.setCenter(XdmfAttributeCenter.Node())
+    map2Vals = [9,8,7,4,3]
+    map2Attribute.insertAsInt32(0, map2Vals)
+
+    testVector = AttributeVector()
+    testVector.push_back(map1Attribute)
+    testVector.push_back(map2Attribute)
+
+    testMap = XdmfMap.New(testVector)
+
+    taskIDMap = testMap[0].getMap()
+    nodeIDMap = taskIDMap[1]
+
+    print type(taskIDMap)
+
+    i = 0
+    for val in taskIDMap:
+      print val
+      i = i + 1
+      if i == taskIDMap.size():
+        break
+
+    i = 0
+    for val in nodeIDMap:
+      print val
+      i = i + 1
+      if i == nodeIDMap.size():
+        break
+
+    for val in nodeIDMap[3]:
+      print val
+
+    newTaskMap = XdmfMapMap()
+
+    newNodeIdMap = XdmfMapNodeIdMap()
+
+    newNodeIdMap[0] = (1,)
+    newNodeIdMap[1] = (5,)
+    newNodeIdMap[2] = (3,)
+    newNodeIdMap[3] = (6,)
+    newNodeIdMap[4] = (2,)
+
+    newTaskMap[1] = newNodeIdMap
+
+    testSetMap = XdmfMap.New()
+    testSetMap.setMap(newTaskMap)
+
    grid.insert(nodalAttribute)
    grid.insert(cellAttribute)
+    grid.insert(testSetMap)
+    for insertedMap in testMap:
+      grid.insert(insertedMap)
+
+
+    xPoints = XdmfArray.New()
+    xPoints.pushBackAsInt32(1)
+    xPoints.pushBackAsInt32(2)
+    xPoints.pushBackAsInt32(3)
+    xPoints.pushBackAsInt32(4)
+    xPoints.pushBackAsInt32(5)
+
+    yPoints = XdmfArray.New()
+    yPoints.pushBackAsInt32(1)
+    yPoints.pushBackAsInt32(2)
+    yPoints.pushBackAsInt32(3)
+    yPoints.pushBackAsInt32(4)
+    yPoints.pushBackAsInt32(5)
+
+    zPoints = XdmfArray.New()
+    zPoints.pushBackAsInt32(1)
+    zPoints.pushBackAsInt32(2)
+    zPoints.pushBackAsInt32(3)
+    zPoints.pushBackAsInt32(4)
+    zPoints.pushBackAsInt32(5)
+
+    arrayVector = ArrayVector()
+    arrayVector.push_back(xPoints)
+    arrayVector.push_back(yPoints)
+    arrayVector.push_back(zPoints)
+
+    rectGrid = XdmfRectilinearGrid.New(arrayVector)
+

    domain = XdmfDomain.New()
    domain.insert(grid)
+    domain.insert(rectGrid)
    domain.accept(writer)
+    domain.accept(exampleWriter)
--- a/tests/Python/editedtestoutput.h5
+++ b/tests/Python/editedtestoutput.h5
--- a/tests/Python/editedtestoutput.xmf
+++ b/tests/Python/editedtestoutput.xmf
+<?xml version="1.0" encoding="utf-8"?>
+<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
+  <Domain>
+    <Information Name="Domain" Value="This is the primary data structure in Xdmf">
+      <Information Name="Information" Value="Information can have information"/>
+    </Information>
+    <Grid CollectionType="Spatial" GridType="Collection" Name="GridCollection Example">
+      <Information Name="Grid Collection 1" Value="This is the main grid collection"/>
+      <Geometry Type="None"/>
+      <Topology Dimensions="0" Type="NoTopology"/>
+      <Map Name="">
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">1 1 1 1 1 1 2 2 3 3 3 3 3</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 4 5 3 5 0 1 2 4 5</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 4 5 1 5 2 3 5 0 1</DataItem>
+      </Map>
+      <Map Name="">
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 0 0 0 0 0 2 2 3 3 3 3 3</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 4 5 3 5 0 1 2 4 5</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 4 5 1 5 2 3 5 0 1</DataItem>
+      </Map>
+      <Map Name="">
+        <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">0 0 1 1 3 3 3</DataItem>
+        <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">1 5 1 5 0 2 5</DataItem>
+        <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">3 5 3 5 4 6 1</DataItem>
+      </Map>
+      <Map Name="">
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 0 0 0 0 1 1 1 1 1 2 2 2</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 5 0 1 2 3 5 1 4 6</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">4 5 0 1 2 4 5 0 1 2 5 0 2</DataItem>
+      </Map>
+      <Grid CollectionType="None" GridType="Collection" Name="Secondary grid collection">
+        <Geometry Type="None"/>
+        <Topology Dimensions="0" Type="NoTopology"/>
+      </Grid>
+      <Grid Name="Curvilinear Grid Example">
+        <Information Name="Curvilinear Grid" Value="This is an example curvilinear grid"/>
+        <Time Value="5">
+          <Information Name="Time" Value="The Time of the Curvilinear Grid"/>
+        </Time>
+        <Geometry Type="XYZ">
+          <Information Name="Geometry" Value="The geometry of the curvilinear grid"/>
+          <DataItem DataType="Float" Dimensions="39" Format="XML" Precision="8">2.1 2.1 3.1 3.1 2.1 3.1 5.1 2.1 4.1 2.1 3.1 3.1 3.1 3.1 3.1 5.1 4.1 4.1 2.1 2.1 1.1 3.1 2.1 1.1 5.1 2.1 -0.1 2.1 3.1 1.1 2.1 3.1 0.9 5.1 4.1 -0.1 36 37 38</DataItem>
+        </Geometry>
+        <Topology Dimensions="13 13 13" Type="3DSMesh"/>
+        <Attribute Center="Node" Name="Global Node Equivalencies" Type="GlobalId">
+          <Information Name="Global Node Equivalencies" Value="These are the global nodes that accociate with the local nodes"/>
+          <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">3 6 2 8 1 7 5</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/2/5)"/>
+      </Grid>
+      <Grid Name="Rectilinear Grid Example">
+        <Time Value="5">
+          <Information Name="Time" Value="The time of the rectiliniear grid"/>
+        </Time>
+        <Geometry Type="VXVYVZ">
+          <DataItem DataType="Float" Dimensions="13" Format="XML" Precision="8">2.1 2.1 3.1 3.1 2.1 3.1 5.1 2.1 4.1 2.1 3.1 3.1 12</DataItem>
+          <DataItem DataType="Float" Dimensions="13" Format="XML" Precision="8">3.1 3.1 3.1 5.1 4.1 4.1 2.1 2.1 1.1 3.1 2.1 1.1 12</DataItem>
+          <DataItem DataType="Float" Dimensions="13" Format="XML" Precision="8">5.1 2.1 -0.1 2.1 3.1 1.1 2.1 3.1 0.9 5.1 4.1 -0.1 12</DataItem>
+        </Geometry>
+        <Topology Dimensions="13 13 13" Type="3DRectMesh"/>
+        <Attribute Center="Node" Name="Global Node Equivalencies" Type="GlobalId">
+          <Information Name="Global Node Equivalencies" Value="These are the global nodes that associate with the local nodes"/>
+          <DataItem DataType="Int" Dimensions="6" Format="XML" Precision="4">6 4 3 7 9 8</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/2/6)"/>
+      </Grid>
+      <Grid Name="Regular Grid Example">
+        <Time Value="5"/>
+        <Geometry Type="ORIGIN_DXDYDZ">
+          <DataItem DataType="Float" Dimensions="3" Format="XML" Precision="8">1 1 1</DataItem>
+          <DataItem DataType="Float" Dimensions="3" Format="XML" Precision="8">11 11 11</DataItem>
+        </Geometry>
+        <Topology Dimensions="6 6 6" Type="3DCoRectMesh"/>
+        <Attribute Center="Node" Name="Global Node Equivalencies" Type="GlobalId">
+          <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">3 5 1 2 4 8 0</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/2/7)"/>
+      </Grid>
+      <Grid Name="Unstructured Grid Example">
+        <Time Value="5">
+          <Information Name="Time" Value="This is the time for the Unstructured Grid"/>
+        </Time>
+        <Geometry Type="XYZ">
+          <Information Name="Geometry" Value="This is the geometry associated with the unstructured grid"/>
+          <DataItem DataType="Float" Dimensions="36" Format="XML" Precision="8">1.1 1.1 2.1 2.1 1.1 2.1 4.1 1.1 3.1 1.1 2.1 2.1 2.1 2.1 2.1 4.1 3.1 3.1 1.1 1.1 -0.1 2.1 1.1 -0.1 4.1 1.1 -1.1 1.1 2.1 -0.1 2.1 2.1 -0.1 4.1 3.1 -1.1</DataItem>
+        </Geometry>
+        <Topology Dimensions="2" Type="Hexahedron">
+          <DataItem DataType="Int" Dimensions="16" Format="XML" Precision="4">1 2 8 7 4 5 11 10 2 3 9 8 5 6 12 11</DataItem>
+        </Topology>
+        <Attribute Center="Node" Name="Global Node Equivalencies" Type="GlobalId">
+          <DataItem DataType="Int" Dimensions="6" Format="XML" Precision="4">5 2 8 7 9 1</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/2/4)"/>
+        <Set Name="Unstructured Grid's Set" Type="Node">
+          <Information Name="Data Set" Value="This is a set of arbitrary data"/>
+          <Attribute Center="Node" Name="The Set's attribute" Type="Scalar">
+            <DataItem DataType="Float" Dimensions="9" Format="XML" Precision="8">1.9 2.8 3.7 4.6 5.5 6.4 7.3 8.2 9.1</DataItem>
+          </Attribute>
+          <DataItem DataType="Float" Dimensions="10" Format="XML" Precision="8">1.1 2.2 3.3 4.4 5.5 6.6 7.7 8.8 9.9 0.23</DataItem>
+        </Set>
+      </Grid>
+    </Grid>
+    <xi:include xpointer="element(/1/1/2/9)"/>
+    <xi:include xpointer="element(/1/1/2/10)"/>
+    <xi:include xpointer="element(/1/1/2/11)"/>
+    <xi:include xpointer="element(/1/1/2/12)"/>
+  </Domain>
+</Xdmf>
--- a/tests/Python/testoutput.h5
+++ b/tests/Python/testoutput.h5
--- a/tests/Python/testoutput.xmf
+++ b/tests/Python/testoutput.xmf
+<?xml version="1.0" encoding="utf-8"?>
+<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
+  <Domain>
+    <Information Name="Domain" Value="This is the primary data structure in Xdmf">
+      <Information Name="Information" Value="Information can have information"/>
+    </Information>
+    <Grid CollectionType="Spatial" GridType="Collection" Name="GridCollection Example">
+      <Information Name="Grid Collection 1" Value="This is the main grid collection"/>
+      <Geometry Type="None"/>
+      <Topology Dimensions="0" Type="NoTopology"/>
+      <Map Name="">
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">1 1 1 1 1 1 2 2 3 3 3 3 3</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 4 5 3 5 0 1 2 4 5</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 4 5 1 5 2 3 5 0 1</DataItem>
+      </Map>
+      <Map Name="">
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 0 0 0 0 0 2 2 3 3 3 3 3</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 4 5 3 5 0 1 2 4 5</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 4 5 1 5 2 3 5 0 1</DataItem>
+      </Map>
+      <Map Name="">
+        <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">0 0 1 1 3 3 3</DataItem>
+        <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">1 5 1 5 0 2 5</DataItem>
+        <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">3 5 3 5 4 6 1</DataItem>
+      </Map>
+      <Map Name="">
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 0 0 0 0 1 1 1 1 1 2 2 2</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">0 1 2 3 5 0 1 2 3 5 1 4 6</DataItem>
+        <DataItem DataType="Int" Dimensions="13" Format="XML" Precision="4">4 5 0 1 2 4 5 0 1 2 5 0 2</DataItem>
+      </Map>
+      <Grid CollectionType="None" GridType="Collection" Name="Secondary grid collection">
+        <Geometry Type="None"/>
+        <Topology Dimensions="0" Type="NoTopology"/>
+      </Grid>
+      <Grid Name="Curvilinear Grid Example">
+        <Information Name="Curvilinear Grid" Value="This is an example curvilinear grid"/>
+        <Time Value="5">
+          <Information Name="Time" Value="The Time of the Curvilinear Grid"/>
+        </Time>
+        <Geometry Type="XYZ">
+          <Information Name="Geometry" Value="The geometry of the curvilinear grid"/>
+          <DataItem DataType="Float" Dimensions="36" Format="XML" Precision="8">1.1 1.1 2.1 2.1 1.1 2.1 4.1 1.1 3.1 1.1 2.1 2.1 2.1 2.1 2.1 4.1 3.1 3.1 1.1 1.1 0.1 2.1 1.1 0.1 4.1 1.1 -1.1 1.1 2.1 0.1 1.1 2.1 -0.1 4.1 3.1 -1.1</DataItem>
+        </Geometry>
+        <Topology Dimensions="12 12 12" Type="3DSMesh"/>
+        <Attribute Center="Node" Name="Global Node Equivalencies" Type="GlobalId">
+          <Information Name="Global Node Equivalencies" Value="These are the global nodes that accociate with the local nodes"/>
+          <DataItem DataType="Int" Dimensions="6" Format="XML" Precision="4">1 4 5 7 3 6</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/2/5)"/>
+      </Grid>
+      <Grid Name="Rectilinear Grid Example">
+        <Time Value="5">
+          <Information Name="Time" Value="The time of the rectiliniear grid"/>
+        </Time>
+        <Geometry Type="VXVYVZ">
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="8">1.1 1.1 2.1 2.1 1.1 2.1 4.1 1.1 3.1 1.1 2.1 2.1</DataItem>
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="8">2.1 2.1 2.1 4.1 3.1 3.1 1.1 1.1 0.1 2.1 1.1 0.1</DataItem>
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="8">4.1 1.1 -1.1 1.1 2.1 0.1 1.1 2.1 -0.1 4.1 3.1 -1.1</DataItem>
+        </Geometry>
+        <Topology Dimensions="12 12 12" Type="3DRectMesh"/>
+        <Attribute Center="Node" Name="Global Node Equivalencies" Type="GlobalId">
+          <Information Name="Global Node Equivalencies" Value="These are the global nodes that associate with the local nodes"/>
+          <DataItem DataType="Int" Dimensions="6" Format="XML" Precision="4">2 7 9 0 8 6</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/2/6)"/>
+      </Grid>
+      <Grid Name="Regular Grid Example">
+        <Time Value="5"/>
+        <Geometry Type="ORIGIN_DXDYDZ">
+          <DataItem DataType="Float" Dimensions="3" Format="XML" Precision="8">0 0 0</DataItem>
+          <DataItem DataType="Float" Dimensions="3" Format="XML" Precision="8">10 10 10</DataItem>
+        </Geometry>
+        <Topology Dimensions="5 5 5" Type="3DCoRectMesh"/>
+        <Attribute Center="Node" Name="Global Node Equivalencies" Type="GlobalId">
+          <DataItem DataType="Int" Dimensions="7" Format="XML" Precision="4">3 6 1 4 2 5 9</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/2/7)"/>
+      </Grid>
+      <Grid Name="Unstructured Grid Example">
+        <Time Value="5">
+          <Information Name="Time" Value="This is the time for the Unstructured Grid"/>
+        </Time>
+        <Geometry Type="XYZ">
+          <Information Name="Geometry" Value="This is the geometry associated with the unstructured grid"/>
+          <DataItem DataType="Float" Dimensions="36" Format="XML" Precision="8">0.1 0.1 1.1 1.1 0.1 1.1 3.1 0.1 2.1 0.1 1.1 1.1 1.1 1.1 1.1 3.1 2.1 2.1 0.1 0.1 -1.1 1.1 0.1 -1.1 3.1 0.1 -2.1 0.1 1.1 -1.1 1.1 1.1 -1.1 3.1 2.1 -2.1</DataItem>
+        </Geometry>
+        <Topology Dimensions="2" Type="Hexahedron">
+          <DataItem DataType="Int" Dimensions="16" Format="XML" Precision="4">0 1 7 6 3 4 10 9 1 2 8 7 4 5 11 10</DataItem>
+        </Topology>
+        <Attribute Center="Node" Name="Global Node Equivalencies" Type="GlobalId">
+          <DataItem DataType="Int" Dimensions="6" Format="XML" Precision="4">1 4 5 7 3 6</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/2/4)"/>
+        <Set Name="Unstructured Grid's Set" Type="Node">
+          <Information Name="Data Set" Value="This is a set of arbitrary data"/>
+          <Attribute Center="Node" Name="The Set's attribute" Type="Scalar">
+            <DataItem DataType="Float" Dimensions="9" Format="XML" Precision="8">1.9 2.8 3.7 4.6 5.5 6.4 7.3 8.2 9.1</DataItem>
+          </Attribute>
+          <DataItem DataType="Float" Dimensions="5" Format="XML" Precision="8">5.1 4.2 3.3 2.4 1.5</DataItem>
+        </Set>
+      </Grid>
+    </Grid>
+    <xi:include xpointer="element(/1/1/2/9)"/>
+    <xi:include xpointer="element(/1/1/2/10)"/>
+    <xi:include xpointer="element(/1/1/2/11)"/>
+    <xi:include xpointer="element(/1/1/2/12)"/>
+  </Domain>
+</Xdmf>
--- a/utils/tests/Fortran/a.out
+++ b/utils/tests/Fortran/a.out
--- a/utils/tests/Fortran/editTest
+++ b/utils/tests/Fortran/editTest
--- a/utils/tests/Fortran/edited_output.h5
+++ b/utils/tests/Fortran/edited_output.h5
--- a/utils/tests/Fortran/edited_output.xmf
+++ b/utils/tests/Fortran/edited_output.xmf
+<?xml version="1.0" encoding="utf-8"?>
+<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
+  <Domain>
+    <Grid CollectionType="Temporal" GridType="Collection" Name="Temporal">
+      <Information Name="GridCollection1" Value="This is Grid collection 1"/>
+      <Geometry Type="None"/>
+      <Topology Dimensions="0" Type="NoTopology"/>
+      <Grid Name="Edited Grid">
+        <Information Name="Edited Key" Value="Edited Value"/>
+        <Time Value="1"/>
+        <Geometry Type="XYZ">
+          <DataItem DataType="Float" Dimensions="36" Format="XML" Precision="4">0 0 1 1 0 1 3 0 2 0 1 1 1 1 1 3 2 2 0 0 -1 1 0 -1 3 0 -2 0 1 -1 1 1 -1 3 2 -2</DataItem>
+        </Geometry>
+        <Topology Dimensions="2" Type="Hexahedron">
+          <DataItem DataType="Int" Dimensions="16" Format="XML" Precision="4">0 1 7 6 3 4 10 9 1 2 8 7 4 5 11 10</DataItem>
+        </Topology>
+        <Attribute Center="Node" Name="NodeValues" Type="Scalar">
+          <Information Name="Attrib1" Value="This is Attribute 1"/>
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="8">100 200 300 300 400 500 300 400 500 500 600 700</DataItem>
+        </Attribute>
+        <Attribute Center="Node" Name="Edited Attribute" Type="Scalar">
+          <DataItem DataType="Float" Dimensions="4" Format="XML" Precision="8">100 200 300 300</DataItem>
+        </Attribute>
+        <Attribute Center="Node" Name="SmallNodeValues" Type="Scalar">
+          <DataItem DataType="Float" Dimensions="6" Format="XML" Precision="8">100 200 300 300 400 500</DataItem>
+        </Attribute>
+        <Map Name="TestMap">
+          <DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">1 1 1 1 1</DataItem>
+          <DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">2 2 3 3 3</DataItem>
+          <DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">3 4 3 5 8</DataItem>
+        </Map>
+        <Set Name="EditedSet" Type="Node">
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="8">100 200 300 300 400 500 300 400 500 500 600 700</DataItem>
+        </Set>
+      </Grid>
+      <Grid Name="Identical">
+        <Time Value="2"/>
+        <xi:include xpointer="element(/1/1/1/4/3)"/>
+        <xi:include xpointer="element(/1/1/1/4/4)"/>
+        <Attribute Center="Cell" Name="CellValues" Type="Scalar">
+          <Information Name="Attrib2" Value="This is Attribute 2"/>
+          <DataItem DataType="Float" Dimensions="2" Format="XML" Precision="8">100 200</DataItem>
+        </Attribute>
+        <xi:include xpointer="element(/1/1/1/4/5)"/>
+        <xi:include xpointer="element(/1/1/1/4/8)"/>
+        <Set Name="TestSet" Type="Node">
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="8">100 200 300 300 400 500 300 400 500 500 600 700</DataItem>
+        </Set>
+      </Grid>
+    </Grid>
+  </Domain>
+</Xdmf>
--- a/utils/tests/Fortran/inputTest
+++ b/utils/tests/Fortran/inputTest
--- a/utils/tests/Fortran/my_output.h5
+++ b/utils/tests/Fortran/my_output.h5
--- a/utils/tests/Fortran/my_output.xmf
+++ b/utils/tests/Fortran/my_output.xmf
+<?xml version="1.0" encoding="utf-8"?>
+<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
+  <Domain>
+    <Grid CollectionType="Temporal" GridType="Collection" Name="Temporal">
+      <Information Name="GridCollection1" Value="This is Grid collection 1"/>
+      <Geometry Type="None"/>
+      <Topology Dimensions="0" Type="NoTopology"/>
+      <Grid Name="TestGrid">
+        <Information Name="Grid1" Value="This is Grid 1"/>
+        <Time Value="1"/>
+        <Geometry Type="XYZ">
+          <DataItem DataType="Float" Dimensions="36" Format="XML" Precision="4">0 0 1 1 0 1 3 0 2 0 1 1 1 1 1 3 2 2 0 0 -1 1 0 -1 3 0 -2 0 1 -1 1 1 -1 3 2 -2</DataItem>
+        </Geometry>
+        <Topology Dimensions="2" Type="Hexahedron">
+          <DataItem DataType="Int" Dimensions="16" Format="XML" Precision="4">0 1 7 6 3 4 10 9 1 2 8 7 4 5 11 10</DataItem>
+        </Topology>
+        <Attribute Center="Node" Name="NodeValues" Type="Scalar">
+          <Information Name="Attrib1" Value="This is Attribute 1"/>
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="8">100 200 300 300 400 500 300 400 500 500 600 700</DataItem>
+        </Attribute>
+        <Attribute Center="Cell" Name="CellValues" Type="Scalar">
+          <Information Name="Attrib2" Value="This is Attribute 2"/>
+          <DataItem DataType="Float" Dimensions="2" Format="XML" Precision="8">100 200</DataItem>
+        </Attribute>
+        <Attribute Center="Node" Name="SmallNodeValues" Type="Scalar">
+          <DataItem DataType="Float" Dimensions="6" Format="XML" Precision="8">100 200 300 300 400 500</DataItem>
+        </Attribute>
+        <Map Name="TestMap">
+          <DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">1 1 1 1 1</DataItem>
+          <DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">2 2 3 3 3</DataItem>
+          <DataItem DataType="Int" Dimensions="5" Format="XML" Precision="4">3 4 3 5 8</DataItem>
+        </Map>
+        <Set Name="TestSet" Type="Node">
+          <DataItem DataType="Float" Dimensions="12" Format="XML" Precision="8">100 200 300 300 400 500 300 400 500 500 600 700</DataItem>
+        </Set>
+      </Grid>
+      <Grid Name="Identical">
+        <Time Value="2"/>
+        <xi:include xpointer="element(/1/1/1/4/3)"/>
+        <xi:include xpointer="element(/1/1/1/4/4)"/>
+        <xi:include xpointer="element(/1/1/1/4/6)"/>
+        <xi:include xpointer="element(/1/1/1/4/5)"/>
+        <xi:include xpointer="element(/1/1/1/4/8)"/>
+        <xi:include xpointer="element(/1/1/1/4/9)"/>
+      </Grid>
+    </Grid>
+  </Domain>
+</Xdmf>
--- a/utils/tests/Fortran/outputTest
+++ b/utils/tests/Fortran/outputTest