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

logic better visible

This commit is contained in:
Martin Diehl 2019-01-30 12:56:02 +01:00
parent 39e766bba0
commit 64b89484d2
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/crystallite.f90
View File

@ -1872,17 +1872,16 @@ subroutine integrateStateAdaptiveEuler()
implicit none implicit none
real(pReal), dimension(:), intent(in) ::& real(pReal), dimension(:), intent(in) ::&
residuum, dotState, absoluteTolerance residuum, dotState, absoluteTolerance
real(pReal), dimension(size(residuum,1)) ::& logical, dimension(size(residuum,1)) ::&
residuum_rel converged_array
where(dNeq0(dotState)) where(dNeq0(dotState))
residuum_rel = residuum/dotState converged_array = abs(residuum) < absoluteTolerance .or. (abs(residuum/dotState) < rTol_crystalliteState)
else where else where
residuum_rel = 0.0_pReal converged_array = .true.
end where end where
converged = all(abs(residuum_rel) < rTol_crystalliteState .or. & converged = all(converged_array)
abs(residuum) < absoluteTolerance)
end function converged end function converged
@ -2153,17 +2152,16 @@ subroutine integrateStateRKCK45()
implicit none implicit none
real(pReal), dimension(:), intent(in) ::& real(pReal), dimension(:), intent(in) ::&
residuum, dotState, absoluteTolerance residuum, dotState, absoluteTolerance
real(pReal), dimension(size(residuum,1)) ::& logical, dimension(size(residuum,1)) ::&
residuum_rel converged_array
where(dNeq0(dotState)) where(dNeq0(dotState))
residuum_rel = residuum/dotState converged_array = abs(residuum) < absoluteTolerance .or. (abs(residuum/dotState) < rTol_crystalliteState)
else where else where
residuum_rel = 0.0_pReal converged_array = .true.
end where end where
converged = all(abs(residuum_rel) < rTol_crystalliteState .or. & converged = all(converged_array)
abs(residuum) < absoluteTolerance)
end function converged end function converged