general polishing

src/config.f90

@@ -318,7 +318,7 @@ subroutine show(this)
  do while (associated(item%next))
    write(6,'(a)') ' '//trim(item%string%val)
    item => item%next
- end do
+ enddo
 
 end subroutine show
 
@@ -391,7 +391,7 @@ logical function keyExists(this,key)
  do while (associated(item%next) .and. .not. keyExists)
    keyExists = trim(IO_stringValue(item%string%val,item%string%pos,1)) == trim(key)
    item => item%next
- end do
+ enddo
 
 end function keyExists
 
@@ -417,7 +417,7 @@ integer(pInt) function countKeys(this,key)
    if (trim(IO_stringValue(item%string%val,item%string%pos,1)) == trim(key)) &
      countKeys = countKeys + 1_pInt
    item => item%next
- end do
+ enddo
 
 end function countKeys
 
@@ -451,7 +451,7 @@ real(pReal) function getFloat(this,key,defaultVal)
      getFloat = IO_FloatValue(item%string%val,item%string%pos,2)
    endif
    item => item%next
- end do
+ enddo
 
  if (.not. found) call IO_error(140_pInt,ext_msg=key)
 
@@ -487,7 +487,7 @@ integer(pInt) function getInt(this,key,defaultVal)
      getInt = IO_IntValue(item%string%val,item%string%pos,2)
    endif
    item => item%next
- end do
+ enddo
 
  if (.not. found) call IO_error(140_pInt,ext_msg=key)
 
@@ -538,7 +538,7 @@ character(len=65536) function getString(this,key,defaultVal,raw)
      endif
    endif
    item => item%next
- end do
+ enddo
 
  if (.not. found) call IO_error(140_pInt,ext_msg=key)
 
@@ -584,7 +584,7 @@ function getFloats(this,key,defaultVal,requiredShape,requiredSize)
      enddo
    endif
    item => item%next
- end do
+ enddo
 
  if (.not. found) then
    if (present(defaultVal)) then; getFloats = defaultVal; else; call IO_error(140_pInt,ext_msg=key); endif
@@ -635,7 +635,7 @@ function getInts(this,key,defaultVal,requiredShape,requiredSize)
      enddo
    endif
    item => item%next
- end do
+ enddo
 
  if (.not. found) then
    if (present(defaultVal)) then; getInts = defaultVal; else; call IO_error(140_pInt,ext_msg=key); endif
@@ -712,7 +712,7 @@ function getStrings(this,key,defaultVal,requiredShape,raw)
      endif notAllocated
    endif
    item => item%next
- end do
+ enddo
 
  if (.not. found) then
    if (present(defaultVal)) then; getStrings = defaultVal; else; call IO_error(140_pInt,ext_msg=key); endif

src/plastic_disloUCLA.f90

@@ -189,7 +189,7 @@ subroutine plastic_disloUCLA_init()
  allocate(dependentState(Ninstance))
 
 
- do p = 1_pInt, size(phase_plasticityInstance)
+ do p = 1_pInt, size(phase_plasticity)
    if (phase_plasticity(p) /= PLASTICITY_DISLOUCLA_ID) cycle
    associate(prm => param(phase_plasticityInstance(p)), &
              dot => dotState(phase_plasticityInstance(p)), &
@@ -325,7 +325,7 @@ subroutine plastic_disloUCLA_init()
        prm%outputID = [prm%outputID, outputID]
      endif
 
-   end do
+   enddo
 
 !--------------------------------------------------------------------------------------------------
 ! allocate state arrays

src/plastic_isotropic.f90

@@ -91,7 +91,7 @@ subroutine plastic_isotropic_init()
    debug_levelExtensive, &
 #endif
    debug_level, &
-   debug_constitutive,&
+   debug_constitutive, &
    debug_levelBasic
  use IO, only: &
    IO_error, &
@@ -148,7 +148,7 @@ subroutine plastic_isotropic_init()
  allocate(state(Ninstance))
  allocate(dotState(Ninstance))
 
- do p = 1_pInt, size(phase_plasticityInstance)
+ do p = 1_pInt, size(phase_plasticity)
    if (phase_plasticity(p) /= PLASTICITY_ISOTROPIC_ID) cycle
    associate(prm => param(phase_plasticityInstance(p)), &
              dot => dotState(phase_plasticityInstance(p)), &
@@ -217,7 +217,7 @@ subroutine plastic_isotropic_init()
        prm%outputID = [prm%outputID, outputID]
     endif
 
-   end do
+   enddo
 
 !--------------------------------------------------------------------------------------------------
 ! allocate state arrays

src/plastic_none.f90

@@ -1,7 +1,8 @@
 !--------------------------------------------------------------------------------------------------
 !> @author Franz Roters, Max-Planck-Institut für Eisenforschung GmbH
 !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
-!> @brief material subroutine for purely elastic material
+!> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
+!> @brief Dummy plasticity for purely elastic material
 !--------------------------------------------------------------------------------------------------
 module plastic_none
 
@@ -13,7 +14,6 @@ module plastic_none
 
 contains
 
-
 !--------------------------------------------------------------------------------------------------
 !> @brief module initialization
 !> @details reads in material parameters, allocates arrays, and does sanity checks
@@ -32,52 +32,40 @@ subroutine plastic_none_init
    debug_levelBasic
  use IO, only: &
    IO_timeStamp
- use numerics, only: &
-   numerics_integrator
  use material, only: &
    phase_plasticity, &
+   material_allocatePlasticState, &
    PLASTICITY_NONE_label, &
+   PLASTICITY_NONE_ID, &
    material_phase, &
-   plasticState, &
+   plasticState
-   PLASTICITY_none_ID
 
  implicit none
-
  integer(pInt) :: &
-   maxNinstance, &
+   Ninstance, &
-   phase, &
+   p, &
-   NofMyPhase
+   NipcMyPhase
 
  write(6,'(/,a)')   ' <<<+-  plastic_'//PLASTICITY_NONE_label//' init  -+>>>'
  write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
 
- maxNinstance = int(count(phase_plasticity == PLASTICITY_none_ID),pInt)
+ Ninstance = int(count(phase_plasticity == PLASTICITY_NONE_ID),pInt)
  if (iand(debug_level(debug_constitutive),debug_levelBasic) /= 0_pInt) &
-   write(6,'(a16,1x,i5,/)') '# instances:',maxNinstance
+   write(6,'(a16,1x,i5,/)') '# instances:',Ninstance
 
- initializeInstances: do phase = 1_pInt, size(phase_plasticity)
+ do p = 1_pInt, size(phase_plasticity)
-   if (phase_plasticity(phase) == PLASTICITY_none_ID) then
+   if (phase_plasticity(p) /= PLASTICITY_NONE_ID) cycle
-   NofMyPhase=count(material_phase==phase)
 
-     allocate(plasticState(phase)%aTolState          (0_pInt))
+!--------------------------------------------------------------------------------------------------
-     allocate(plasticState(phase)%state0             (0_pInt,NofMyPhase))
+! allocate state arrays
-     allocate(plasticState(phase)%partionedState0    (0_pInt,NofMyPhase))
+   NipcMyPhase = count(material_phase == p)
-     allocate(plasticState(phase)%subState0          (0_pInt,NofMyPhase))
-     allocate(plasticState(phase)%state              (0_pInt,NofMyPhase))
 
-     allocate(plasticState(phase)%dotState           (0_pInt,NofMyPhase))
+   call material_allocatePlasticState(p,NipcMyPhase,0_pInt,0_pInt,0_pInt, &
-     allocate(plasticState(phase)%deltaState         (0_pInt,NofMyPhase))
+                                      0_pInt,0_pInt,0_pInt)
-     if (any(numerics_integrator == 1_pInt)) then
+   plasticState(p)%sizePostResults = 0_pInt
-       allocate(plasticState(phase)%previousDotState (0_pInt,NofMyPhase))
+
-       allocate(plasticState(phase)%previousDotState2(0_pInt,NofMyPhase))
+ enddo
-     endif
-     if (any(numerics_integrator == 4_pInt)) &
-       allocate(plasticState(phase)%RK4dotState      (0_pInt,NofMyPhase))
-     if (any(numerics_integrator == 5_pInt)) &
-       allocate(plasticState(phase)%RKCK45dotState (6,0_pInt,NofMyPhase))
-   endif
- enddo initializeInstances
 
 end subroutine plastic_none_init
 

src/plastic_phenopowerlaw.f90

@@ -171,7 +171,7 @@ subroutine plastic_phenopowerlaw_init
  allocate(state(Ninstance))
  allocate(dotState(Ninstance))
 
- do p = 1_pInt, size(phase_plasticityInstance)
+ do p = 1_pInt, size(phase_plasticity)
    if (phase_plasticity(p) /= PLASTICITY_PHENOPOWERLAW_ID) cycle
    associate(prm => param(phase_plasticityInstance(p)), &
              dot => dotState(phase_plasticityInstance(p)), &
@@ -336,7 +336,7 @@ subroutine plastic_phenopowerlaw_init
        prm%outputID = [prm%outputID, outputID]
      endif
 
-   end do
+   enddo
 
 !--------------------------------------------------------------------------------------------------
 ! allocate state arrays