From 0f8396c9d350577a9ecf2a056eb79269882970b8 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sun, 20 Dec 2020 18:22:04 +0100
Subject: [PATCH] cleaning

---
 src/constitutive.f90 | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/constitutive.f90 b/src/constitutive.f90
index b7c2e08eb..d95eb5c0a 100644
--- a/src/constitutive.f90
+++ b/src/constitutive.f90
@@ -25,7 +25,6 @@ module constitutive
     crystallite_dt                                                                                  !< requested time increment of each grain
   real(pReal),               dimension(:,:,:),        allocatable :: &
     crystallite_subdt, &                                                                            !< substepped time increment of each grain
-    crystallite_subFrac, &                                                                          !< already calculated fraction of increment
     crystallite_subStep                                                                             !< size of next integration step
   type(rotation),            dimension(:,:,:),        allocatable :: &
     crystallite_orientation                                                                         !< current orientation
@@ -853,12 +852,7 @@ subroutine crystallite_init
   print'(/,a)', ' <<<+-  crystallite init  -+>>>'
 
   debug_crystallite => config_debug%get('crystallite', defaultVal=emptyList)
-  debugCrystallite%basic     = debug_crystallite%contains('basic')
   debugCrystallite%extensive = debug_crystallite%contains('extensive')
-  debugCrystallite%selective = debug_crystallite%contains('selective')
-  debugCrystallite%element   = config_debug%get_asInt('element', defaultVal=1)
-  debugCrystallite%ip        = config_debug%get_asInt('integrationpoint', defaultVal=1)
-  debugCrystallite%grain     = config_debug%get_asInt('grain', defaultVal=1)
 
   cMax = homogenization_maxNconstituents
   iMax = discretization_nIPs
@@ -880,7 +874,7 @@ subroutine crystallite_init
            source = crystallite_partitionedF)
 
   allocate(crystallite_dt(cMax,iMax,eMax),source=0.0_pReal)
-  allocate(crystallite_subdt,crystallite_subFrac,crystallite_subStep, &
+  allocate(crystallite_subdt,crystallite_subStep, &
            source = crystallite_dt)
 
   allocate(crystallite_orientation(cMax,iMax,eMax))
@@ -946,14 +940,10 @@ subroutine crystallite_init
 #endif
   enddo
 
-#ifdef DEBUG
-  if (debugCrystallite%basic) then
-    print'(a42,1x,i10)', '    # of elements:                       ', eMax
-    print'(a42,1x,i10)', '    # of integration points/element:     ', iMax
-    print'(a42,1x,i10)', 'max # of constituents/integration point: ', cMax
-    flush(IO_STDOUT)
-  endif
-#endif
+  print'(a42,1x,i10)', '    # of elements:                       ', eMax
+  print'(a42,1x,i10)', '    # of integration points/element:     ', iMax
+  print'(a42,1x,i10)', 'max # of constituents/integration point: ', cMax
+  flush(IO_STDOUT)
 
  !$OMP PARALLEL DO PRIVATE(i,c)
   do e = FEsolving_execElem(1),FEsolving_execElem(2)
@@ -1011,6 +1001,7 @@ function crystallite_stress()
     e, &                                                                                            !< counter in element loop
     s
   logical, dimension(homogenization_maxNconstituents,discretization_nIPs,discretization_Nelems) :: todo     !ToDo: need to set some values to false for different Ngrains
+  real(pReal), dimension(homogenization_maxNconstituents,discretization_nIPs,discretization_Nelems) :: subFrac     !ToDo: need to set some values to false for different Ngrains
   real(pReal),               dimension(:,:,:,:,:),    allocatable :: &
     subLp0,&                                                                                        !< plastic velocity grad at start of crystallite inc
     subLi0                                                                                          !< intermediate velocity grad at start of crystallite inc
@@ -1037,7 +1028,7 @@ function crystallite_stress()
         crystallite_subFp0(1:3,1:3,c,i,e) = crystallite_partitionedFp0(1:3,1:3,c,i,e)
         crystallite_subFi0(1:3,1:3,c,i,e) = crystallite_partitionedFi0(1:3,1:3,c,i,e)
         crystallite_subF0(1:3,1:3,c,i,e)  = crystallite_partitionedF0(1:3,1:3,c,i,e)
-        crystallite_subFrac(c,i,e) = 0.0_pReal
+        subFrac(c,i,e) = 0.0_pReal
         crystallite_subStep(c,i,e) = 1.0_pReal/num%subStepSizeCryst
         todo(c,i,e) = .true.
         crystallite_converged(c,i,e) = .false.                                                      ! pretend failed step of 1/subStepSizeCryst
@@ -1062,8 +1053,8 @@ function crystallite_stress()
 !  wind forward
           if (crystallite_converged(c,i,e)) then
             formerSubStep = crystallite_subStep(c,i,e)
-            crystallite_subFrac(c,i,e) = crystallite_subFrac(c,i,e) + crystallite_subStep(c,i,e)
-            crystallite_subStep(c,i,e) = min(1.0_pReal - crystallite_subFrac(c,i,e), &
+            subFrac(c,i,e) = subFrac(c,i,e) + crystallite_subStep(c,i,e)
+            crystallite_subStep(c,i,e) = min(1.0_pReal - subFrac(c,i,e), &
                                              num%stepIncreaseCryst * crystallite_subStep(c,i,e))
 
             todo(c,i,e) = crystallite_subStep(c,i,e) > 0.0_pReal                        ! still time left to integrate on?