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

missing adjustment of interface for call to CPFEM_general related to last commit

This commit is contained in:
Martin Diehl 2014-07-24 12:26:01 +00:00
parent e7962e6dd1
commit 2e377056ed
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/DAMASK_spectral_utilities.f90
View File

@ -793,8 +793,6 @@ subroutine utilities_constitutiveResponse(F_lastInc,F,temperature,timeinc,&
use debug, only: & use debug, only: &
debug_reset, & debug_reset, &
debug_info debug_info
use numerics, only: &
usePingPong
use math, only: & use math, only: &
math_transpose33, & math_transpose33, &
math_rotate_forward33, & math_rotate_forward33, &
@ -805,9 +803,7 @@ subroutine utilities_constitutiveResponse(F_lastInc,F,temperature,timeinc,&
CPFEM_general, & CPFEM_general, &
CPFEM_COLLECT, & CPFEM_COLLECT, &
CPFEM_CALCRESULTS, & CPFEM_CALCRESULTS, &
CPFEM_AGERESULTS, & CPFEM_AGERESULTS
CPFEM_BACKUPJACOBIAN, &
CPFEM_RESTOREJACOBIAN
use crystallite, only: & use crystallite, only: &
crystallite_temperature crystallite_temperature
use homogenization, only: & use homogenization, only: &
@ -841,16 +837,13 @@ subroutine utilities_constitutiveResponse(F_lastInc,F,temperature,timeinc,&
collectMode = CPFEM_COLLECT collectMode = CPFEM_COLLECT
if (forwardData) then ! aging results if (forwardData) then ! aging results
calcMode = ior(calcMode, CPFEM_AGERESULTS) calcMode = ior(calcMode, CPFEM_AGERESULTS)
collectMode = ior(collectMode, CPFEM_BACKUPJACOBIAN)
materialpoint_F0 = reshape(F_lastInc, [3,3,1,product(grid)]) materialpoint_F0 = reshape(F_lastInc, [3,3,1,product(grid)])
endif endif
if (cutBack) then ! restore saved variables if (cutBack) then ! restore saved variables
collectMode = ior(collectMode , CPFEM_RESTOREJACOBIAN)
collectMode = iand(collectMode, not(CPFEM_BACKUPJACOBIAN))
calcMode = iand(calcMode, not(CPFEM_AGERESULTS)) calcMode = iand(calcMode, not(CPFEM_AGERESULTS))
endif endif
call CPFEM_general(collectMode,usePingPong,F_lastInc(1:3,1:3,1,1,1),F(1:3,1:3,1,1,1), & ! collect mode handles Jacobian backup / restoration call CPFEM_general(collectMode,F_lastInc(1:3,1:3,1,1,1),F(1:3,1:3,1,1,1), & ! collect mode handles Jacobian backup / restoration
temperature,timeinc,1_pInt,1_pInt) temperature,timeinc,1_pInt,1_pInt)
crystallite_temperature = temperature crystallite_temperature = temperature
@ -873,7 +866,7 @@ subroutine utilities_constitutiveResponse(F_lastInc,F,temperature,timeinc,&
flush(6) flush(6)
endif endif
call CPFEM_general(calcMode,usePingPong,F_lastInc(1:3,1:3,1,1,1), F(1:3,1:3,1,1,1), & ! first call calculates everything call CPFEM_general(calcMode,F_lastInc(1:3,1:3,1,1,1), F(1:3,1:3,1,1,1), & ! first call calculates everything
temperature,timeinc,1_pInt,1_pInt) temperature,timeinc,1_pInt,1_pInt)
max_dPdF = 0.0_pReal max_dPdF = 0.0_pReal