From 5ff4664b6d1a4c4d7bb9b8a0127f22198e96ff6b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 30 Jun 2019 22:09:51 -0700 Subject: [PATCH] polishing --- src/constitutive.f90 | 3 +-- src/crystallite.f90 | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/constitutive.f90 b/src/constitutive.f90 index 4458cd6de..e627fa80c 100644 --- a/src/constitutive.f90 +++ b/src/constitutive.f90 @@ -450,7 +450,7 @@ subroutine constitutive_LiAndItsTangents(Li, dLi_dS, dLi_dFi, & dLi_dS(1:3,1:3,i,j) = matmul(matmul(Fi,dLi_dS(1:3,1:3,i,j)),FiInv)*detFi dLi_dFi(1:3,1:3,i,j) = dLi_dFi(1:3,1:3,i,j) + Li*FiInv(j,i) dLi_dFi(1:3,i,1:3,j) = dLi_dFi(1:3,i,1:3,j) + math_I3*temp_33(j,i) + Li*FiInv(j,i) - end do; end do + enddo; enddo end subroutine constitutive_LiAndItsTangents @@ -554,7 +554,6 @@ subroutine constitutive_hooke_SandItsTangents(S, dS_dFe, dS_dFi, & E = 0.5_pReal*(matmul(transpose(Fe),Fe)-math_I3) !< Green-Lagrange strain in unloaded configuration S = math_mul3333xx33(C,matmul(matmul(transpose(Fi),E),Fi)) !< 2PK stress in lattice configuration in work conjugate with GL strain pulled back to lattice configuration - dS_dFe = 0.0_pReal forall (i=1:3, j=1:3) dS_dFe(i,j,1:3,1:3) = matmul(Fe,matmul(matmul(Fi,C(i,j,1:3,1:3)),transpose(Fi))) !< dS_ij/dFe_kl = C_ijmn * Fi_lm * Fi_on * Fe_ko dS_dFi(i,j,1:3,1:3) = 2.0_pReal*matmul(matmul(E,Fi),C(i,j,1:3,1:3)) !< dS_ij/dFi_kl = C_ijln * E_km * Fe_mn diff --git a/src/crystallite.f90 b/src/crystallite.f90 index d2e8ae97c..246cb7092 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -1190,10 +1190,8 @@ logical function integrateStress(ipc,ip,el,timeFraction) Fg_new = crystallite_subF(1:3,1:3,ipc,ip,el) endif - - !* feed local variables - Lpguess = crystallite_Lp(1:3,1:3,ipc,ip,el) ! ... and take it as first guess - Liguess = crystallite_Li(1:3,1:3,ipc,ip,el) ! ... and take it as first guess + Lpguess = crystallite_Lp(1:3,1:3,ipc,ip,el) ! take as first guess + Liguess = crystallite_Li(1:3,1:3,ipc,ip,el) ! take as first guess Liguess_old = Liguess invFp_current = math_inv33(crystallite_subFp0(1:3,1:3,ipc,ip,el))