223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'petsc-3.20' into 'development' 

PETSc 3.20

See merge request damask/DAMASK!834
This commit is contained in:
Daniel Otto de Mentock 2023-10-13 11:14:57 +00:00
parent c48cee1af2 57e02bb991
commit 3517c7dee3
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -11,7 +11,7 @@ endif()
project(Prerequisites LANGUAGES) project(Prerequisites LANGUAGES)
set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}") 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.12.0 QUIET) #CMake does not support version range pkg_check_modules(PETSC_MIN REQUIRED PETSc>=3.12.0 QUIET) #CMake does not support version range
pkg_check_modules(PETSC REQUIRED PETSc<3.20.0) pkg_check_modules(PETSC REQUIRED PETSc<3.21.0)
pkg_get_variable(CMAKE_Fortran_COMPILER PETSc fcompiler) pkg_get_variable(CMAKE_Fortran_COMPILER PETSc fcompiler)
pkg_get_variable(CMAKE_C_COMPILER PETSc ccompiler) pkg_get_variable(CMAKE_C_COMPILER PETSc ccompiler)

2
src/CLI.f90
View File

@ -6,7 +6,7 @@
!> @brief Parse command line interface for PETSc-based solvers !> @brief Parse command line interface for PETSc-based solvers
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
#define PETSC_MINOR_MIN 12 #define PETSC_MINOR_MIN 12
#define PETSC_MINOR_MAX 19 #define PETSC_MINOR_MAX 20
module CLI module CLI
use, intrinsic :: ISO_fortran_env use, intrinsic :: ISO_fortran_env

3
src/mesh/mesh_mech_FEM.f90
View File

@ -74,6 +74,9 @@ module mesh_mechanical_FEM
external :: & ! ToDo: write interfaces external :: & ! ToDo: write interfaces
#if defined(PETSC_USE_64BIT_INDICES) || PETSC_VERSION_MINOR < 17 #if defined(PETSC_USE_64BIT_INDICES) || PETSC_VERSION_MINOR < 17
ISDestroy, & ISDestroy, &
#endif
#if PETSC_VERSION_MINOR > 18
DMAddField, &
#endif #endif
PetscSectionGetNumFields, & PetscSectionGetNumFields, &
PetscFESetQuadrature, & PetscFESetQuadrature, &