From e9c3137a3e32476e2f520dbd7f255212f7f813f7 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 23 Jan 2015 11:23:35 +0000 Subject: [PATCH] disabled a faulty ntrans loop (matmul was complaining) --- code/constitutive.f90 | 4 ++-- code/plastic_dislotwin.f90 | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/constitutive.f90 b/code/constitutive.f90 index 40ee68c61..44dd4b6a9 100644 --- a/code/constitutive.f90 +++ b/code/constitutive.f90 @@ -1524,8 +1524,8 @@ function constitutive_getSlipDamage(nSlip, Tstar_v, ipc, ip, el) el !< element number real(pReal), intent(in), dimension(6) :: & Tstar_v !< 2nd Piola-Kirchhoff stress - real(pReal) :: & - constitutive_getSlipDamage(nSlip) + real(pReal), dimension(nSlip) :: & + constitutive_getSlipDamage select case (phase_damage(material_phase(ipc,ip,el))) case (LOCAL_DAMAGE_isoDuctile_ID) diff --git a/code/plastic_dislotwin.f90 b/code/plastic_dislotwin.f90 index 312c12567..25e92f1b7 100644 --- a/code/plastic_dislotwin.f90 +++ b/code/plastic_dislotwin.f90 @@ -43,7 +43,7 @@ module plastic_dislotwin ['invLambdaTwin ', 'meanFreePathTwin', 'tauTwinThreshold', 'twinVolume '] real(pReal), parameter, private :: & - kB = 1.38e-23_pReal !< Boltzmann constant in J/Kelvin + kB = 1.38e-23_pReal !< Boltzmann constant in J/Kelvin integer(pInt), dimension(:), allocatable, target, public :: & plastic_dislotwin_Noutput !< number of outputs per instance of this plasticity @@ -1875,15 +1875,16 @@ subroutine plastic_dislotwin_dotState(Tstar_v,Temperature,nSlipDamage,slipDamage shear_trans = 0.0_pReal shearrate_trans = 0.0_pReal probrate_trans = 0.0_pReal +#ifdef TRANS j = 0_pInt do f = 1_pInt,lattice_maxNtransFamily ! loop over all trans families index_myFamily = sum(lattice_NtransSystem(1:f-1_pInt,ph)) ! at which index starts my family !* Projection of shear and shear rate on fault band (twin) systems shear_trans = matmul(plastic_dislotwin_projectionMatrix_Trans(:,:,instance), & - plasticState(ph)%state(2_pInt*ns+1_pInt:3_pInt*ns, of)) + plasticState(ph)%state(2_pInt*ns+1_pInt:3_pInt*ns, of)) This is not safe shearrate_trans = matmul(plastic_dislotwin_projectionMatrix_Trans(:,:,instance), & - plasticState(ph)%dotState(2_pInt*ns+1_pInt:3_pInt*ns, of)) + plasticState(ph)%dotState(2_pInt*ns+1_pInt:3_pInt*ns, of)) This is not safe do i = 1_pInt,plastic_dislotwin_Ntrans(f,instance) ! process each (active) trans system in family j = j+1_pInt @@ -1933,7 +1934,7 @@ subroutine plastic_dislotwin_dotState(Tstar_v,Temperature,nSlipDamage,slipDamage enddo enddo - +#endif end subroutine plastic_dislotwin_dotState