diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a0cd63a9..5096f2e72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ file (STRINGS ${PROJECT_SOURCE_DIR}/VERSION DAMASK_VERSION) message ("\nBuilding ${CMAKE_PROJECT_NAME} ${DAMASK_VERSION}\n") -add_definitions (-DPETSc) +add_definitions (-DPETSC) add_definitions (-DDAMASKVERSION="${DAMASK_VERSION}") if (CMAKE_BUILD_TYPE STREQUAL "") diff --git a/src/HDF5_utilities.f90 b/src/HDF5_utilities.f90 index ec8b16d49..afcdd0a64 100644 --- a/src/HDF5_utilities.f90 +++ b/src/HDF5_utilities.f90 @@ -6,8 +6,8 @@ !-------------------------------------------------------------------------------------------------- module HDF5_utilities use HDF5 -#ifdef PETSc - use PETSC +#ifdef PETSC + use PETSc #endif use prec @@ -71,7 +71,7 @@ module HDF5_utilities module procedure HDF5_addAttribute_real_array end interface HDF5_addAttribute -#ifdef PETSc +#ifdef PETSC logical, parameter, private :: parallel_default = .true. #else logical, parameter, private :: parallel_default = .false. @@ -142,7 +142,7 @@ integer(HID_T) function HDF5_openFile(fileName,mode) call h5pcreate_f(H5P_FILE_ACCESS_F, plist_id, hdferr) if(hdferr < 0) error stop 'HDF5 error' -#ifdef PETSc +#ifdef PETSC call h5pset_fapl_mpio_f(plist_id, PETSC_COMM_WORLD, MPI_INFO_NULL, hdferr) if(hdferr < 0) error stop 'HDF5 error' #endif @@ -199,7 +199,7 @@ integer(HID_T) function HDF5_addGroup(fileHandle,groupName) !------------------------------------------------------------------------------------------------- ! setting I/O mode to collective -#ifdef PETSc +#ifdef PETSC call h5pset_all_coll_metadata_ops_f(aplist_id, .true., hdferr) if(hdferr < 0) error stop 'HDF5 error' #endif @@ -235,7 +235,7 @@ integer(HID_T) function HDF5_openGroup(fileHandle,groupName) !------------------------------------------------------------------------------------------------- ! setting I/O mode to collective -#ifdef PETSc +#ifdef PETSC call h5pget_all_coll_metadata_ops_f(aplist_id, is_collective, hdferr) if(hdferr < 0) error stop 'HDF5 error' #endif @@ -1704,7 +1704,7 @@ subroutine initialize_read(dset_id, filespace_id, memspace_id, plist_id, aplist_ !-------------------------------------------------------------------------------------------------- readSize = 0 readSize(worldrank+1) = int(localShape(ubound(localShape,1))) -#ifdef PETSc +#ifdef PETSC if (parallel) then call h5pset_dxpl_mpio_f(plist_id, H5FD_MPIO_COLLECTIVE_F, hdferr) if(hdferr < 0) error stop 'HDF5 error' @@ -1725,7 +1725,7 @@ subroutine initialize_read(dset_id, filespace_id, memspace_id, plist_id, aplist_ ! creating a property list for IO and set it to collective call h5pcreate_f(H5P_DATASET_ACCESS_F, aplist_id, hdferr) if(hdferr < 0) error stop 'HDF5 error' -#ifdef PETSc +#ifdef PETSC call h5pset_all_coll_metadata_ops_f(aplist_id, .true., hdferr) if(hdferr < 0) error stop 'HDF5 error' #endif @@ -1794,7 +1794,7 @@ subroutine initialize_write(dset_id, filespace_id, memspace_id, plist_id, & ! creating a property list for transfer properties (is collective when reading in parallel) call h5pcreate_f(H5P_DATASET_XFER_F, plist_id, hdferr) if(hdferr < 0) error stop 'HDF5 error' -#ifdef PETSc +#ifdef PETSC if (parallel) then call h5pset_dxpl_mpio_f(plist_id, H5FD_MPIO_COLLECTIVE_F, hdferr) if(hdferr < 0) error stop 'HDF5 error' @@ -1805,7 +1805,7 @@ subroutine initialize_write(dset_id, filespace_id, memspace_id, plist_id, & ! determine the global data layout among all processes writeSize = 0 writeSize(worldrank+1) = int(myShape(ubound(myShape,1))) -#ifdef PETSc +#ifdef PETSC if (parallel) then call MPI_allreduce(MPI_IN_PLACE,writeSize,worldsize,MPI_INT,MPI_SUM,PETSC_COMM_WORLD,ierr) ! get total output size over each process if (ierr /= 0) error stop 'MPI error' diff --git a/src/parallelization.f90 b/src/parallelization.f90 index ee8e71006..32ea16edc 100644 --- a/src/parallelization.f90 +++ b/src/parallelization.f90 @@ -6,7 +6,7 @@ module parallelization use, intrinsic :: ISO_fortran_env, only: & OUTPUT_UNIT -#ifdef PETSc +#ifdef PETSC #include use petscsys !$ use OMP_LIB @@ -20,7 +20,7 @@ module parallelization worldrank = 0, & !< MPI worldrank (/=0 for MPI simulations only) worldsize = 1 !< MPI worldsize (/=1 for MPI simulations only) -#ifdef PETSc +#ifdef PETSC public :: & parallelization_init diff --git a/src/results.f90 b/src/results.f90 index f348b7d9d..5cf93661b 100644 --- a/src/results.f90 +++ b/src/results.f90 @@ -11,8 +11,8 @@ module results use IO use HDF5_utilities use HDF5 -#ifdef PETSc - use PETSC +#ifdef PETSC + use PETSc #endif implicit none