From 4eb9c3dea724d2e671da9cf7a8e3378f9938c15d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 1 Feb 2022 09:23:03 +0100 Subject: [PATCH] correct name --- src/phase_mechanical.f90 | 12 ++++++------ src/phase_mechanical_plastic.f90 | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index 6645cd36b..68b069aab 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -600,7 +600,7 @@ function integrateStateFPI(F_0,F,subFp0,subFi0,subState0,Delta_t,co,ip,el) resul real(pReal), dimension(plasticState(material_phaseID(co,(el-1)*discretization_nIPs+ip))%sizeDotState) :: & r ! state residuum real(pReal), dimension(plasticState(material_phaseID(co,(el-1)*discretization_nIPs+ip))%sizeDotState,2) :: & - dotState + dotState_last ph = material_phaseID(co,(el-1)*discretization_nIPs + ip) @@ -615,8 +615,8 @@ function integrateStateFPI(F_0,F,subFp0,subFi0,subState0,Delta_t,co,ip,el) resul iteration: do NiterationState = 1, num%nState - dotState(1:sizeDotState,2) = merge(dotState(1:sizeDotState,1),0.0, nIterationState > 1) - dotState(1:sizeDotState,1) = plasticState(ph)%dotState(:,en) + dotState_last(1:sizeDotState,2) = merge(dotState_last(1:sizeDotState,1),0.0, nIterationState > 1) + dotState_last(1:sizeDotState,1) = plasticState(ph)%dotState(:,en) broken = integrateStress(F,subFp0,subFi0,Delta_t,co,ip,el) if(broken) exit iteration @@ -624,10 +624,10 @@ function integrateStateFPI(F_0,F,subFp0,subFi0,subState0,Delta_t,co,ip,el) resul broken = plastic_dotState(Delta_t, co,ip,el,ph,en) if(broken) exit iteration - zeta = damper(plasticState(ph)%dotState(:,en),dotState(1:sizeDotState,1),& - dotState(1:sizeDotState,2)) + zeta = damper(plasticState(ph)%dotState(:,en),dotState_last(1:sizeDotState,1),& + dotState_last(1:sizeDotState,2)) plasticState(ph)%dotState(:,en) = plasticState(ph)%dotState(:,en) * zeta & - + dotState(1:sizeDotState,1) * (1.0_pReal - zeta) + + dotState_last(1:sizeDotState,1) * (1.0_pReal - zeta) r = plasticState(ph)%state(1:sizeDotState,en) & - subState0 & - plasticState(ph)%dotState(1:sizeDotState,en) * Delta_t diff --git a/src/phase_mechanical_plastic.f90 b/src/phase_mechanical_plastic.f90 index 0a24b0cbf..c83db109d 100644 --- a/src/phase_mechanical_plastic.f90 +++ b/src/phase_mechanical_plastic.f90 @@ -285,7 +285,7 @@ module subroutine plastic_LpAndItsTangents(Lp, dLp_dS, dLp_dFi, & do i=1,3; do j=1,3 dLp_dFi(i,j,1:3,1:3) = matmul(matmul(Fi,S),transpose(dLp_dMp(i,j,1:3,1:3))) + & matmul(matmul(Fi,dLp_dMp(i,j,1:3,1:3)),S) - dLp_dS(i,j,1:3,1:3) = matmul(matmul(transpose(Fi),Fi),dLp_dMp(i,j,1:3,1:3)) ! ToDo: @PS: why not: dLp_dMp:(FiT Fi) + dLp_dS(i,j,1:3,1:3) = matmul(matmul(transpose(Fi),Fi),dLp_dMp(i,j,1:3,1:3)) ! ToDo: @PS: why not: dLp_dMp:(FiT Fi) end do; end do end if