From 9e8bc7d9b18807147b26198cfe630eb40fa1394f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 6 Jun 2019 11:08:58 +0200 Subject: [PATCH] better names --- src/crystallite.f90 | 2 -- src/geometry_plastic_nonlocal.f90 | 21 +++++++++++---------- src/plastic_nonlocal.f90 | 6 +++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/crystallite.f90 b/src/crystallite.f90 index 28292ffcb..aad4a32ac 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -888,8 +888,6 @@ function crystallite_postResults(ipc, ip, el) 1+plasticState(material_phase(ipc,ip,el))%sizePostResults + & sum(sourceState(material_phase(ipc,ip,el))%p(:)%sizePostResults)) :: & crystallite_postResults - real(pReal) :: & - detF integer :: & o, & c, & diff --git a/src/geometry_plastic_nonlocal.f90 b/src/geometry_plastic_nonlocal.f90 index a96b6525f..2c3578e3b 100644 --- a/src/geometry_plastic_nonlocal.f90 +++ b/src/geometry_plastic_nonlocal.f90 @@ -11,18 +11,19 @@ module geometry_plastic_nonlocal implicit none private - integer, dimension(:,:,:,:), allocatable, public, protected :: & + real(pReal), dimension(:,:), allocatable, public, protected :: & + geometry_plastic_nonlocal_IPvolume0 !< volume associated with IP (initially!) + + real(pReal), dimension(:,:,:), allocatable, public, protected :: & + geometry_plastic_nonlocal_IParea0 !< area of interface to neighboring IP (initially!) + + real(pReal), dimension(:,:,:,:), allocatable, public, protected :: & + geometry_plastic_nonlocal_IPareaNormal0 !< area normal of interface to neighboring IP (initially!) + + integer, dimension(:,:,:,:), allocatable, public, protected :: & geometry_plastic_nonlocal_IPneighborhood !< 6 or less neighboring IPs as [element_num, IP_index, neighbor_index that points to me] - real(pReal), dimension(:,:), allocatable, public, protected :: & - geometry_plastic_nonlocal_IPvolume !< volume associated with IP (initially!) - - real(pReal), dimension(:,:,:), allocatable, public, protected :: & - geometry_plastic_nonlocal_IParea !< area of interface to neighboring IP (initially!) - real(pReal),dimension(:,:,:,:), allocatable, public, protected :: & - geometry_plastic_nonlocal_IPareaNormal !< area normal of interface to neighboring IP (initially!) - public :: & geometry_plastic_nonlocal_set_IPneighborhood, & geometry_plastic_nonlocal_set_IPvolume @@ -42,7 +43,7 @@ subroutine geometry_plastic_nonlocal_set_IPvolume(IPvolume) real(pReal), dimension(:,:), intent(in) :: IPvolume - geometry_plastic_nonlocal_IPvolume = IPvolume + geometry_plastic_nonlocal_IPvolume0 = IPvolume end subroutine geometry_plastic_nonlocal_set_IPvolume diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index 0336215ea..8c376c2fb 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -18,9 +18,9 @@ module plastic_nonlocal use lattice use geometry_plastic_nonlocal, only: & IPneighborhood => geometry_plastic_nonlocal_IPneighborhood, & - IPvolume => geometry_plastic_nonlocal_IPvolume, & - IParea => geometry_plastic_nonlocal_IParea, & - IPareaNormal => geometry_plastic_nonlocal_IPareaNormal + IPvolume => geometry_plastic_nonlocal_IPvolume0, & + IParea => geometry_plastic_nonlocal_IParea0, & + IPareaNormal => geometry_plastic_nonlocal_IPareaNormal0 implicit none private