From c790c82a427de2a024e935af18488ee9dcc6c85d Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sat, 13 Feb 2021 06:59:18 +0100
Subject: [PATCH] separating by instance just complicates things

---
 src/material.f90                                |  2 +-
 src/phase_mechanical_eigen_cleavageopening.f90  | 15 ++++-----------
 src/phase_mechanical_eigen_slipplaneopening.f90 | 14 +++-----------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/material.f90 b/src/material.f90
index df6dc6dd1..3656f0f0a 100644
--- a/src/material.f90
+++ b/src/material.f90
@@ -48,7 +48,7 @@ module material
 contains
 
 !--------------------------------------------------------------------------------------------------
-!> @brief parses material configuration file
+!> @brief Parse material configuration file (material.yaml).
 !--------------------------------------------------------------------------------------------------
 subroutine material_init(restart)
 
diff --git a/src/phase_mechanical_eigen_cleavageopening.f90 b/src/phase_mechanical_eigen_cleavageopening.f90
index f1774c78e..8878c10bd 100644
--- a/src/phase_mechanical_eigen_cleavageopening.f90
+++ b/src/phase_mechanical_eigen_cleavageopening.f90
@@ -6,8 +6,6 @@
 !--------------------------------------------------------------------------------------------------
 submodule(phase:eigendeformation) cleavageopening
 
-  integer, dimension(:), allocatable :: kinematics_cleavage_opening_instance
-
   type :: tParameters                                                                               !< container type for internal constitutive parameters
     integer :: &
       sum_N_cl                                                                                      !< total number of cleavage planes
@@ -20,7 +18,7 @@ submodule(phase:eigendeformation) cleavageopening
       cleavage_systems
   end type tParameters
 
-  type(tParameters), dimension(:), allocatable :: param                                             !< containers of constitutive parameters (len Ninstances)
+  type(tParameters), dimension(:), allocatable :: param                                             !< containers of constitutive parameters
 
 
 contains
@@ -52,17 +50,15 @@ module function kinematics_cleavage_opening_init(kinematics_length) result(myKin
   if(Ninstances == 0) return
 
   phases => config_material%get('phase')
-  allocate(param(Ninstances))
-  allocate(kinematics_cleavage_opening_instance(phases%length), source=0)
+  allocate(param(phases%length))
 
   do p = 1, phases%length
-    if(any(myKinematics(:,p))) kinematics_cleavage_opening_instance(p) = count(myKinematics(:,1:p))
     phase => phases%get(p)
     if(count(myKinematics(:,p)) == 0) cycle
     kinematics => phase%get('damage')
     do k = 1, kinematics%length
       if(myKinematics(k,p)) then
-        associate(prm  => param(kinematics_cleavage_opening_instance(p)))
+        associate(prm  => param(p))
         kinematic_type => kinematics%get(k)
 
         N_cl = kinematic_type%get_asInts('N_cl')
@@ -113,18 +109,15 @@ module subroutine kinematics_cleavage_opening_LiAndItsTangent(Ld, dLd_dTstar, S,
     dLd_dTstar                                                                                      !< derivative of Ld with respect to Tstar (4th-order tensor)
 
   integer :: &
-    homog, damageOffset, &
     i, k, l, m, n
   real(pReal) :: &
     traction_d, traction_t, traction_n, traction_crit, &
     udotd, dudotd_dt, udott, dudott_dt, udotn, dudotn_dt
 
-  homog = material_homogenizationAt(el)
-  damageOffset = material_homogenizationMemberAt(ip,el)
 
   Ld = 0.0_pReal
   dLd_dTstar = 0.0_pReal
-  associate(prm => param(kinematics_cleavage_opening_instance(material_phaseAt(co,el))))
+  associate(prm => param(material_phaseAt(co,el)))
   do i = 1,prm%sum_N_cl
     traction_crit = prm%g_crit(i)*phase_damage_get_phi(co,ip,el)**2.0_pReal
 
diff --git a/src/phase_mechanical_eigen_slipplaneopening.f90 b/src/phase_mechanical_eigen_slipplaneopening.f90
index dd5f172d9..e8410a935 100644
--- a/src/phase_mechanical_eigen_slipplaneopening.f90
+++ b/src/phase_mechanical_eigen_slipplaneopening.f90
@@ -57,11 +57,9 @@ module function kinematics_slipplane_opening_init(kinematics_length) result(myKi
   if(Ninstances == 0) return
 
   phases => config_material%get('phase')
-  allocate(kinematics_slipplane_opening_instance(phases%length), source=0)
-  allocate(param(Ninstances))
+  allocate(param(phases%length))
 
   do p = 1, phases%length
-    if(any(myKinematics(:,p))) kinematics_slipplane_opening_instance(p) = count(myKinematics(:,1:p))
     phase => phases%get(p)
     mech  => phase%get('mechanics')
     pl    => mech%get('plasticity')
@@ -69,7 +67,7 @@ module function kinematics_slipplane_opening_init(kinematics_length) result(myKi
     kinematics => phase%get('damage')
     do k = 1, kinematics%length
       if(myKinematics(k,p)) then
-        associate(prm  => param(kinematics_slipplane_opening_instance(p)))
+        associate(prm  => param(p))
         kinematic_type => kinematics%get(k)
 
         prm%dot_o    = kinematic_type%get_asFloat('dot_o')
@@ -131,19 +129,13 @@ module subroutine kinematics_slipplane_opening_LiAndItsTangent(Ld, dLd_dTstar, S
     dLd_dTstar                                                                                      !< derivative of Ld with respect to Tstar (4th-order tensor)
 
   integer :: &
-    instance, phase, &
-    homog, damageOffset, &
     i, k, l, m, n
   real(pReal) :: &
     traction_d, traction_t, traction_n, traction_crit, &
     udotd, dudotd_dt, udott, dudott_dt, udotn, dudotn_dt
 
-  phase = material_phaseAt(co,el)
-  instance = kinematics_slipplane_opening_instance(phase)
-  homog = material_homogenizationAt(el)
-  damageOffset = material_homogenizationMemberAt(ip,el)
 
-  associate(prm => param(instance))
+  associate(prm => param(material_phaseAt(co,el)))
   Ld = 0.0_pReal
   dLd_dTstar = 0.0_pReal
   do i = 1, prm%sum_N_sl