Merge branch 'development' into MiscImprovements

VERSION

@@ -1 +1 @@
-v2.0.2-2066-gecfc5d26
+v2.0.2-2072-g1ece0a1d

src/plastic_disloUCLA.f90

@@ -212,7 +212,7 @@ subroutine plastic_disloUCLA_init()
        prm%nonSchmid_neg  = prm%Schmid
      endif
 
-     prm%interaction_SlipSlip = lattice_interaction_SlipSlip(prm%Nslip, &
+     prm%interaction_SlipSlip = lattice_interaction_SlipBySlip(prm%Nslip, &
                                                                config%getFloats('interaction_slipslip'), &
                                                                config%getString('lattice_structure'))
      prm%forestProjectionEdge = lattice_forestProjection(prm%Nslip,config%getString('lattice_structure'),&
@@ -492,7 +492,7 @@ subroutine plastic_disloUCLA_dependentState(instance,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,:)))
+                                                 prm%interaction_SlipSlip(:,i)))
  end forall
 
  dst%mfp(:,of) = prm%grainSize/(1.0_pReal+prm%grainSize*dst%dislocationSpacing(:,of)/prm%Clambda)

src/plastic_dislotwin.f90

@@ -280,7 +280,7 @@ subroutine plastic_dislotwin_init
    slipActive: if (prm%totalNslip > 0_pInt) then
      prm%Schmid_slip          = lattice_SchmidMatrix_slip(prm%Nslip,config%getString('lattice_structure'),&
                                                           config%getFloat('c/a',defaultVal=0.0_pReal))
-     prm%interaction_SlipSlip = lattice_interaction_SlipSlip(prm%Nslip, &
+     prm%interaction_SlipSlip = lattice_interaction_SlipBySlip(prm%Nslip, &
                                                                config%getFloats('interaction_slipslip'), &
                                                                config%getString('lattice_structure'))
      prm%forestProjection     = lattice_forestProjection (prm%Nslip,config%getString('lattice_structure'),&
@@ -347,7 +347,7 @@ subroutine plastic_dislotwin_init
    if (prm%totalNtwin > 0_pInt) then
      prm%Schmid_twin          = lattice_SchmidMatrix_twin(prm%Ntwin,config%getString('lattice_structure'),&
                                                           config%getFloat('c/a',defaultVal=0.0_pReal))
-     prm%interaction_TwinTwin = lattice_interaction_TwinTwin(prm%Ntwin,&
+     prm%interaction_TwinTwin = lattice_interaction_TwinByTwin(prm%Ntwin,&
                                                                config%getFloats('interaction_twintwin'), &
                                                                config%getString('lattice_structure'))
 
@@ -397,7 +397,7 @@ subroutine plastic_dislotwin_init
      prm%xc_trans         = config%getFloat('xc_trans', defaultVal=0.0_pReal) ! ToDo: How to handle that???
      prm%L0_trans         = config%getFloat('l0_trans')
 
-     prm%interaction_TransTrans = lattice_interaction_TransTrans(prm%Ntrans,&
+     prm%interaction_TransTrans = lattice_interaction_TransByTrans(prm%Ntrans,&
                                                                    config%getFloats('interaction_transtrans'), &
                                                                    config%getString('lattice_structure'))
                                                              
@@ -433,17 +433,17 @@ subroutine plastic_dislotwin_init
    endif
    
    if (prm%totalNslip > 0_pInt .and. prm%totalNtwin > 0_pInt) then
-     prm%interaction_SlipTwin = lattice_interaction_SlipTwin(prm%Nslip,prm%Ntwin,&
+     prm%interaction_SlipTwin = lattice_interaction_SlipByTwin(prm%Nslip,prm%Ntwin,&
                                                                config%getFloats('interaction_sliptwin'), &
                                                                config%getString('lattice_structure')) 
-     prm%interaction_TwinSlip = lattice_interaction_TwinSlip(prm%Ntwin,prm%Nslip,&
+     prm%interaction_TwinSlip = lattice_interaction_TwinBySlip(prm%Ntwin,prm%Nslip,&
                                                                config%getFloats('interaction_twinslip'), &
                                                                config%getString('lattice_structure'))
      if (prm%fccTwinTransNucleation .and. prm%totalNtwin > 12_pInt) write(6,*) 'mist' ! ToDo: implement better test. The model will fail also if ntwin is [6,6]
    endif    
 
    if (prm%totalNslip > 0_pInt .and. prm%totalNtrans > 0_pInt) then  
-     prm%interaction_SlipTrans = lattice_interaction_SlipTrans(prm%Nslip,prm%Ntrans,&
+     prm%interaction_SlipTrans = lattice_interaction_SlipByTrans(prm%Nslip,prm%Ntrans,&
                                                                  config%getFloats('interaction_sliptrans'), &
                                                                  config%getString('lattice_structure')) 
      if (prm%fccTwinTransNucleation .and. prm%totalNtrans > 12_pInt) write(6,*) 'mist' ! ToDo: implement better test. The model will fail also if ntrans is [6,6]
@@ -941,7 +941,7 @@ subroutine plastic_dislotwin_dependentState(temperature,instance,of)
  !* 1/mean free distance between 2 twin stacks from different systems seen by a moving dislocation
  if (prm%totalNtwin > 0_pInt .and. prm%totalNslip > 0_pInt) &
    dst%invLambdaSlipTwin(1_pInt:prm%totalNslip,of) = &
-     matmul(prm%interaction_SlipTwin,fOverStacksize)/(1.0_pReal-sumf_twin)
+     matmul(transpose(prm%interaction_SlipTwin),fOverStacksize)/(1.0_pReal-sumf_twin)               ! ToDo: Transpose need
 
  !* 1/mean free distance between 2 twin stacks from different systems seen by a growing twin
 
@@ -952,7 +952,7 @@ subroutine plastic_dislotwin_dependentState(temperature,instance,of)
  !* 1/mean free distance between 2 martensite lamellar from different systems seen by a moving dislocation
  if (prm%totalNtrans > 0_pInt .and. prm%totalNslip > 0_pInt) &
    dst%invLambdaSlipTrans(1_pInt:prm%totalNslip,of) = &                                  ! ToDo: does not work if Ntrans is not 12
-      matmul(prm%interaction_SlipTrans,ftransOverLamellarSize)/(1.0_pReal-sumf_trans)
+      matmul(transpose(prm%interaction_SlipTrans),ftransOverLamellarSize)/(1.0_pReal-sumf_trans)    ! ToDo: Transpose needed
 
  !* 1/mean free distance between 2 martensite stacks from different systems seen by a growing martensite (1/lambda_trans)
  !ToDo: needed? if (prm%totalNtrans > 0_pInt) &
@@ -978,7 +978,7 @@ subroutine plastic_dislotwin_dependentState(temperature,instance,of)
  forall (i = 1_pInt:prm%totalNslip) dst%threshold_stress_slip(i,of) = &
      prm%mu*prm%burgers_slip(i)*&
      sqrt(dot_product(stt%rhoEdge(1_pInt:prm%totalNslip,of)+stt%rhoEdgeDip(1_pInt:prm%totalNslip,of),&
-                      prm%interaction_SlipSlip(i,1:prm%totalNslip)))
+                      prm%interaction_SlipSlip(:,i)))
 
  !* threshold stress for growing twin/martensite
  if(prm%totalNtwin == prm%totalNslip) &

src/plastic_kinematichardening.f90

@@ -204,7 +204,7 @@ subroutine plastic_kinehardening_init
        prm%nonSchmid_pos  = prm%Schmid
        prm%nonSchmid_neg  = prm%Schmid
      endif
-     prm%interaction_SlipSlip = lattice_interaction_SlipSlip(prm%Nslip, &
+     prm%interaction_SlipSlip = lattice_interaction_SlipBySlip(prm%Nslip, &
                                                                config%getFloats('interaction_slipslip'), &
                                                                config%getString('lattice_structure'))
 
@@ -412,7 +412,7 @@ subroutine plastic_kinehardening_dotState(Mp,instance,of)
  sumGamma = sum(stt%accshear(:,of))
 
  do i = 1_pInt, prm%totalNslip
-   dot%crss(i,of) = dot_product(prm%interaction_SlipSlip(i,:),dot%accshear(:,of)) &
+   dot%crss(i,of) = dot_product(prm%interaction_SlipSlip(:,i),dot%accshear(:,of)) &
                   * (  prm%theta1(i) &
                      + (prm%theta0(i) - prm%theta1(i) + prm%theta0(i)*prm%theta1(i)*sumGamma/prm%tau1(i)) &
                      * exp(-sumGamma*prm%theta0(i)/prm%tau1(i)) &

src/plastic_nonlocal.f90

@@ -346,7 +346,7 @@ subroutine plastic_nonlocal_init
         prm%nonSchmid_neg  = prm%Schmid
       endif
 
-      prm%interactionSlipSlip = lattice_interaction_SlipSlip(prm%Nslip, &
+      prm%interactionSlipSlip = lattice_interaction_SlipBySlip(prm%Nslip, &
                                                                config%getFloats('interaction_slipslip'), &
                                                                config%getString('lattice_structure'))
 
@@ -991,8 +991,6 @@ forall (s = 1_pInt:ns) &
 !*** coefficients are corrected for the line tension effect 
 !*** (see Kubin,Devincre,Hoc; 2008; Modeling dislocation storage rates and mean free paths in face-centered cubic crystals)
 
-myInteractionMatrix = 0.0_pReal
-myInteractionMatrix(1:ns,1:ns) = prm%interactionSlipSlip(1:ns,1:ns)
 if (lattice_structure(ph) ==  LATTICE_bcc_ID .or. lattice_structure(ph) == LATTICE_fcc_ID) then     ! only fcc and bcc
   do s = 1_pInt,ns 
     myRhoForest = max(rhoForest(s),prm%significantRho)
@@ -1000,12 +998,14 @@ if (lattice_structure(ph) ==  LATTICE_bcc_ID .or. lattice_structure(ph) == LATTI
                   + prm%linetensionEffect &
                   * log(0.35_pReal * prm%burgers(s) * sqrt(myRhoForest)) &
                   / log(0.35_pReal * prm%burgers(s) * 1e6_pReal)) ** 2.0_pReal
-    myInteractionMatrix(s,1:ns) = correction * myInteractionMatrix(s,1:ns) 
+    myInteractionMatrix(1:ns,s) = correction * prm%interactionSlipSlip(1:ns,s) 
   enddo
+else
+  myInteractionMatrix = prm%interactionSlipSlip
 endif
 forall (s = 1_pInt:ns) &
   dst%tau_threshold(s,of) = prm%mu * prm%burgers(s) &
-                  * sqrt(dot_product((sum(abs(rhoSgl),2) + sum(abs(rhoDip),2)), myInteractionMatrix(s,1:ns)))
+                  * sqrt(dot_product((sum(abs(rhoSgl),2) + sum(abs(rhoDip),2)), myInteractionMatrix(1:ns,s)))
 
 
 !*** calculate the dislocation stress of the neighboring excess dislocation densities

src/plastic_phenopowerlaw.f90

@@ -204,7 +204,7 @@ subroutine plastic_phenopowerlaw_init
        prm%nonSchmid_pos  = prm%Schmid_slip
        prm%nonSchmid_neg  = prm%Schmid_slip
      endif
-     prm%interaction_SlipSlip = lattice_interaction_SlipSlip(prm%Nslip, &
+     prm%interaction_SlipSlip = lattice_interaction_SlipBySlip(prm%Nslip, &
                                                                config%getFloats('interaction_slipslip'), &
                                                                config%getString('lattice_structure'))
 
@@ -241,7 +241,7 @@ subroutine plastic_phenopowerlaw_init
    twinActive: if (prm%totalNtwin > 0_pInt) then
      prm%Schmid_twin          = lattice_SchmidMatrix_twin(prm%Ntwin,config%getString('lattice_structure'),&
                                                           config%getFloat('c/a',defaultVal=0.0_pReal))
-     prm%interaction_TwinTwin = lattice_interaction_TwinTwin(prm%Ntwin,&
+     prm%interaction_TwinTwin = lattice_interaction_TwinByTwin(prm%Ntwin,&
                                                                config%getFloats('interaction_twintwin'), &
                                                                config%getString('lattice_structure'))
      prm%gamma_twin_char      = lattice_characteristicShear_twin(prm%Ntwin,config%getString('lattice_structure'),&
@@ -269,15 +269,15 @@ subroutine plastic_phenopowerlaw_init
 !--------------------------------------------------------------------------------------------------
 ! slip-twin related parameters
    slipAndTwinActive: if (prm%totalNslip > 0_pInt .and. prm%totalNtwin > 0_pInt) then
-     prm%interaction_SlipTwin = lattice_interaction_SlipTwin(prm%Nslip,prm%Ntwin,&
+     prm%interaction_SlipTwin = lattice_interaction_SlipByTwin(prm%Nslip,prm%Ntwin,&
                                                                config%getFloats('interaction_sliptwin'), &
                                                                config%getString('lattice_structure'))
-     prm%interaction_TwinSlip = lattice_interaction_TwinSlip(prm%Ntwin,prm%Nslip,&
+     prm%interaction_TwinSlip = lattice_interaction_TwinBySlip(prm%Ntwin,prm%Nslip,&
                                                                config%getFloats('interaction_twinslip'), &
                                                                config%getString('lattice_structure'))
    else slipAndTwinActive
-     allocate(prm%interaction_SlipTwin(prm%totalNslip,prm%TotalNtwin))                              ! at least one dimension is 0
+     allocate(prm%interaction_SlipTwin(prm%TotalNtwin,prm%TotalNslip))                              ! at least one dimension is 0
-     allocate(prm%interaction_TwinSlip(prm%totalNtwin,prm%TotalNslip))                              ! at least one dimension is 0
+     allocate(prm%interaction_TwinSlip(prm%TotalNslip,prm%TotalNtwin))                              ! at least one dimension is 0
      prm%h0_TwinSlip = 0.0_pReal
    endif slipAndTwinActive
 
@@ -484,14 +484,14 @@ subroutine plastic_phenopowerlaw_dotState(Mp,instance,of)
 !--------------------------------------------------------------------------------------------------
 ! hardening
  hardeningSlip: do i = 1_pInt, prm%totalNslip
-   dot%xi_slip(i,of) = dot_product(prm%interaction_SlipSlip(i,:),right_SlipSlip*dot%gamma_slip(:,of)) &
+   dot%xi_slip(i,of) = dot_product(prm%interaction_SlipSlip(:,i),right_SlipSlip*dot%gamma_slip(:,of)) &
                      * c_SlipSlip * left_SlipSlip(i) &
-                     + dot_product(prm%interaction_SlipTwin(i,:),dot%gamma_twin(:,of))
+                     + dot_product(prm%interaction_SlipTwin(:,i),dot%gamma_twin(:,of))
  enddo hardeningSlip
 
  hardeningTwin: do i = 1_pInt, prm%totalNtwin
-   dot%xi_twin(i,of) = c_TwinSlip * dot_product(prm%interaction_TwinSlip(i,:),dot%gamma_slip(:,of)) &
+   dot%xi_twin(i,of) = c_TwinSlip * dot_product(prm%interaction_TwinSlip(:,i),dot%gamma_slip(:,of)) &
-                     + c_TwinTwin * dot_product(prm%interaction_TwinTwin(i,:),dot%gamma_twin(:,of))
+                     + c_TwinTwin * dot_product(prm%interaction_TwinTwin(:,i),dot%gamma_twin(:,of))
  enddo hardeningTwin
 
  end associate