Merge branch 'ChangePythonMeshInterface' into 'master'

[App/Python] Change connectivity data layout in OGSPython mesh. See merge request ogs/ogs!5147
ufz · Nov 1, 2024 · 32da72c · 32da72c
2 parents 6efb29f + 3ee9132
commit 32da72c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Applications/Python/ogs.mesh/OGSMesh.cpp b/Applications/Python/ogs.mesh/OGSMesh.cpp
@@ -54,7 +54,6 @@ std::pair<std::vector<int>, std::vector<int>> OGSMesh::getCells() const
     std::vector<int> cell_types;
     for (auto const* element : elements)
     {
-        cells.push_back(static_cast<int>(element->getNumberOfNodes()));
         ranges::copy(element->nodes() | MeshLib::views::ids,
                      std::back_inserter(cells));
         cell_types.push_back(OGSToVtkCellType(element->getCellType()));

diff --git a/Tests/Python/test_simulator_mesh_interface.py b/Tests/Python/test_simulator_mesh_interface.py
@@ -64,10 +64,10 @@ def checkCells(cells, celltypes, points):
     # structured mesh with equal size cells
     for c in range(len(celltypes)):
         area = computeQuadArea(
-            points[cells[5 * c + 1]],
-            points[cells[5 * c + 2]],
-            points[cells[5 * c + 3]],
-            points[cells[5 * c + 4]],
+            points[cells[4 * c + 0]],
+            points[cells[4 * c + 1]],
+            points[cells[4 * c + 2]],
+            points[cells[4 * c + 3]],
         )
         if abs(area - 1.0 / 9.0) > sys.float_info.epsilon:
             print(
@@ -76,7 +76,7 @@ def checkCells(cells, celltypes, points):
                 + " is: "
                 + str(area)
                 + ", expected value is "
-                + str(1.0 / 1.9)
+                + str(1.0 / 9.0)
             )