Merge pull request #970 from 4C-multiphysics/docker-update-refactor-install-and-trilinos-update

maxfirmbach · web-flow · commit 3d92bc88a490 · 2025-12-02T17:16:25.000+01:00
[docker] Update Trilinos to 16.2.0 Release
diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml
@@ -16,7 +16,7 @@ jobs:
   gcc13_assertions_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref != 'refs/heads/main'
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -104,7 +104,7 @@ jobs:
   clang18_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -158,7 +158,7 @@ jobs:
     needs: clang18_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -184,7 +184,7 @@ jobs:
     needs: clang18_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -243,7 +243,7 @@ jobs:
   gcc13_no_optional_dependencies_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -269,7 +269,7 @@ jobs:
     needs: gcc13_no_optional_dependencies_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
diff --git a/.github/workflows/checkcode.yml b/.github/workflows/checkcode.yml
@@ -29,7 +29,7 @@ jobs:
   clang-tidy:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -55,7 +55,7 @@ jobs:
   verify-headers:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -8,7 +8,7 @@ jobs:
   clang18_coverage_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -45,7 +45,7 @@ jobs:
     needs: clang18_coverage_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       matrix:
@@ -111,7 +111,7 @@ jobs:
     needs: [clang18_coverage_test, clang18_coverage_build]
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     steps:
       - uses: actions/checkout@v6
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -18,7 +18,7 @@ jobs:
   doxygen:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -44,7 +44,7 @@ jobs:
   documentation:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
diff --git a/.github/workflows/nightly_tests.yml b/.github/workflows/nightly_tests.yml
@@ -8,7 +8,7 @@ jobs:
   gcc13_assertions_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -43,7 +43,7 @@ jobs:
     needs: gcc13_assertions_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -95,7 +95,7 @@ jobs:
   clang18_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -193,7 +193,7 @@ jobs:
     needs: clang18_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -245,7 +245,7 @@ jobs:
   clang18_build_oldest_supported_dependencies:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -280,7 +280,7 @@ jobs:
     needs: clang18_build_oldest_supported_dependencies
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -319,7 +319,7 @@ jobs:
   gcc13_no_optional_dependencies_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -354,7 +354,7 @@ jobs:
     needs: gcc13_no_optional_dependencies_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
@@ -406,7 +406,7 @@ jobs:
   gcc13_asan_build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     defaults:
       run:
@@ -441,7 +441,7 @@ jobs:
     needs: gcc13_asan_build
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4fb3f346
+      image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:520a7b16
       options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
     strategy:
       fail-fast: false
diff --git a/dependencies/current/trilinos/install.sh b/dependencies/current/trilinos/install.sh
@@ -17,7 +17,7 @@ INSTALL_DIR="$1"
 # Number of procs for building (default 4)
 NPROCS=${NPROCS:=4}
 # git sha from Trilinos repository:
-VERSION="ef517e44826ce3a9e0189325aec4eee6e1d4dafe"
+VERSION="f4d642715185dca1b94c91f434a2cf6db9f82014"
 #CHECKSUM=""
 
 
diff --git a/dependencies/oldest_supported/trilinos/install.sh b/dependencies/oldest_supported/trilinos/install.sh
@@ -17,7 +17,7 @@ INSTALL_DIR="$1"
 # Number of procs for building (default 4)
 NPROCS=${NPROCS:=4}
 # git sha from Trilinos repository:
-VERSION="1eab15637f2998d1e86fe127b78200f2c9687cb5"
+VERSION="f4d642715185dca1b94c91f434a2cf6db9f82014"
 #CHECKSUM=""
 
 
@@ -60,8 +60,6 @@ $CMAKE_COMMAND \
     -D Epetra_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
   -D Trilinos_ENABLE_EpetraExt:BOOL=ON \
     -D EpetraExt_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
-  -D Trilinos_ENABLE_Intrepid:BOOL=ON \
-    -D Intrepid_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
   -D Trilinos_ENABLE_Intrepid2:BOOL=ON \
   -D Trilinos_ENABLE_Ifpack:BOOL=ON \
     -D Ifpack_SHOW_DEPRECATED_WARNINGS:BOOL=OFF \
diff --git a/dependencies/supported_version/Trilinos.txt b/dependencies/supported_version/Trilinos.txt
@@ -1,5 +1 @@
-ef517e44826ce3a9e0189325aec4eee6e1d4dafe 2025.5 none
-06db4c850654feacabdaed61ee8308219266b6a5 2025.4 none
-8cdf0375d278598c12edc3fd7059cb133c6f4426 2025.3 16.2.0
-11a16481fa1af48e3cfdb0aa84c29617ce94479f 2025.2 16.1.0
-1eab15637f2998d1e86fe127b78200f2c9687cb5 2025.1 none
+f4d642715185dca1b94c91f434a2cf6db9f82014 2025.6 16.2.0
diff --git a/doc/documentation/src/installation/installation.rst b/doc/documentation/src/installation/installation.rst
@@ -18,7 +18,7 @@ External dependencies
 
 - git
 - C++ compiler with C++20 compatibility (e.g. gcc 13, clang 18)
-- MPI installation
+- MPI
 - CMake
 - Ninja
 
@@ -41,11 +41,18 @@ Graph and domain partitioner:
 
 Miscellaneous:
 
-- Qhull (recommended version: 2012.1, :download:`install script </qhull/install.sh>`
-- CLN (recommended version: 1.3.4),
+- :ref:`ArborX <arborx>` (optional)
+- Backtrace
+- Boost
+- CLN
+- dealii (optional)
 - FFTW
 - HDF5
-- ArborX (optional)
+- magic_enum
+- :ref:`MIRCO <mirco>` (optional)
+- Qhull
+- ryml
+- zlib
 
 Build information
 ~~~~~~~~~~~~~~~~~
@@ -70,19 +77,32 @@ On Linux based systems the package can be installed using ``sudo apt install lib
 |FOURC| uses SuperLUDist indirectly via the Trilinos package Amesos/Amesos2 for directly solving linear systems of equations in distributed memory fashion.
 See the `superLU repository <https://github.com/xiaoyeli/superlu_dist>`_ for details and downloads.
 
+.. _arborx:
+
 **ArborX**
 
 ArborX can be used as optional dependency inside |FOURC| for utilizing it's tree-based search algorithms.
 See the `ArborX repository <https://github.com/arborx/ArborX>`_ for details and downloads.
 
+Building |FOURC| with ArborX enabled automatically fetches the repository during the configure stage and later builds the library as dependency.
+
 .. _trilinos:
 
 **Trilinos**
 
 This external dependency can be downloaded from the `Trilinos Github repository <https://github.com/trilinos/Trilinos>`_ .
 Currently supported versions are listed in ``<4C_sourceDir>/dependencies/supported_version/Trilinos.txt``. An older supported version will be supported for at least six months after its introduction. Afterwards, the version may be dropped at any time.
 
-.. note:: As 4C is still depending on Epetra based Trilinos code, the last official update will for now happen with the last available Trilinos hash still supporting Epetra (currently expected for mid of November).
+.. note:: As 4C is still depending on Epetra based Trilinos code, the last officially supported version is release 16.2.0.
+
+.. _mirco:
+
+**MIRCO**
+
+MIRCO can be used as optional dependency inside |FOURC| to be used for linear elastic frictionless normal contact between a rigid rough indentor and an elastic half-space.
+See the `MIRCO repository <https://github.com/imcs-compsim/MIRCO>`_ for details and downloads.
+
+Building |FOURC| with MIRCO enabled automatically fetches the repository during the configure stage and later builds the library as dependency.
 
 .. _4Cinstallation:
 
diff --git a/docker/trilinos_develop/Dockerfile b/docker/trilinos_develop/Dockerfile
@@ -61,6 +61,7 @@ RUN apt-get update && apt-get install -y \
       clang-tidy \
       clang-tools \
       libomp-dev \
+      libvtk9-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Create directory for dependencies
diff --git a/presets/imcs/workstation/CMakePresets.json b/presets/imcs/workstation/CMakePresets.json
@@ -12,7 +12,7 @@
         "CMAKE_C_COMPILER": "gcc",
         "CMAKE_C_COMPILER_LAUNCHER": "ccache",
         "CMAKE_CXX_FLAGS": "-msse3",
-        "FOUR_C_TRILINOS_ROOT": "/imcs/public/compsim/packages/trilinos/2025.5/install",
+        "FOUR_C_TRILINOS_ROOT": "/imcs/public/compsim/packages/trilinos/2025.6/install",
         "FOUR_C_DOXYGEN_USE_LOCAL_MATHJAX": "ON",
         "FOUR_C_DOXYGEN_LOCAL_MATHJAX_BASEPATH": "/imcs/public/compsim/opt/mathjax-2.7.9",
         "FOUR_C_ENABLE_DOXYGEN": "ON",
diff --git a/src/core/fem/src/general/utils/4C_fem_general_utils_gausspoints.cpp b/src/core/fem/src/general/utils/4C_fem_general_utils_gausspoints.cpp
diff --git a/src/core/fem/src/general/utils/4C_fem_general_utils_polynomial.cpp b/src/core/fem/src/general/utils/4C_fem_general_utils_polynomial.cpp
diff --git a/src/core/linear_solver/src/method/4C_linear_solver_method_direct.cpp b/src/core/linear_solver/src/method/4C_linear_solver_method_direct.cpp
diff --git a/src/core/linear_solver/src/method/4C_linear_solver_method_direct.hpp b/src/core/linear_solver/src/method/4C_linear_solver_method_direct.hpp
diff --git a/src/scatra_ele/4C_scatra_ele_calc_cardiac_monodomain_hdg.hpp b/src/scatra_ele/4C_scatra_ele_calc_cardiac_monodomain_hdg.hpp
