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

calculated convergence criteria wrongly

This commit is contained in:
Martin Diehl 2019-01-30 17:04:58 +01:00
parent e1c2747393
commit 3b13a1af63
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/crystallite.f90
View File

@ -1837,7 +1837,7 @@ subroutine integrateStateAdaptiveEuler()
+ 0.5_pReal * plasticState(p)%dotState(:,c) * crystallite_subdt(g,i,e) + 0.5_pReal * plasticState(p)%dotState(:,c) * crystallite_subdt(g,i,e)
crystallite_converged(g,i,e) = all(converged(residuum_plastic(1:sizeDotState,g,i,e), & crystallite_converged(g,i,e) = all(converged(residuum_plastic(1:sizeDotState,g,i,e), &
plasticState(p)%dotState(1:sizeDotState,c), & plasticState(p)%state(1:sizeDotState,c), &
plasticState(p)%aTolState(1:sizeDotState))) plasticState(p)%aTolState(1:sizeDotState)))
do s = 1_pInt, phase_Nsources(p) do s = 1_pInt, phase_Nsources(p)
@ -1848,7 +1848,7 @@ subroutine integrateStateAdaptiveEuler()
crystallite_converged(g,i,e) = crystallite_converged(g,i,e) .and.& crystallite_converged(g,i,e) = crystallite_converged(g,i,e) .and.&
all(converged(residuum_source(1:sizeDotState,s,g,i,e), & all(converged(residuum_source(1:sizeDotState,s,g,i,e), &
sourceState(p)%p(s)%dotState(1:sizeDotState,c), & sourceState(p)%p(s)%state(1:sizeDotState,c), &
sourceState(p)%p(s)%aTolState(1:sizeDotState))) sourceState(p)%p(s)%aTolState(1:sizeDotState)))
enddo enddo
@ -1863,21 +1863,21 @@ subroutine integrateStateAdaptiveEuler()
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief determines whether a point is converged !> @brief determines whether a point is converged
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
logical pure elemental function converged(residuum,dotState,absoluteTolerance) logical pure elemental function converged(residuum,state,aTol)
use prec, only: & use prec, only: &
dEq0 dEq0
use numerics, only: & use numerics, only: &
rTol_crystalliteState rTol => rTol_crystalliteState
implicit none implicit none
real(pReal), intent(in) ::& real(pReal), intent(in) ::&
residuum, dotState, absoluteTolerance residuum, state, aTol
if (dEq0(dotState)) then if (dEq0(state)) then
converged = .true. converged = .true. ! ToDo: intended behavior? Not rely on absoluteTolerance
else else
converged = abs(residuum) < absoluteTolerance & converged = abs(residuum) < aTol &
.or. abs(residuum/dotState) < rTol_crystalliteState .or. abs(residuum/state) < rTol
endif endif
end function converged end function converged
@ -2113,7 +2113,7 @@ subroutine integrateStateRKCK45()
sizeDotState = plasticState(p)%sizeDotState sizeDotState = plasticState(p)%sizeDotState
crystallite_todo(g,i,e) = all(converged(residuum_plastic(1:sizeDotState,g,i,e), & crystallite_todo(g,i,e) = all(converged(residuum_plastic(1:sizeDotState,g,i,e), &
plasticState(p)%dotState(1:sizeDotState,cc), & plasticState(p)%state(1:sizeDotState,cc), &
plasticState(p)%aTolState(1:sizeDotState))) plasticState(p)%aTolState(1:sizeDotState)))
do s = 1_pInt, phase_Nsources(p) do s = 1_pInt, phase_Nsources(p)
@ -2121,7 +2121,7 @@ subroutine integrateStateRKCK45()
crystallite_todo(g,i,e) = crystallite_todo(g,i,e) .and.& crystallite_todo(g,i,e) = crystallite_todo(g,i,e) .and.&
all(converged(residuum_source(1:sizeDotState,s,g,i,e), & all(converged(residuum_source(1:sizeDotState,s,g,i,e), &
sourceState(p)%p(s)%dotState(1:sizeDotState,cc), & sourceState(p)%p(s)%state(1:sizeDotState,cc), &
sourceState(p)%p(s)%aTolState(1:sizeDotState))) sourceState(p)%p(s)%aTolState(1:sizeDotState)))
enddo enddo
endif endif
@ -2139,21 +2139,21 @@ subroutine integrateStateRKCK45()
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief determines whether a point is converged !> @brief determines whether a point is converged
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
logical pure elemental function converged(residuum,dotState,absoluteTolerance) logical pure elemental function converged(residuum,state,aTol)
use prec, only: & use prec, only: &
dEq0 dEq0
use numerics, only: & use numerics, only: &
rTol_crystalliteState rTol => rTol_crystalliteState
implicit none implicit none
real(pReal), intent(in) ::& real(pReal), intent(in) ::&
residuum, dotState, absoluteTolerance residuum, state, aTol
if (dEq0(dotState)) then if (dEq0(state)) then
converged = .true. converged = .true. ! ToDo: intended behavior? Not rely on absoluteTolerance
else else
converged = abs(residuum) < absoluteTolerance & converged = abs(residuum) < aTol &
.or. abs(residuum/dotState) < rTol_crystalliteState .or. abs(residuum/state) < rTol
endif endif
end function converged end function converged