simplified

This commit is contained in:
Sharan Roongta 2020-10-14 17:55:57 +02:00
parent 16515351dc
commit 1c911f6213
1 changed files with 3 additions and 4 deletions

View File

@ -235,9 +235,8 @@ program DAMASK_grid
call newLoadCase%rot%fromAxisAngle(step_discretization%get_asFloats('R', & call newLoadCase%rot%fromAxisAngle(step_discretization%get_asFloats('R', &
defaultVal = real([0.0,0.0,1.0,0.0],pReal)),degrees=.true.) defaultVal = real([0.0,0.0,1.0,0.0],pReal)),degrees=.true.)
newLoadCase%followFormerTrajectory = .not. load_step%get_asBool('drop_guessing',defaultVal=.false.) ! do not continue to predict deformation along former trajectory newLoadCase%followFormerTrajectory = .not. (load_step%get_asBool('drop_guessing',defaultVal=.false.) .or. &
merge(.false.,.true.,currentLoadCase > 1)) ! do not continue to predict deformation along former trajectory
newLoadCase%followFormerTrajectory = merge(.true.,.false.,currentLoadCase > 1) ! by default, guess from previous load case
reportAndCheck: if (worldrank == 0) then reportAndCheck: if (worldrank == 0) then
write (loadcase_string, '(i0)' ) currentLoadCase write (loadcase_string, '(i0)' ) currentLoadCase