Merge branch '535-interface-problem-for-newer-petsc-versions' into 'development'

Support for PETSc 3.24.x

Closes #535

See merge request damask/DAMASK!1135

Author: Javier Velo

.gitlab-ci.yml

@@ -12,8 +12,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: normal
   # Shortcut names
   MARC_VERSION: '2024.1'
-  PETSC_GCC_LATEST: '2025.05.27'
-  PETSC_ONEAPI_LATEST: '2025.06.12'
+  PETSC_GCC_LATEST: '2025.09.30'
+  PETSC_ONEAPI_LATEST: '2025.09.30'
 
 
 ####################################################################################################

CMakeLists.txt

@@ -11,8 +11,11 @@ endif()
 # Dummy project to determine compiler names and version
 project(Prerequisites LANGUAGES)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-pkg_check_modules(PETSC_MIN REQUIRED PETSc>=3.15.0 QUIET) #CMake does not support version range
-pkg_check_modules(PETSC REQUIRED PETSc<3.24.0)
+set(PETSC_VERSION_MINOR_MIN "15")
+set(PETSC_VERSION_MINOR_MAX "24")
+
+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)
 
 pkg_get_variable(CMAKE_Fortran_COMPILER PETSc fcompiler)
 pkg_get_variable(CMAKE_C_COMPILER PETSc ccompiler)

PRIVATE

@@ -186,7 +186,7 @@ void CLI::init_print() {
        << " https://doi.org/10.1016/j.commatsci.2018.04.030" << std::endl << std::endl;
 
 #define PETSC_MINOR_MIN 15
-#define PETSC_MINOR_MAX 23
+#define PETSC_MINOR_MAX 24
 #if PETSC_VERSION_MAJOR != 3 || PETSC_VERSION_MINOR < PETSC_MINOR_MIN || PETSC_VERSION_MINOR > PETSC_MINOR_MAX
 #error "--  UNSUPPORTED PETSc VERSION --- UNSUPPORTED PETSc VERSION --- UNSUPPORTED PETSc VERSION ---"
 #else

src/CLI.cpp

@@ -6,7 +6,7 @@
 !> @brief Parse command line interface for PETSc-based solvers
 !--------------------------------------------------------------------------------------------------
 #define PETSC_MINOR_MIN 15
-#define PETSC_MINOR_MAX 23
+#define PETSC_MINOR_MAX 24
 
 module CLI
   use, intrinsic :: ISO_Fortran_env
@@ -70,8 +70,8 @@ end subroutine C_CLI_getParsedArgs
 contains
 
 !--------------------------------------------------------------------------------------------------
-!> @brief Initialize the solver by interpreting the command line arguments. Write
-!! information on computation to screen
+!> @brief Initialize the solver by interpreting the command line arguments and write
+!!        information on computation to screen.
 !--------------------------------------------------------------------------------------------------
 subroutine CLI_init()
 #include <petsc/finclude/petscsys.h>

src/CLI.f90

@@ -118,16 +118,16 @@ subroutine MatShellSetOperation(mat,op_num,op_callback,ierr)
       PetscErrorCode :: ierr
     end subroutine MatShellSetOperation
 
+#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR<24)
     subroutine SNESSetUpdate(snes_mech,upd_callback,ierr)
       use petscsnes
       SNES :: snes_mech
       external :: upd_callback
       PetscErrorCode :: ierr
     end subroutine SNESSetUpdate
-  end interface
+#endif
 
 #if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR<23)
-  interface
     subroutine MatShellSetContext(mat,ctx,ierr)
       use petscmat
       Mat :: mat
@@ -152,8 +152,8 @@ subroutine SNESSetJacobian(snes_mech,A,P,jac_callback,ctx,ierr)
       PetscErrorCode :: ierr
     end subroutine SNESSetJacobian
 #endif
-  end interface
 #endif
+  end interface
 
 contains