From 9b1e1e35ea0afa730a3119910e1925b3d3ae2512 Mon Sep 17 00:00:00 2001 From: Christoph Kords Date: Mon, 21 Mar 2011 15:18:09 +0000 Subject: [PATCH] dotState --- code/constitutive.f90 | 2 +- code/constitutive_nonlocal.f90 | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/constitutive.f90 b/code/constitutive.f90 index ccfc82202..967bf44c8 100644 --- a/code/constitutive.f90 +++ b/code/constitutive.f90 @@ -596,7 +596,7 @@ select case (phase_constitution(material_phase(ipc,ip,el))) constitutive_dotState(ipc,ip,el)%p = constitutive_dislotwin_dotState(Tstar_v,Temperature,constitutive_state,ipc,ip,el) case (constitutive_nonlocal_label) - call constitutive_nonlocal_dotState(constitutive_dotState, Tstar_v, Fe, Fp, Temperature, constitutive_state, & + call constitutive_nonlocal_dotState(constitutive_dotState(ipc,ip,el), Tstar_v, Fe, Fp, Temperature, constitutive_state, & constitutive_aTolState, subdt, orientation, ipc, ip, el) end select diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90 index 7a7c8e1cb..66456d427 100644 --- a/code/constitutive_nonlocal.f90 +++ b/code/constitutive_nonlocal.f90 @@ -1375,8 +1375,7 @@ type(p_vec), dimension(homogenization_maxNgrains,mesh_maxNips,mesh_NcpElems), in aTolState ! absolute state tolerance !*** input/output variables -type(p_vec), dimension(homogenization_maxNgrains,mesh_maxNips,mesh_NcpElems), intent(inout) :: & - dotState ! evolution of state variables / microstructure +type(p_vec), intent(inout) :: dotState ! evolution of state variables / microstructure !*** output variables @@ -1481,7 +1480,7 @@ Tdislocation_v = state(g,ip,el)%p(12*ns+1:12*ns+6) !*** sanity check for timestep if (timestep <= 0.0_pReal) then ! if illegal timestep... - dotState(g,ip,el)%p = 0.0_pReal ! ...return without doing anything (-> zero dotState) + dotState%p = 0.0_pReal ! ...return without doing anything (-> zero dotState) return endif @@ -1769,7 +1768,7 @@ if (debug_verbosity > 6 .and. ((debug_e == el .and. debug_i == ip .and. debug_g !$OMP END CRITICAL (write2out) endif -dotState(g,ip,el)%p(1:10*ns) = dotState(g,ip,el)%p(1:10*ns) + reshape(rhoDot,(/10*ns/)) +dotState%p(1:10*ns) = dotState%p(1:10*ns) + reshape(rhoDot,(/10*ns/)) endsubroutine