From fd1ddd083b25e082314337dd5b24a5c0e67f6502 Mon Sep 17 00:00:00 2001
From: Tom Fischer <thomas.fischer@ufz.de>
Date: Tue, 26 Nov 2024 11:08:55 +0100
Subject: [PATCH] [T/LF/XDMF] Change bulk ids data type in input vtu
- don't tag the bulk_{node,element}_ids as IdType
---
.../XDMF/square_5x5_tris_32_left_boundary.vtu | 53 +++++--------------
.../square_5x5_tris_32_right_boundary.vtu | 53 +++++--------------
2 files changed, 26 insertions(+), 80 deletions(-)
diff --git a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_left_boundary.vtu b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_left_boundary.vtu
index 52b20854c8f..0a0fe2a4ed3 100644
--- a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_left_boundary.vtu
+++ b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_left_boundary.vtu
@@ -1,51 +1,24 @@
+<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
- <Piece NumberOfPoints="5" NumberOfCells="4">
- <PointData Scalars="bulk_node_ids">
- <DataArray type="UInt64" IdType="1" Name="bulk_node_ids" format="ascii" RangeMin="0" RangeMax="20">
- 5 0 10 15 20
- </DataArray>
+ <Piece NumberOfPoints="5" NumberOfCells="4" >
+ <PointData>
+ <DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="0" RangeMax="20" offset="0" />
</PointData>
- <CellData Scalars="bulk_element_ids">
- <DataArray type="UInt64" IdType="1" Name="bulk_element_ids" format="ascii" RangeMin="0" RangeMax="24">
- 0 8 16 24
- </DataArray>
+ <CellData>
+ <DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="0" RangeMax="24" offset="64" />
</CellData>
<Points>
- <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="ascii" RangeMin="0" RangeMax="5">
- 0 1.25 3 0 0 3
- 0 2.5 3 0 3.75 3
- 0 5 3
- <InformationKey name="L2_NORM_RANGE" location="vtkDataArray" length="2">
- <Value index="0">
- 0
- </Value>
- <Value index="1">
- 5
- </Value>
- </InformationKey>
- <InformationKey name="L2_NORM_FINITE_RANGE" location="vtkDataArray" length="2">
- <Value index="0">
- 0
- </Value>
- <Value index="1">
- 5
- </Value>
- </InformationKey>
- </DataArray>
+ <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="5" offset="120" />
</Points>
<Cells>
- <DataArray type="Int64" Name="connectivity" format="ascii" RangeMin="0" RangeMax="4">
- 0 1 2 0 3 2
- 4 3
- </DataArray>
- <DataArray type="Int64" Name="offsets" format="ascii" RangeMin="2" RangeMax="8">
- 2 4 6 8
- </DataArray>
- <DataArray type="UInt8" Name="types" format="ascii" RangeMin="3" RangeMax="3">
- 3 3 3 3
- </DataArray>
+ <DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
+ <DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
+ <DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
+ <AppendedData encoding="base64">
+ _KAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAACgAAAAAAAAAPAAAAAAAAABQAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAEAAAAAAAAAAYAAAAAAAAAA==eAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPQ/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABRAAAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAQAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
+ </AppendedData>
</VTKFile>
diff --git a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_right_boundary.vtu b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_right_boundary.vtu
index 8df915d4a23..b8e6962db16 100644
--- a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_right_boundary.vtu
+++ b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_right_boundary.vtu
@@ -1,51 +1,24 @@
+<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
<UnstructuredGrid>
- <Piece NumberOfPoints="5" NumberOfCells="4">
- <PointData Scalars="bulk_node_ids">
- <DataArray type="UInt64" IdType="1" Name="bulk_node_ids" format="ascii" RangeMin="4" RangeMax="24">
- 4 9 14 19 24
- </DataArray>
+ <Piece NumberOfPoints="5" NumberOfCells="4" >
+ <PointData>
+ <DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="4" RangeMax="24" offset="0" />
</PointData>
- <CellData Scalars="bulk_element_ids">
- <DataArray type="UInt64" IdType="1" Name="bulk_element_ids" format="ascii" RangeMin="7" RangeMax="31">
- 7 15 23 31
- </DataArray>
+ <CellData>
+ <DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="7" RangeMax="31" offset="64" />
</CellData>
<Points>
- <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="ascii" RangeMin="5" RangeMax="7.0710678118654755">
- 5 0 3 5 1.25 3
- 5 2.5 3 5 3.75 3
- 5 5 3
- <InformationKey name="L2_NORM_RANGE" location="vtkDataArray" length="2">
- <Value index="0">
- 5
- </Value>
- <Value index="1">
- 7.0710678119
- </Value>
- </InformationKey>
- <InformationKey name="L2_NORM_FINITE_RANGE" location="vtkDataArray" length="2">
- <Value index="0">
- 5
- </Value>
- <Value index="1">
- 7.0710678119
- </Value>
- </InformationKey>
- </DataArray>
+ <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="5" RangeMax="7.0710678119" offset="120" />
</Points>
<Cells>
- <DataArray type="Int64" Name="connectivity" format="ascii" RangeMin="0" RangeMax="4">
- 0 1 1 2 2 3
- 3 4
- </DataArray>
- <DataArray type="Int64" Name="offsets" format="ascii" RangeMin="2" RangeMax="8">
- 2 4 6 8
- </DataArray>
- <DataArray type="UInt8" Name="types" format="ascii" RangeMin="3" RangeMax="3">
- 3 3 3 3
- </DataArray>
+ <DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="292" />
+ <DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="388" />
+ <DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="444" />
</Cells>
</Piece>
</UnstructuredGrid>
+ <AppendedData encoding="base64">
+ _KAAAAAAAAAAEAAAAAAAAAAkAAAAAAAAADgAAAAAAAAATAAAAAAAAABgAAAAAAAAAIAAAAAAAAAAHAAAAAAAAAA8AAAAAAAAAFwAAAAAAAAAfAAAAAAAAAA==eAAAAAAAAAAAAAAAAAAUQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAAAAAAAPQ/AAAAAAAAAAAAAAAAAAAUQAAAAAAAAARAAAAAAAAAAAAAAAAAAAAUQAAAAAAAAA5AAAAAAAAAAAAAAAAAAAAUQAAAAAAAABRAAAAAAAAAAAA=QAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAQAAAAAAAAAIAAAAAAAAAACAAAAAAAAAAQAAAAAAAAABgAAAAAAAAAIAAAAAAAAAA==BAAAAAAAAAADAwMD
+ </AppendedData>
</VTKFile>
--
GitLab