-
Notifications
You must be signed in to change notification settings - Fork 238
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'FixConstructMeshesFromGeometryBulkElementIds' into 'mas…
…ter' Use bulk element's id for boundary element construction Closes #3430 See merge request ogs/ogs!4751
- Loading branch information
Showing
18 changed files
with
222 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
Tests/Data/MeshGeoToolsLib/ConstructMeshesFromGeometry/square_1x1.gml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
<?xml version="1.0" encoding="ISO-8859-1"?> | ||
<?xml-stylesheet type="text/xsl" href="OpenGeoSysGLI.xsl"?> | ||
|
||
<OpenGeoSysGLI xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogs="http://www.opengeosys.org"> | ||
<name>square_1x1_geometry</name> | ||
<points> | ||
<point id="0" x="0" y="0" z="0" name="origin"/> | ||
<point id="1" x="0" y="1" z="0"/> | ||
<point id="2" x="1" y="0" z="0"/> | ||
<point id="3" x="1" y="1" z="0"/> | ||
</points> | ||
|
||
<polylines> | ||
<polyline id="0" name="left"> | ||
<pnt>0</pnt> | ||
<pnt>1</pnt> | ||
</polyline> | ||
<polyline id="1" name="right"> | ||
<pnt>2</pnt> | ||
<pnt>3</pnt> | ||
</polyline> | ||
<polyline id="2" name="bottom"> | ||
<pnt>0</pnt> | ||
<pnt>2</pnt> | ||
</polyline> | ||
<polyline id="3" name="top"> | ||
<pnt>1</pnt> | ||
<pnt>3</pnt> | ||
</polyline> | ||
</polylines> | ||
</OpenGeoSysGLI> |
24 changes: 24 additions & 0 deletions
24
Tests/Data/MeshGeoToolsLib/ConstructMeshesFromGeometry/square_1x1_geometry_bottom.vtu
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0"?> | ||
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64"> | ||
<UnstructuredGrid> | ||
<Piece NumberOfPoints="21" NumberOfCells="10" > | ||
<PointData> | ||
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="0" RangeMax="139" offset="0" /> | ||
</PointData> | ||
<CellData> | ||
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="0" RangeMax="9" offset="236" /> | ||
</CellData> | ||
<Points> | ||
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="1" offset="356" /> | ||
</Points> | ||
<Cells> | ||
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="1040" /> | ||
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="1372" /> | ||
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="1492" /> | ||
</Cells> | ||
</Piece> | ||
</UnstructuredGrid> | ||
<AppendedData encoding="base64"> | ||
_qAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAAGAAAAAAAAAAcAAAAAAAAACAAAAAAAAAAJAAAAAAAAAAoAAAAAAAAAeQAAAAAAAAB7AAAAAAAAAH0AAAAAAAAAfwAAAAAAAACBAAAAAAAAAIMAAAAAAAAAhQAAAAAAAACHAAAAAAAAAIkAAAAAAAAAiwAAAAAAAAA=UAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAAGAAAAAAAAAAcAAAAAAAAACAAAAAAAAAAJAAAAAAAAAA==+AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACamZmZmZm5PwAAAAAAAAAAAAAAAAAAAACamZmZmZnJPwAAAAAAAAAAAAAAAAAAAAAzMzMzMzPTPwAAAAAAAAAAAAAAAAAAAACamZmZmZnZPwAAAAAAAAAAAAAAAAAAAAAAAAAAAADgPwAAAAAAAAAAAAAAAAAAAAAzMzMzMzPjPwAAAAAAAAAAAAAAAAAAAABmZmZmZmbmPwAAAAAAAAAAAAAAAAAAAACamZmZmZnpPwAAAAAAAAAAAAAAAAAAAADNzMzMzMzsPwAAAAAAAAAAAAAAAAAAAAAAAAAAAADwPwAAAAAAAAAAAAAAAAAAAACamZmZmZmpPwAAAAAAAAAAAAAAAAAAAAA0MzMzMzPDPwAAAAAAAAAAAAAAAAAAAAAAAAAAAADQPwAAAAAAAAAAAAAAAAAAAABmZmZmZmbWPwAAAAAAAAAAAAAAAAAAAADNzMzMzMzcPwAAAAAAAAAAAAAAAAAAAACamZmZmZnhPwAAAAAAAAAAAAAAAAAAAADMzMzMzMzkPwAAAAAAAAAAAAAAAAAAAAAAAAAAAADoPwAAAAAAAAAAAAAAAAAAAAA0MzMzMzPrPwAAAAAAAAAAAAAAAAAAAABmZmZmZmbuPwAAAAAAAAAAAAAAAAAAAAA=8AAAAAAAAAAAAAAAAAAAAAEAAAAAAAAACwAAAAAAAAABAAAAAAAAAAIAAAAAAAAADAAAAAAAAAACAAAAAAAAAAMAAAAAAAAADQAAAAAAAAADAAAAAAAAAAQAAAAAAAAADgAAAAAAAAAEAAAAAAAAAAUAAAAAAAAADwAAAAAAAAAFAAAAAAAAAAYAAAAAAAAAEAAAAAAAAAAGAAAAAAAAAAcAAAAAAAAAEQAAAAAAAAAHAAAAAAAAAAgAAAAAAAAAEgAAAAAAAAAIAAAAAAAAAAkAAAAAAAAAEwAAAAAAAAAJAAAAAAAAAAoAAAAAAAAAFAAAAAAAAAA=UAAAAAAAAAADAAAAAAAAAAYAAAAAAAAACQAAAAAAAAAMAAAAAAAAAA8AAAAAAAAAEgAAAAAAAAAVAAAAAAAAABgAAAAAAAAAGwAAAAAAAAAeAAAAAAAAAA==CgAAAAAAAAAVFRUVFRUVFRUV | ||
</AppendedData> | ||
</VTKFile> |
24 changes: 24 additions & 0 deletions
24
Tests/Data/MeshGeoToolsLib/ConstructMeshesFromGeometry/square_1x1_geometry_left.vtu
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0"?> | ||
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64"> | ||
<UnstructuredGrid> | ||
<Piece NumberOfPoints="21" NumberOfCells="10" > | ||
<PointData> | ||
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="0" RangeMax="311" offset="0" /> | ||
</PointData> | ||
<CellData> | ||
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="0" RangeMax="90" offset="236" /> | ||
</CellData> | ||
<Points> | ||
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="1" offset="356" /> | ||
</Points> | ||
<Cells> | ||
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="1040" /> | ||
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="1372" /> | ||
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="1492" /> | ||
</Cells> | ||
</Piece> | ||
</UnstructuredGrid> | ||
<AppendedData encoding="base64"> | ||
_qAAAAAAAAAAAAAAAAAAAAAsAAAAAAAAAFgAAAAAAAAAhAAAAAAAAACwAAAAAAAAANwAAAAAAAABCAAAAAAAAAE0AAAAAAAAAWAAAAAAAAABjAAAAAAAAAG4AAAAAAAAAegAAAAAAAACPAAAAAAAAAKQAAAAAAAAAuQAAAAAAAADOAAAAAAAAAOMAAAAAAAAA+AAAAAAAAAANAQAAAAAAACIBAAAAAAAANwEAAAAAAAA=UAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAFAAAAAAAAAAeAAAAAAAAACgAAAAAAAAAMgAAAAAAAAA8AAAAAAAAAEYAAAAAAAAAUAAAAAAAAABaAAAAAAAAAA==+AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJqZmZmZmbk/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmck/AAAAAAAAAAAAAAAAAAAAADMzMzMzM9M/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmdk/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAOA/AAAAAAAAAAAAAAAAAAAAADMzMzMzM+M/AAAAAAAAAAAAAAAAAAAAAGZmZmZmZuY/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmek/AAAAAAAAAAAAAAAAAAAAAM3MzMzMzOw/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmak/AAAAAAAAAAAAAAAAAAAAADQzMzMzM8M/AAAAAAAAAAAAAAAAAAAAAAAAAAAAANA/AAAAAAAAAAAAAAAAAAAAAGZmZmZmZtY/AAAAAAAAAAAAAAAAAAAAAM3MzMzMzNw/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmeE/AAAAAAAAAAAAAAAAAAAAAMzMzMzMzOQ/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAOg/AAAAAAAAAAAAAAAAAAAAADQzMzMzM+s/AAAAAAAAAAAAAAAAAAAAAGZmZmZmZu4/AAAAAAAAAAA=8AAAAAAAAAAAAAAAAAAAAAEAAAAAAAAACwAAAAAAAAABAAAAAAAAAAIAAAAAAAAADAAAAAAAAAACAAAAAAAAAAMAAAAAAAAADQAAAAAAAAADAAAAAAAAAAQAAAAAAAAADgAAAAAAAAAEAAAAAAAAAAUAAAAAAAAADwAAAAAAAAAFAAAAAAAAAAYAAAAAAAAAEAAAAAAAAAAGAAAAAAAAAAcAAAAAAAAAEQAAAAAAAAAHAAAAAAAAAAgAAAAAAAAAEgAAAAAAAAAIAAAAAAAAAAkAAAAAAAAAEwAAAAAAAAAJAAAAAAAAAAoAAAAAAAAAFAAAAAAAAAA=UAAAAAAAAAADAAAAAAAAAAYAAAAAAAAACQAAAAAAAAAMAAAAAAAAAA8AAAAAAAAAEgAAAAAAAAAVAAAAAAAAABgAAAAAAAAAGwAAAAAAAAAeAAAAAAAAAA==CgAAAAAAAAAVFRUVFRUVFRUV | ||
</AppendedData> | ||
</VTKFile> |
24 changes: 24 additions & 0 deletions
24
Tests/Data/MeshGeoToolsLib/ConstructMeshesFromGeometry/square_1x1_geometry_origin.vtu
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0"?> | ||
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64"> | ||
<UnstructuredGrid> | ||
<Piece NumberOfPoints="1" NumberOfCells="1" > | ||
<PointData> | ||
<DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="0" RangeMax="0" offset="0" /> | ||
</PointData> | ||
<CellData> | ||
<DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="0" RangeMax="0" offset="24" /> | ||
</CellData> | ||
<Points> | ||
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="0" offset="48" /> | ||
</Points> | ||
<Cells> | ||
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="92" /> | ||
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="116" /> | ||
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="140" /> | ||
</Cells> | ||
</Piece> | ||
</UnstructuredGrid> | ||
<AppendedData encoding="base64"> | ||
_CAAAAAAAAAAAAAAAAAAAAA==CAAAAAAAAAAAAAAAAAAAAA==GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=CAAAAAAAAAAAAAAAAAAAAA==CAAAAAAAAAABAAAAAAAAAA==AQAAAAAAAAAB | ||
</AppendedData> | ||
</VTKFile> |
Oops, something went wrong.