cleaning and simplifying

src/plastic_disloUCLA.f90

@@ -90,6 +90,7 @@ module plastic_disloUCLA
  type, private :: tDisloUCLAdependentState
    real(pReal), allocatable,     dimension(:,:) :: &
      mfp, &
+     dislocationSpacing, &
      threshold_stress
  end type tDisloUCLAdependentState
 
@@ -382,6 +383,7 @@ subroutine plastic_disloUCLA_init()
 
 
    allocate(dst%mfp(prm%totalNslip,NipcMyPhase),source=0.0_pReal)
+   allocate(dst%dislocationSpacing(prm%totalNslip,NipcMyPhase),source=0.0_pReal)
    allocate(dst%threshold_stress(prm%totalNslip,NipcMyPhase),source=0.0_pReal)
 
 
@@ -402,20 +404,18 @@ subroutine plastic_disloUCLA_dependentState(instance,of)
 
  integer(pInt) :: &
    i
- real(pReal), dimension(param(instance)%totalNslip) :: &
-  dislocationSpacing ! 1/mean free distance between 2 forest dislocations seen by a moving dislocation
 
  associate(prm => param(instance), stt => state(instance),dst => dependentState(instance))
 
  forall (i = 1_pInt:prm%totalNslip)
-   dislocationSpacing(i) = sqrt(dot_product(stt%rhoEdge(:,of)+stt%rhoEdgeDip(:,of), &
+   dst%dislocationSpacing(i,of) = sqrt(dot_product(stt%rhoEdge(:,of)+stt%rhoEdgeDip(:,of), &
                                        prm%forestProjectionEdge(:,i)))
    dst%threshold_stress(i,of) = prm%mu*prm%burgers(i) &
                               * sqrt(dot_product(stt%rhoEdge(:,of)+stt%rhoEdgeDip(:,of), &
                                                  prm%interaction_SlipSlip(i,:)))
  end forall
 
- dst%mfp(:,of) = prm%grainSize/(1.0_pReal+prm%grainSize*dislocationSpacing/prm%Clambda)
+ dst%mfp(:,of) = prm%grainSize/(1.0_pReal+prm%grainSize*dst%dislocationSpacing(:,of)/prm%Clambda)
  end associate
 
 
@@ -471,7 +471,7 @@ subroutine plastic_disloUCLA_dotState(Mp,Temperature,instance,of)
 
  implicit none
  real(pReal), dimension(3,3),  intent(in):: &
-   Mp                                                                                          !< 2nd Piola Kirchhoff stress tensor in Mandel notation
+   Mp                                                                                               !< Mandel stress
  real(pReal),                intent(in) :: &
    temperature                                                                                      !< temperature at integration point
  integer(pInt),              intent(in) :: &
@@ -492,12 +492,11 @@ subroutine plastic_disloUCLA_dotState(Mp,Temperature,instance,of)
                  gdot_slip_pos,dgdot_dtauslip_pos,tau_slip_pos,gdot_slip_neg,dgdot_dtauslip_neg,tau_slip_neg)
 
  dot%whole(:,of) = 0.0_pReal
- dot%accshear_slip(:,of) = (gdot_slip_pos+gdot_slip_neg)
+ dot%accshear_slip(:,of) = (gdot_slip_pos+gdot_slip_neg)                                            ! ToDo: needs to be abs
 
  VacancyDiffusion = prm%D0*exp(-prm%Qsd/(kB*Temperature))
 
  where(dEq0(tau_slip_pos))
-   EdgeDipDistance = dst%mfp(:,of)        !ToDo MD@FR: correct? was not handled properly before
    DotRhoDipFormation = 0.0_pReal
    DotRhoEdgeDipClimb = 0.0_pReal
  else where
@@ -517,7 +516,7 @@ subroutine plastic_disloUCLA_dotState(Mp,Temperature,instance,of)
                    - (2.0_pReal*prm%minDipDistance)/prm%burgers*stt%rhoEdge(:,of)*abs(dot%accshear_slip(:,of)) !* Spontaneous annihilation of 2 single edge dislocations
 
  dot%rhoEdgeDip(:,of) = DotRhoDipFormation &
-                      - (2.0_pReal*prm%minDipDistance)/prm%burgers* stt%rhoEdgeDip(:,of)*abs(dot%accshear_slip(:,of)) & !* Spontaneous annihilation of a single edge dislocation with a dipole constituent
+                      - (2.0_pReal*prm%minDipDistance)/prm%burgers*stt%rhoEdgeDip(:,of)*abs(dot%accshear_slip(:,of)) & !* Spontaneous annihilation of a single edge dislocation with a dipole constituent
                       - DotRhoEdgeDipClimb
 
 end associate
@@ -603,8 +602,8 @@ pure subroutine kinetics(prm,stt,dst,Mp,Temperature,of, &
    tol_math_check, &
    dEq, dNeq0
  use math, only: &
-   pi, &
+   PI, &
-math_mul33xx33
+   math_mul33xx33
 
  implicit none
  type(tParameters), intent(in) :: &
@@ -694,10 +693,10 @@ math_mul33xx33
         )
 
    dgdot_dtauslip_pos = DotGamma0 * dvel_slip* 0.5_pReal
-else where significantPositiveTau
+ else where significantPositiveTau
    gdot_slip_pos = 0.0_pReal
    dgdot_dtauslip_pos = 0.0_pReal
-end where significantPositiveTau
+ end where significantPositiveTau
 
  significantNegativeTau: where(abs(tau_slip_neg)-dst%threshold_stress(:,of) > tol_math_check)
    StressRatio = (abs(tau_slip_neg)-dst%threshold_stress(:,of)) &
@@ -757,12 +756,12 @@ end where significantPositiveTau
 
 
    dgdot_dtauslip_neg = DotGamma0 * dvel_slip * 0.5_pReal
-else where significantNegativeTau
+ else where significantNegativeTau
    gdot_slip_neg = 0.0_pReal
    dgdot_dtauslip_neg = 0.0_pReal
-end where significantNegativeTau
+ end where significantNegativeTau
-
 
 end subroutine kinetics
 
+
 end module plastic_disloUCLA