From a46b888cff4c3645202d6fe3a8e8665a3783b5cd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 12 Sep 2020 16:06:33 +0200 Subject: [PATCH] WIP: introducing separate module for parallelization --- src/CPFEM.f90 | 1 - src/CPFEM2.f90 | 1 - src/DAMASK_interface.f90 | 3 +++ src/DAMASK_marc.f90 | 6 +++++- src/parallelization.f90 | 31 +++++++++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 src/parallelization.f90 diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index 8d31ea078..b2fccca26 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -75,7 +75,6 @@ contains subroutine CPFEM_initAll call DAMASK_interface_init - call prec_init call IO_init call config_init call math_init diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90 index adeb00955..b2bdebcc6 100644 --- a/src/CPFEM2.f90 +++ b/src/CPFEM2.f90 @@ -41,7 +41,6 @@ contains subroutine CPFEM_initAll call DAMASK_interface_init ! Spectral and FEM interface to commandline - call prec_init call IO_init call base64_init #ifdef Mesh diff --git a/src/DAMASK_interface.f90 b/src/DAMASK_interface.f90 index 5b65b51c3..f08e06f31 100644 --- a/src/DAMASK_interface.f90 +++ b/src/DAMASK_interface.f90 @@ -19,6 +19,7 @@ module DAMASK_interface use PETScSys use prec + use parallelization use system_routines implicit none @@ -268,6 +269,8 @@ subroutine DAMASK_interface_init call setSIGUSR1(.false.) call setSIGUSR2(.false.) + call prec_init + call parallelization_init end subroutine DAMASK_interface_init diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_marc.f90 index 78203ffa2..4db1f4f15 100644 --- a/src/DAMASK_marc.f90 +++ b/src/DAMASK_marc.f90 @@ -26,6 +26,7 @@ #define PASTE(x,y) x ## y #include "prec.f90" +#include "parallelization.f90" module DAMASK_interface use prec @@ -42,7 +43,7 @@ module DAMASK_interface logical, protected, public :: symmetricSolver character(len=*), parameter, public :: INPUTFILEEXTENSION = '.dat' - + public :: & DAMASK_interface_init, & @@ -90,6 +91,9 @@ subroutine DAMASK_interface_init endif symmetricSolver = solverIsSymmetric() + call prec_init + call parallelization_init + end subroutine DAMASK_interface_init diff --git a/src/parallelization.f90 b/src/parallelization.f90 new file mode 100644 index 000000000..8e569dcb9 --- /dev/null +++ b/src/parallelization.f90 @@ -0,0 +1,31 @@ +!-------------------------------------------------------------------------------------------------- +!> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH +!> @brief Inquires variables related to parallelization (openMP, MPI) +!-------------------------------------------------------------------------------------------------- +module parallelization + use prec + +#ifdef PETSc +#include + use petscsys +#endif +!$ use OMP_LIB + + implicit none + private + + public :: & + parallelization_init + +contains + +!-------------------------------------------------------------------------------------------------- +!> @brief calls subroutines that reads material, numerics and debug configuration files +!-------------------------------------------------------------------------------------------------- +subroutine parallelization_init + + write(6,'(/,a)') ' <<<+- parallelization init -+>>>'; flush(6) + +end subroutine parallelization_init + +end module parallelization