From 6455627af9fe5dd9681397f26b54595ba5cb91e0 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Thu, 15 Oct 2020 18:09:45 +0200 Subject: [PATCH] accessed by correct dict now; tests improved --- PRIVATE | 2 +- src/grid/DAMASK_grid.f90 | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PRIVATE b/PRIVATE index 7bc408ddc..256c0d23c 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 7bc408ddc94aa32042e0eefe2de0400bca865ea3 +Subproject commit 256c0d23c005c82987954d7f8bbf996e033f7821 diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index fba39da44..d6f092d9a 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -222,6 +222,9 @@ program DAMASK_grid newLoadCase%stress%mask = transpose(reshape(temp_maskVector,[ 3,3])) newLoadCase%stress%values = math_9to33(temp_valueVector) end select + call newLoadCase%rot%fromAxisAngle(step_mech%get_asFloats('R', & + defaultVal = real([0.0,0.0,1.0,0.0],pReal)),degrees=.true.) + enddo readMech !-------------------------------------------------------------------------------------------------------- @@ -232,8 +235,6 @@ program DAMASK_grid newLoadCase%logscale = step_discretization%get_asBool ('log_timestep', defaultVal= .false.) newLoadCase%outputfrequency = step_discretization%get_asInt ('f_out', defaultVal=1) newLoadCase%restartfrequency = step_discretization%get_asInt ('f_restart', defaultVal=huge(0)) - call newLoadCase%rot%fromAxisAngle(step_discretization%get_asFloats('R', & - defaultVal = real([0.0,0.0,1.0,0.0],pReal)),degrees=.true.) 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