diff --git a/PRIVATE b/PRIVATE index 80b48a0ae..1f14219c3 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 80b48a0aed0e610feaf9e7e15ffe0dee198bf091 +Subproject commit 1f14219c3733511402abf3d23949ea5d4bdc1024 diff --git a/src/plastic_disloUCLA.f90 b/src/plastic_disloUCLA.f90 index 5f8700436..25707bfde 100644 --- a/src/plastic_disloUCLA.f90 +++ b/src/plastic_disloUCLA.f90 @@ -553,7 +553,7 @@ subroutine plastic_disloUCLA_results(instance,group) call results_writeDataset(group,dst%Lambda_sl,'Lambda_sl',& 'mean free path for slip','m') case (thresholdstress_ID) - call results_writeDataset(group,dst%threshold_stress,'threshold_stress',& + call results_writeDataset(group,dst%threshold_stress,'tau_pass',& 'threshold stress for slip','Pa') end select enddo outputsLoop diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index 148dfd370..632a33b00 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -2128,7 +2128,7 @@ outputsLoop: do o = 1,size(param(instance)%outputID) cs = cs + ns case (resolvedstress_back_ID) - postResults(cs+1:cs+ns) = dst%tau_back(:,of) + postResults(cs+1:cs+ns) = dst%tau_back(:,of) cs = cs + ns case (resistance_ID) @@ -2137,7 +2137,7 @@ outputsLoop: do o = 1,size(param(instance)%outputID) case (rho_dot_sgl_ID) postResults(cs+1:cs+ns) = sum(rhoDotSgl(1:ns,1:4),2) & - + sum(rhoDotSgl(1:ns,5:8)*sign(1.0_pReal,rhoSgl(1:ns,5:8)),2) + + sum(rhoDotSgl(1:ns,5:8)*sign(1.0_pReal,rhoSgl(1:ns,5:8)),2) cs = cs + ns case (rho_dot_sgl_mobile_ID) @@ -2187,12 +2187,12 @@ outputsLoop: do o = 1,size(param(instance)%outputID) case (rho_dot_flux_edge_ID) postResults(cs+1:cs+ns) = sum(results(instance)%rhoDotFlux(1:ns,1:2,of),2) & - + sum(results(instance)%rhoDotFlux(1:ns,5:6,of)*sign(1.0_pReal,rhoSgl(1:ns,5:6)),2) + + sum(results(instance)%rhoDotFlux(1:ns,5:6,of)*sign(1.0_pReal,rhoSgl(1:ns,5:6)),2) cs = cs + ns case (rho_dot_flux_screw_ID) postResults(cs+1:cs+ns) = sum(results(instance)%rhoDotFlux(1:ns,3:4,of),2) & - + sum(results(instance)%rhoDotFlux(1:ns,7:8,of)*sign(1.0_pReal,rhoSgl(1:ns,7:8)),2) + + sum(results(instance)%rhoDotFlux(1:ns,7:8,of)*sign(1.0_pReal,rhoSgl(1:ns,7:8)),2) cs = cs + ns case (velocity_edge_pos_ID)