From dafccad7f5ccc4cd5a1785093ccdfea5db9ff4a5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 8 Aug 2014 12:16:51 +0000 Subject: [PATCH] bufgix for last commit, Franz please rather check this --- code/constitutive_dislokmc.f90 | 6 +++--- code/constitutive_dislotwin.f90 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/constitutive_dislokmc.f90 b/code/constitutive_dislokmc.f90 index fc4e8c947..220758616 100644 --- a/code/constitutive_dislokmc.f90 +++ b/code/constitutive_dislokmc.f90 @@ -1031,9 +1031,9 @@ function constitutive_dislokmc_homogenizedC(ipc,ip,el) !* Homogenized elasticity matrix constitutive_dislokmc_homogenizedC = (1.0_pReal-sumf)*lattice_C66(1:6,1:6,ph) do i=1_pInt,nt - constitutive_dislokmc_homogenizedC = & - constitutive_dislokmc_homogenizedC + plasticState(ph)%state(3_pInt*ns+i, of)*lattice_Ctwin66(1:6,1:6,ph) - enddo + constitutive_dislokmc_homogenizedC = constitutive_dislokmc_homogenizedC & + + plasticState(ph)%state(3_pInt*ns+i, of)*constitutive_dislokmc_Ctwin66(1:6,1:6,i,instance) + enddo end function constitutive_dislokmc_homogenizedC diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90 index 4957199d7..1c15b3651 100644 --- a/code/constitutive_dislotwin.f90 +++ b/code/constitutive_dislotwin.f90 @@ -1056,8 +1056,8 @@ function constitutive_dislotwin_homogenizedC(ipc,ip,el) !* Homogenized elasticity matrix constitutive_dislotwin_homogenizedC = (1.0_pReal-sumf)*lattice_C66(1:6,1:6,ph) do i=1_pInt,nt - constitutive_dislotwin_homogenizedC = & - constitutive_dislotwin_homogenizedC + plasticState(ph)%state(3_pInt*ns+i, of)*lattice_Ctwin66(1:6,1:6,ph) + constitutive_dislotwin_homogenizedC = constitutive_dislotwin_homogenizedC & + + plasticState(ph)%state(3_pInt*ns+i, of)*constitutive_dislotwin_Ctwin66(1:6,1:6,i,instance) enddo end function constitutive_dislotwin_homogenizedC