Merge branch 'GocadTest' into 'master'

[T] Add test for GocadSGridReader, fix small path issue See merge request ogs/ogs!5162
ufz · Dec 10, 2024 · 788ca4a · 788ca4a
2 parents 9f93398 + 51652ab
commit 788ca4a
Show file tree

Hide file tree

Showing 14 changed files with 26,479 additions and 3 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
       - id: fix-byte-order-marker
         exclude: "^Documentation/.vale/.*"
       - id: mixed-line-ending
-        exclude: ".*\\.vtu"
+        exclude: ".*\\.vtu|.*@@"
   - repo: https://github.com/psf/black
     rev: 23.1.0
     hooks:

diff --git a/Applications/FileIO/GocadIO/CoordinateSystem.cpp b/Applications/FileIO/GocadIO/CoordinateSystem.cpp
@@ -39,7 +39,7 @@ std::string parseName(std::string const& str)
 bool CoordinateSystem::parse(std::istream& in)
 {
     std::string line;  // string used for reading a line
-    boost::char_separator<char> sep("-;| \"");
+    boost::char_separator<char> sep("-;| \"\r");
 
     std::getline(in, line);  // NAME name
     boost::tokenizer<boost::char_separator<char>> tok(line, sep);

diff --git a/Applications/FileIO/GocadIO/GocadSGridReader.cpp b/Applications/FileIO/GocadIO/GocadSGridReader.cpp
@@ -30,7 +30,9 @@ using Bitset = boost::dynamic_bitset<>;
 
 GocadSGridReader::GocadSGridReader(std::string const& fname)
     : _fname(fname),
-      _path(BaseLib::extractPath(fname)),
+      _path(BaseLib::extractPath(fname).empty()
+                ? ""
+                : BaseLib::extractPath(fname) + '/'),
       _n_face_sets(0),
       _double_precision_binary(false),
       _bin_pnts_in_double_precision(false)

diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake
@@ -659,6 +659,16 @@ if(TEST GocadTSurfaceReader-GocadTSurface_Mesh_Test-vtkdiff-mesh)
     )
 endif()
 
+AddTest(
+    NAME GocadSGridReader
+    PATH FileIO/Gocad/GocadSGridReader/SGrid2OGS_Test
+    WORKING_DIRECTORY ${Data_SOURCE_DIR}/FileIO/Gocad/GocadSGridReader/SGrid2OGS_Test
+    EXECUTABLE GocadSGridReader
+    EXECUTABLE_ARGS -s SGrid_Test.sg -o ${Data_BINARY_DIR}/FileIO/Gocad/GocadSGridReader/SGrid2OGS_Test/SGrid_Test.vtu
+    TESTER vtkdiff-mesh
+    DIFF_DATA SGrid_Test.vtu SGrid_Test.vtu 1e-16
+)
+
 AddTest(
     NAME createIntermediateRasters_test
     PATH MeshGeoToolsLib/Hamburg

diff --git a/Tests/Data/FileIO/Gocad/GocadSGridReader/SGrid2OGS_Test/SGrid_Test.sg b/Tests/Data/FileIO/Gocad/GocadSGridReader/SGrid2OGS_Test/SGrid_Test.sg
diff --git a/Tests/Data/FileIO/Gocad/GocadSGridReader/SGrid2OGS_Test/SGrid_Test.vtu b/Tests/Data/FileIO/Gocad/GocadSGridReader/SGrid2OGS_Test/SGrid_Test.vtu
diff --git a/...OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_CELL_VOLUME_CORRECTION_FACTOR@@ b/...OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_CELL_VOLUME_CORRECTION_FACTOR@@
diff --git a/...dSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_GEOLOGIC_K@@ b/...dSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_GEOLOGIC_K@@
diff --git a/...d/GocadSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_UNIT@@ b/...d/GocadSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_UNIT@@
diff --git a/...SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_VISIBLE_TETRA_RECORD_ID@@ b/...SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_VISIBLE_TETRA_RECORD_ID@@
diff --git a/...GridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_fault_blocks@@ b/...GridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped_FSG_fault_blocks@@
diff --git a/...cad/GocadSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped__flags@@ b/...cad/GocadSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped__flags@@
diff --git a/...ad/GocadSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped__points@@ b/...ad/GocadSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped__points@@
diff --git a/...adSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped__region_flags@@ b/...adSGridReader/SGrid2OGS_Test/SGrid_Testflow_simulation_grid_stair-stepped__region_flags@@