Merge branch 'PETSc-3.25-compatible' into 'development'

Support PETSc 3.25.x

See merge request damask/DAMASK!1186

Author: dmentock

.gitlab-ci.yml

@@ -12,8 +12,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: normal
   # Shortcut names
   MARC_VERSION: '2025.1'
-  PETSC_GCC_LATEST: '2025.11.13'
-  PETSC_ONEAPI_LATEST: '2025.11.13'
+  PETSC_GCC_LATEST: '2026.04.03'
+  PETSC_ONEAPI_LATEST: '2026.04.03'
   PYTHON_LATEST: '2026.02.24'
 
 ####################################################################################################
@@ -58,6 +58,7 @@ workflow:
   parallel:
     matrix:
       - IMAGE:
+          - gcc_petsc-debug:2025.11.13
           - gcc_petsc-debug:2025.05.27a
           - gcc_petsc-debug:2025.03.10a
 
@@ -81,6 +82,7 @@ workflow:
   parallel:
     matrix:
       - IMAGE:
+          - oneapi_petsc-debug:2025.11.13
           - oneapi_petsc-debug:2025.06.12a
           - oneapi_petsc-debug:2025.03.27a
 
@@ -98,6 +100,9 @@ workflow:
   parallel:
     matrix:
       - IMAGE:
+          - gcc_petsc-default:2025.11.13
+          - gcc_petsc-i64:2025.11.13
+          - oneapi_petsc-default:2025.11.13
           - gcc_petsc-default:2025.05.27a
           - gcc_petsc-i64:2025.05.27a
           - oneapi_petsc-default:2025.06.12a

CMakeLists.txt

@@ -1,9 +1,12 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 cmake_minimum_required(VERSION 3.18.0)
+
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_C_STANDARD 17)
+
 include(FindPkgConfig REQUIRED)
 include(CheckCXXSymbolExists REQUIRED)
+include(CheckSourceCompiles REQUIRED)
 
 if(DEFINED ENV{PETSC_DIR})
   message("PETSC_DIR:\n$ENV{PETSC_DIR}\n")
@@ -15,7 +18,7 @@ endif()
 project(Prerequisites LANGUAGES)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
 set(PETSC_VERSION_MINOR_MIN "19")
-set(PETSC_VERSION_MINOR_MAX "24")
+set(PETSC_VERSION_MINOR_MAX "25")
 
 pkg_check_modules(PETSC_MIN REQUIRED PETSc>=3.${PETSC_VERSION_MINOR_MIN}.0 QUIET) #CMake does not support version range
 pkg_check_modules(PETSC REQUIRED PETSc<=3.${PETSC_VERSION_MINOR_MAX}.99)
@@ -171,8 +174,8 @@ file(STRINGS "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/petsc/conf/petscvariables" PE
 string(REPLACE "PETSC_FC_INCLUDES = " "" PETSC_INCLUDES "${PETSC_INCLUDES}")
 message("PETSC_INCLUDES:\n${PETSC_INCLUDES}\n")
 
-set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE} "${BUILDCMD_PRE} ${OPENMP_FLAGS} ${STANDARD_CHECK} ${OPTIMIZATION_FLAGS} ${COMPILE_FLAGS}")
-set(CMAKE_Fortran_LINK_EXECUTABLE           "${BUILDCMD_PRE} ${CMAKE_Fortran_COMPILER} ${OPENMP_FLAGS} ${OPTIMIZATION_FLAGS} ${LINKER_FLAGS}")
+set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE} "${BUILDCMD_PRE} ${OPENMP_FLAGS} ${STANDARD_CHECK} ${OPTIMIZATION_FLAGS}")
+set(CMAKE_Fortran_LINK_EXECUTABLE           "${BUILDCMD_PRE} ${CMAKE_Fortran_COMPILER} ${OPENMP_FLAGS} ${OPTIMIZATION_FLAGS}")
 
 set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} ${PETSC_INCLUDES}")   # zlib installed via PETSc
 
@@ -206,6 +209,86 @@ message("C Compiler Flags:\n${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}\n")
 message("C++ Compiler Flags:\n${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}\n")
 message("Fortran Linker Command:\n${CMAKE_Fortran_LINK_EXECUTABLE}\n")
 
+# check MPI features
+block()
+  string(REPLACE " " ";" CMAKE_REQUIRED_INCLUDES "${PETSC_INCLUDES}")
+  string(REPLACE "-I" "" CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
+  message("${CMAKE_REQUIRED_INCLUDES}")
+
+  set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
+
+  check_source_compiles(Fortran
+ "#include <petsc/finclude/petscsys.h>
+  module m
+  use PETScSys
+  implicit none
+  contains
+  subroutine s()
+  integer :: i
+  i = PETSC_COMM_WORLD%MPI_val
+  end subroutine s
+  end module m"
+  PETSC_USES_MPIF08)
+
+  check_source_compiles(Fortran
+ "#include <petsc/finclude/petscsys.h>
+  module m
+  use PETScSys
+  implicit none
+  contains
+  subroutine s()
+  integer :: i
+  i = MPI_COMM_WORLD%MPI_val
+  end subroutine s
+  end module m"
+  PETSC_EXPOSES_MPIF08)
+
+  check_source_compiles(Fortran
+ "#include <petsc/finclude/petscsys.h>
+  module m
+  use PETScSys
+  implicit none
+  contains
+  subroutine s()
+  integer :: i
+  i = MPI_COMM_WORLD
+  end subroutine s
+  end module m"
+  PETSC_EXPOSES_MPIF90)
+
+  check_source_compiles(Fortran
+ "module m
+  use HDF5
+  use MPI_f08
+  implicit none
+  contains
+  subroutine s()
+  integer :: hdferr
+  integer(HID_T) :: plist_access_id
+  call H5Pset_fapl_mpio_f(plist_access_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferr)
+  end subroutine s
+  end module m"
+  HDF5_SUPPORTS_MPIF08)
+endblock()
+
+if(PETSC_USES_MPIF08)
+  add_compile_definitions($<$<COMPILE_LANGUAGE:Fortran>:PETSC_USES_MPIF08>)
+endif()
+
+if(PETSC_EXPOSES_MPIF08)
+  add_compile_definitions($<$<COMPILE_LANGUAGE:Fortran>:PETSC_EXPOSES_MPI>)
+  add_compile_definitions($<$<COMPILE_LANGUAGE:Fortran>:PETSC_EXPOSES_MPIF08>)
+endif()
+
+if(PETSC_EXPOSES_MPIF90)
+  add_compile_definitions($<$<COMPILE_LANGUAGE:Fortran>:PETSC_EXPOSES_MPI>)
+  add_compile_definitions($<$<COMPILE_LANGUAGE:Fortran>:PETSC_EXPOSES_MPIF90>)
+endif()
+
+if(HDF5_SUPPORTS_MPIF08)
+  add_compile_definitions($<$<COMPILE_LANGUAGE:Fortran>:HDF5_SUPPORTS_MPIF08>)
+endif()
+
 # location of code
 add_subdirectory(src)
 

src/HDF5_utilities.f90

@@ -14,7 +14,7 @@ module HDF5_utilities
   use HDF5
 #ifdef PETSC
   use PETScSys
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPI
   use MPI_f08
   use MPI, only: MPI_INFO_NULL_F90 => MPI_INFO_NULL
 #endif
@@ -24,7 +24,7 @@ module HDF5_utilities
   use parallelization
   use misc
 
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPIF90
   implicit none(type,external)
 #else
   implicit none
@@ -209,10 +209,12 @@ integer(HID_T) function HDF5_openFile(fileName,mode,parallel)
   call HDF5_chkerr(hdferr,__FILE__//':'//IO_intAsStr(__LINE__))
 #ifdef PETSC
   if (misc_optional(parallel,.true.)) &
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
-    call H5Pset_fapl_mpio_f(plist_access_id, PETSC_COMM_WORLD, MPI_INFO_NULL_F90, hdferr)
+#if defined(PETSC_EXPOSES_MPIF90)
+    call H5Pset_fapl_mpio_f(plist_access_id, PETSC_COMM_WORLD,       MPI_INFO_NULL,     hdferr)
+#elif !defined(HDF5_SUPPORTS_MPIF08)
+    call H5Pset_fapl_mpio_f(plist_access_id, MPI_COMM_WORLD%MPI_val, MPI_INFO_NULL_F90, hdferr)
 #else
-    call H5Pset_fapl_mpio_f(plist_access_id, PETSC_COMM_WORLD, MPI_INFO_NULL,     hdferr)
+    call H5Pset_fapl_mpio_f(plist_access_id, MPI_COMM_WORLD,         MPI_INFO_NULL, hdferr)
 #endif
   call HDF5_chkerr(hdferr,__FILE__//':'//IO_intAsStr(__LINE__))
 #endif

src/IO.f90

@@ -761,7 +761,7 @@ end subroutine IO_selfTest
 subroutine quit(stop_id)
 #include <petsc/finclude/petscsys.h>
   use PETScSys
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPI
   use MPI_f08
 #endif
   use HDF5

src/grid/DAMASK_grid.f90

@@ -10,7 +10,7 @@
 #include <petsc/finclude/petscsys.h>
 program DAMASK_grid
   use PETScSys
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPI
   use MPI_f08
 #endif
 
@@ -36,7 +36,7 @@ program DAMASK_grid
   use grid_thermal_spectral
   use result
 
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPIF90
   implicit none(type,external)
 #else
   implicit none

src/grid/discretization_grid.f90

@@ -6,13 +6,19 @@
 !> @brief Parse geometry file to set up discretization and geometry for nonlocal model
 !--------------------------------------------------------------------------------------------------
 #include <petsc/finclude/petscsys.h>
+#if defined(PETSC_EXPOSES_MPIF90)
+#define MPI_COMM_WORLD_F90 MPI_COMM_WORLD
+#else
+#define MPI_COMM_WORLD_F90 MPI_COMM_WORLD%MPI_val
+#endif
 module discretization_grid
   use PETScSys
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPI
   use MPI_f08
 #endif
-  use FFTW3
+  use HDF5
 
+  use FFTW3
   use prec
   use parallelization
 #if !defined(BOOST)
@@ -22,13 +28,13 @@ module discretization_grid
   use IO
   use C_interfacing
   use config
-  use HDF5
   use HDF5_utilities
   use result
   use discretization
   use geometry_plastic_nonlocal
 
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+
+#ifndef PETSC_EXPOSES_MPIF90
   implicit none(type,external)
 #else
   implicit none
@@ -95,7 +101,6 @@ end subroutine C_VTI__delete
 
 contains
 
-
 !--------------------------------------------------------------------------------------------------
 !> @brief Read the geometry file to obtain information on discretization.
 !--------------------------------------------------------------------------------------------------
@@ -189,7 +194,7 @@ subroutine discretization_grid_init()
 
   call fftw_mpi_init()
   devNull = fftw_mpi_local_size_3d(int(cells(3),C_INTPTR_T),int(cells(2),C_INTPTR_T),int(cells(1)/2+1,C_INTPTR_T), &
-                                   PETSC_COMM_WORLD, &
+                                   MPI_COMM_WORLD_F90, &
                                    cells3_, &                                                       ! domain cells size along z
                                    cells3Offset_)                                                   ! domain cells offset along z
   if (cells3_==0_C_INTPTR_T) call IO_error(894_pI16,'Cannot distribute MPI processes')

src/grid/grid_chemical_FDM.f90

@@ -1,10 +1,10 @@
 ! SPDX-License-Identifier: AGPL-3.0-or-later
-module grid_chemical_FDM
 #include <petsc/finclude/petscsnes.h>
 #include <petsc/finclude/petscdmda.h>
+module grid_chemical_FDM
   use PETScDMDA
   use PETScSNES
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPI
   use MPI_f08
 #endif
 
@@ -19,7 +19,7 @@ module grid_chemical_FDM
   use config
   use math
 
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPIF90
   implicit none(type,external)
 #else
   implicit none

src/grid/grid_damage_spectral.f90

@@ -10,24 +10,24 @@
 module grid_damage_spectral
   use PETScDMDA
   use PETScSNES
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPI
   use MPI_f08
 #endif
+  use HDF5
 
   use prec
   use parallelization
   use IO
   use misc
   use CLI
   use HDF5_utilities
-  use HDF5
   use spectral_utilities
   use discretization_grid
   use homogenization
   use types
   use config
 
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPIF90
   implicit none(type,external)
 #else
   implicit none

src/grid/grid_mech_FEM.f90

@@ -11,16 +11,16 @@ module grid_mechanical_FEM
   use PETScDMDA
   use PETScSNES
   use PETScMat
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPI
   use MPI_f08
 #endif
+  use HDF5
 
   use prec
   use parallelization
   use IO
   use misc
   use CLI
-  use HDF5
   use HDF5_utilities
   use math
   use rotations
@@ -32,7 +32,7 @@ module grid_mechanical_FEM
   use discretization_grid
   use constants
 
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPIF90
   implicit none(type,external)
 #else
   implicit none

src/grid/grid_mech_spectral_Galerkin.f90

@@ -11,16 +11,16 @@
 module grid_mechanical_spectral_Galerkin
   use PETScDMDA
   use PETScSNES
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPI
   use MPI_f08
 #endif
+  use HDF5
 
   use prec
   use parallelization
   use CLI
   use misc
   use IO
-  use HDF5
   use HDF5_utilities
   use math
   use rotations
@@ -30,7 +30,7 @@ module grid_mechanical_spectral_Galerkin
   use discretization_grid
   use constants
 
-#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
+#ifndef PETSC_EXPOSES_MPIF90
   implicit none(type,external)
 #else
   implicit none
@@ -98,6 +98,7 @@ module grid_mechanical_spectral_Galerkin
 
   ! Missing interfaces for some PETSc versions
   interface
+#if PETSC_VERSION_MINOR<25
     subroutine MatCreateShell(comm,mloc,nloc,m,n,ctx,mat,ierr)
       use petscmat
       MPI_Comm :: comm
@@ -118,7 +119,7 @@ subroutine MatShellSetOperation(mat,op_num,op_callback,ierr)
       external :: op_callback
       PetscErrorCode :: ierr
     end subroutine MatShellSetOperation
-
+#endif
 #if PETSC_VERSION_MINOR<24
     subroutine SNESSetUpdate(snes_mech,upd_callback,ierr)
       use petscsnes