From 1c4dc2e05f6819c8bf0b4877c61990dc85bd445c Mon Sep 17 00:00:00 2001 From: Satya Gupta Date: Thu, 24 Jan 2019 18:45:25 -0500 Subject: [PATCH 1/2] material_allocatePlasticState now takes care of setting offsetDeltaState --- src/material.f90 | 10 ++++++---- src/plastic_kinematichardening.f90 | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/material.f90 b/src/material.f90 index 8356f43c7..d12321235 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -918,7 +918,8 @@ end subroutine material_parseTexture !-------------------------------------------------------------------------------------------------- !> @brief allocates the plastic state of a phase !-------------------------------------------------------------------------------------------------- -subroutine material_allocatePlasticState(phase,NofMyPhase,sizeState,sizeDotState,sizeDeltaState,& +subroutine material_allocatePlasticState(phase,NofMyPhase,& + sizeState,sizeDotState,sizeDeltaState,& Nslip,Ntwin,Ntrans) use numerics, only: & numerics_integrator2 => numerics_integrator ! compatibility hack @@ -936,9 +937,10 @@ subroutine material_allocatePlasticState(phase,NofMyPhase,sizeState,sizeDotState integer(pInt) :: numerics_integrator ! compatibility hack numerics_integrator = numerics_integrator2(1) ! compatibility hack - plasticState(phase)%sizeState = sizeState - plasticState(phase)%sizeDotState = sizeDotState - plasticState(phase)%sizeDeltaState = sizeDeltaState + plasticState(phase)%sizeState = sizeState + plasticState(phase)%sizeDotState = sizeDotState + plasticState(phase)%sizeDeltaState = sizeDeltaState + plasticState(phase)%offsetDeltaState = sizeState-sizeDeltaState ! deltaState occupies latter part of state by definition plasticState(phase)%Nslip = Nslip plasticState(phase)%Ntwin = Ntwin plasticState(phase)%Ntrans= Ntrans diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index 690349c96..d70fe68f7 100644 --- a/src/plastic_kinematichardening.f90 +++ b/src/plastic_kinematichardening.f90 @@ -302,7 +302,6 @@ subroutine plastic_kinehardening_init call material_allocatePlasticState(p,NipcMyPhase,sizeState,sizeDotState,sizeDeltaState, & prm%totalNslip,0_pInt,0_pInt) plasticState(p)%sizePostResults = sum(plastic_kinehardening_sizePostResult(:,phase_plasticityInstance(p))) - plasticState(p)%offsetDeltaState = sizeDotState !-------------------------------------------------------------------------------------------------- ! locally defined state aliases and initialization of state0 and aTolState From e2c31bdc7c0987b61e3e736673e4fc6c0d9d6b2a Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 25 Jan 2019 14:23:52 +0100 Subject: [PATCH 2/2] [skip ci] updated version information after successful test of v2.0.2-1496-g1c4dc2e0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a25b1aedf..2c7fbd47e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-1464-g8fabacec +v2.0.2-1496-g1c4dc2e0