diff --git a/code/DAMASK_spectral_solverAL.f90 b/code/DAMASK_spectral_solverAL.f90 index 05d1d8929..a20ea63ac 100644 --- a/code/DAMASK_spectral_solverAL.f90 +++ b/code/DAMASK_spectral_solverAL.f90 @@ -21,8 +21,6 @@ module DAMASK_spectral_SolverAL #include #include #include -#include -#include character (len=*), parameter, public :: & DAMASK_spectral_SolverAL_label = 'al' @@ -102,7 +100,8 @@ subroutine AL_init() math_invSym3333 implicit none - +#include +#include integer(pInt) :: i,j,k real(pReal), dimension(:,:,:,:,:), allocatable :: P @@ -233,6 +232,8 @@ subroutine AL_init() terminallyIll implicit none +#include +#include !-------------------------------------------------------------------------------------------------- ! input data for solution real(pReal), intent(in) :: timeinc, timeinc_old, temperature_bc, guessmode diff --git a/code/DAMASK_spectral_solverBasic.f90 b/code/DAMASK_spectral_solverBasic.f90 index ab33553dd..0f964e1f4 100644 --- a/code/DAMASK_spectral_solverBasic.f90 +++ b/code/DAMASK_spectral_solverBasic.f90 @@ -250,8 +250,7 @@ type(tSolutionState) function & f_aimDot = f_aimDot & + guessmode * P_BC%maskFloat * (F_aim - F_aim_lastInc)/timeinc_old F_aim_lastInc = F_aim - print*, 'F_aimDot', f_aimDot - print*, 'guessmode', guessmode + !-------------------------------------------------------------------------------------------------- ! update coordinates and rate and forward last inc call deformed_fft(res,geomdim,math_rotate_backward33(F_aim_lastInc,rotation_BC), & diff --git a/code/DAMASK_spectral_solverBasicPETSc.f90 b/code/DAMASK_spectral_solverBasicPETSc.f90 index 6ded4977c..825c3ab7c 100644 --- a/code/DAMASK_spectral_solverBasicPETSc.f90 +++ b/code/DAMASK_spectral_solverBasicPETSc.f90 @@ -21,8 +21,6 @@ module DAMASK_spectral_SolverBasicPETSc #include #include #include -#include -#include character (len=*), parameter, public :: & DAMASK_spectral_SolverBasicPETSC_label = 'basicpetsc' @@ -100,6 +98,8 @@ subroutine BasicPETSC_init() math_invSym3333 implicit none +#include +#include integer(pInt) :: i,j,k real(pReal), dimension(:,:,:,:,:), allocatable :: P PetscScalar, dimension(:,:,:,:), pointer :: F @@ -169,16 +169,12 @@ subroutine BasicPETSC_init() coordinates = 0.0 ! change it later!!! endif - print*, 'F', shape(F) - print*, 'F_lastInc', shape(F_lastInc) - print*, 'gfortran runs till here' - flush(6) + call Utilities_constitutiveResponse(coordinates,& reshape(F(0:8,0:res(1)-1_pInt,0:res(2)-1_pInt,0:res(3)-1_pInt),[3,3,res(1),res(2),res(3)]),& reshape(F(0:8,0:res(1)-1_pInt,0:res(2)-1_pInt,0:res(3)-1_pInt),[3,3,res(1),res(2),res(3)]),& temperature,0.0_pReal,P,C,P_av,.false.,math_I3) - print*, 'gfortran does not reach this point' - flush(6) + call DMDAVecRestoreArrayF90(da,solution_vec,F,ierr) @@ -225,6 +221,8 @@ subroutine BasicPETSC_init() restartWrite, & terminallyIll implicit none +#include +#include !-------------------------------------------------------------------------------------------------- ! input data for solution real(pReal), intent(in) :: timeinc, timeinc_old, temperature_bc, guessmode