[cmake,ci] Removed all remaining occurences of OGS_USE_XDMF.

CMakeLists.txt

@@ -102,7 +102,6 @@ if(OGS_USE_PETSC AND MSVC)
     )
 endif()
 option(OGS_USE_NETCDF "Add NetCDF support." OFF)
-option(OGS_USE_XDMF "Add Xdmf file IO support" OFF)
 
 # Eigen
 option(OGS_USE_EIGEN_UNSUPPORTED "Use Eigen unsupported modules" ON)
@@ -195,7 +194,7 @@ include(packaging/Pack)
 # ---- Subdirectories ----
 include_directories(${PROJECT_SOURCE_DIR})
 # xdmfdiff
-if(OGS_USE_XDMF AND OGS_BUILD_TESTING)
+if(OGS_BUILD_TESTING)
     add_subdirectory(Tests/xdmfdiff)
 endif()
 

CMakePresets.json

@@ -134,8 +134,7 @@
       "name": "_all",
       "hidden": true,
       "cacheVariables": {
-        "OGS_USE_MFRONT": "ON",
-        "OGS_USE_XDMF": "ON"
+        "OGS_USE_MFRONT": "ON"
       }
     },
     {

MeshLib/CMakeLists.txt

@@ -49,5 +49,4 @@ target_compile_definitions(
     MeshLib
     PUBLIC
         $<$<AND:$<BOOL:$ENV{VTK_USE_64BIT_IDS}>,$<NOT:$<BOOL:VTK_ADDED>>>:VTK_USE_64BIT_IDS>
-    PRIVATE $<$<BOOL:${OGS_USE_XDMF}>:OGS_USE_XDMF>
 )

ProcessLib/CMakeLists.txt

@@ -38,14 +38,12 @@ target_link_libraries(
         $<$<TARGET_EXISTS:ProcessLibSourceTermPython>:ProcessLibSourceTermPython>
         $<$<TARGET_EXISTS:petsc>:petsc>
         nlohmann_json
-    PRIVATE ParameterLib GitInfoLib
-            $<$<TARGET_EXISTS:InSituLib>:InSituLib>
+    PRIVATE ParameterLib GitInfoLib $<$<TARGET_EXISTS:InSituLib>:InSituLib>
 )
 
 target_compile_definitions(
     ProcessLib
-    PUBLIC $<$<BOOL:${OGS_USE_XDMF}>:OGS_USE_XDMF>
-           # Enabled elements
+    PUBLIC # Enabled elements
            OGS_MAX_ELEMENT_DIM=${OGS_MAX_ELEMENT_DIM}
            OGS_MAX_ELEMENT_ORDER=${OGS_MAX_ELEMENT_ORDER}
            $<$<BOOL:${OGS_ENABLE_ELEMENT_SIMPLEX}>:OGS_ENABLE_ELEMENT_SIMPLEX>

ProcessLib/LiquidFlow/Tests.cmake

@@ -482,7 +482,7 @@ AddTest(
     WRAPPER time
     TESTER xdmfdiff
     # See https://gitlab.opengeosys.org/ogs/ogs/-/merge_requests/3184#note_85104
-    REQUIREMENTS NOT OGS_USE_MPI AND OGS_USE_XDMF AND NOT COMPILER_IS_APPLE_CLANG
+    REQUIREMENTS NOT OGS_USE_MPI AND NOT COMPILER_IS_APPLE_CLANG
     DIFF_DATA
     square_5x5_tris_32.xdmf square_5x5_tris_32.xdmf pressure pressure 1e-7 1e-13
     square_5x5_tris_32.xdmf square_5x5_tris_32.xdmf HydraulicFlow HydraulicFlow 1e-7 1e-13

ProcessLib/SteadyStateDiffusion/Tests.cmake

@@ -423,7 +423,7 @@ AddTest(
     WRAPPER mpirun
     WRAPPER_ARGS -np 3
     TESTER xdmfdiff
-    REQUIREMENTS (OGS_USE_MPI AND OGS_USE_XDMF)
+    REQUIREMENTS OGS_USE_MPI
     DIFF_DATA
     cube_1e3_np3.xdmf cube_1e3_np3.xdmf pressure pressure 1e-3 1e-3
     cube_1e3_np3.xdmf cube_1e3_np3.xdmf v v 1e-3 1e-3
@@ -437,7 +437,7 @@ AddTest(
     WRAPPER mpirun
     WRAPPER_ARGS -np 2
     TESTER xdmfdiff
-    REQUIREMENTS (OGS_USE_MPI AND OGS_USE_XDMF)
+    REQUIREMENTS OGS_USE_MPI
     DIFF_DATA
     cube_1e3_np2.xdmf cube_1e3_np2.xdmf pressure pressure 1e-3 1e-3
     cube_1e3_np2.xdmf cube_1e3_np2.xdmf v v 1e-3 1e-3

scripts/ci/jobs/build-linux-petsc.yml

@@ -9,5 +9,3 @@ build linux petsc:
   variables:
     BUILD_CTEST_LARGE_ON_MASTER: "true"
     CMAKE_PRESET: release-petsc
-    CMAKE_ARGS: >-
-      -DOGS_USE_XDMF=ON

scripts/ci/jobs/build-linux.yml

@@ -14,7 +14,6 @@ build linux:
       -DOGS_USE_MFRONT=ON
       -DOGS_$USE_PYTHON
       -DOGS_INSTALL_DEPENDENCIES=ON
-      -DOGS_USE_XDMF=ON
   parallel:
     matrix:
       - USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"]
@@ -36,7 +35,6 @@ linux ctest large:
       -DOGS_USE_CONAN=OFF
       -DOGS_USE_MFRONT=ON
       -DOGS_USE_PYTHON=ON
-      -DOGS_USE_XDMF=ON
 
 build linux (no unity):
   image: $CONTAINER_GCC_IMAGE
@@ -57,7 +55,6 @@ build linux (no unity):
       -DOGS_USE_CONAN=OFF
       -DOGS_USE_MFRONT=ON
       -DOGS_USE_UNITY_BUILDS=OFF
-      -DOGS_USE_XDMF=ON
 
 build linux (no deps, no procs):
   image: $CONTAINER_GCC_IMAGE

scripts/ci/jobs/build-mac.yml

@@ -11,5 +11,4 @@ build mac:
     CMAKE_PRESET: release
     CMAKE_ARGS: >-
       -DOGS_INSTALL_DEPENDENCIES=ON
-      -DOGS_USE_XDMF=ON
       -DOGS_USE_MFRONT=ON

scripts/ci/jobs/build-win.yml

 build win:
   extends: .template-build-win
   rules:
-    - if: '$USE_PYTHON =~ /ON$/'
+    - if: "$USE_PYTHON =~ /ON$/"
     - if: '$CI_COMMIT_BRANCH == "master"'
     - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
     - when: manual
@@ -14,7 +14,6 @@ build win:
       -DOGS_CI_TESTRUNNER_REPEAT=1
       -DOGS_$USE_PYTHON
       -DOGS_USE_CONAN=AUTO
-      -DOGS_USE_XDMF=ON
   parallel:
     matrix:
       - USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"]

scripts/ci/jobs/code-quality.yml

 cppcheck:
   stage: check
   image: $CONTAINER_GCC_IMAGE
-  needs: [ ci_images, meta ]
+  needs: [ci_images, meta]
   before_script:
     - mkdir -p build
     - cd build
@@ -9,7 +9,7 @@ cppcheck:
     - >
       cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DOGS_USE_CONAN=OFF
       -DOGS_USE_PYTHON=OFF -DOGS_BUILD_UTILS=OFF
-      -DOGS_USE_UNITY_BUILDS=OFF -DOGS_USE_XDMF=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+      -DOGS_USE_UNITY_BUILDS=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
     - bash cppcheck.sh
   artifacts:
     reports:

scripts/cmake/DocumentationSetup.cmake

@@ -62,7 +62,6 @@ set(DOXYGEN_PREDEFINED
     OGS_USE_MFRONT
     OGS_USE_NETCDF
     OGS_USE_PYTHON
-    OGS_USE_XDMF
     USE_INSITU
     USE_LIS
     USE_MKL