diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2f95c82d..73b6abd58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -390,7 +390,6 @@ Phenopowerlaw_singleSlip: - master - release - ################################################################################################### Marc_compileIfort2018_1: stage: compileMarc @@ -402,7 +401,6 @@ Marc_compileIfort2018_1: - master - release - ################################################################################################### Hex_elastic: stage: marc @@ -440,11 +438,13 @@ J2_plasticBehavior: - master - release - ################################################################################################### grid_all_example: stage: example script: grid_all_example/test.py + except: + - master + - release ################################################################################################### SpectralRuntime: diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index 43b379667..925215c69 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -53,12 +53,13 @@ module plastic_dislotwin nu, & D0, & !< prefactor for self-diffusion coefficient Qsd, & !< activation energy for dislocation climb - D, & ! system prm%rho_mob_0 = math_expand(prm%rho_mob_0, prm%N_sl) @@ -740,8 +758,11 @@ subroutine plastic_dislotwin_dotState(Mp,T,instance,of) f_unrotated, & VacancyDiffusion, & rho_dip_distance, & - v_cl, & - tau + v_cl, & !< climb velocity + Gamma, & !< stacking fault energy + tau, & + sigma_cl, & !< climb stress + b_d !< ratio of burgers vector to stacking fault width real(pReal), dimension(param(instance)%sum_N_sl) :: & dot_rho_dip_formation, & dot_rho_dip_climb, & @@ -786,8 +807,17 @@ subroutine plastic_dislotwin_dotState(Mp,T,instance,of) if (dEq0(rho_dip_distance-rho_dip_distance_min(i))) then dot_rho_dip_climb(i) = 0.0_pReal else - v_cl = 3.0_pReal*prm%mu*VacancyDiffusion*prm%atomicVolume(i) & - / (2.0_pReal*PI*kB*T*(rho_dip_distance+rho_dip_distance_min(i))) + !@details: Refer: Argon & Moffat, Acta Metallurgica, Vol. 29, pg 293 to 299, 1981 + sigma_cl = dot_product(prm%n0_sl(1:3,i),matmul(Mp,prm%n0_sl(1:3,i))) + if (prm%ExtendedDislocations) then + Gamma = prm%SFE_0K + prm%dSFE_dT * T + b_d = 24.0_pReal*PI*(1.0_pReal - prm%nu)/(2.0_pReal + prm%nu)* Gamma/(prm%mu*prm%b_sl(i)) + else + b_d = 1.0_pReal + endif + v_cl = 2.0_pReal*prm%omega*b_d**2.0_pReal*exp(-prm%Qsd/(kB*T)) & + * (exp(abs(sigma_cl)*prm%b_sl(i)**3.0_pReal/(kB*T)) - 1.0_pReal) + dot_rho_dip_climb(i) = 4.0_pReal*v_cl*stt%rho_dip(i,of) & / (rho_dip_distance-rho_dip_distance_min(i)) endif