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

accessed by correct dict now; tests improved

This commit is contained in:
Sharan Roongta 2020-10-15 18:09:45 +02:00
parent 1c911f6213
commit 6455627af9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit 7bc408ddc94aa32042e0eefe2de0400bca865ea3 Subproject commit 256c0d23c005c82987954d7f8bbf996e033f7821

5
src/grid/DAMASK_grid.f90
View File

@ -222,6 +222,9 @@ program DAMASK_grid
newLoadCase%stress%mask = transpose(reshape(temp_maskVector,[ 3,3])) newLoadCase%stress%mask = transpose(reshape(temp_maskVector,[ 3,3]))
newLoadCase%stress%values = math_9to33(temp_valueVector) newLoadCase%stress%values = math_9to33(temp_valueVector)
end select 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 enddo readMech
!-------------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------------
@ -232,8 +235,6 @@ program DAMASK_grid
newLoadCase%logscale = step_discretization%get_asBool ('log_timestep', defaultVal= .false.) newLoadCase%logscale = step_discretization%get_asBool ('log_timestep', defaultVal= .false.)
newLoadCase%outputfrequency = step_discretization%get_asInt ('f_out', defaultVal=1) newLoadCase%outputfrequency = step_discretization%get_asInt ('f_out', defaultVal=1)
newLoadCase%restartfrequency = step_discretization%get_asInt ('f_restart', defaultVal=huge(0)) 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. & 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 merge(.false.,.true.,currentLoadCase > 1)) ! do not continue to predict deformation along former trajectory