From 6bb3a475ce9d3a000a14d769ce534f39cf308806 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 28 Nov 2012 18:44:51 +0000 Subject: [PATCH] added output of current relative tolerance when reporting relative errors --- code/DAMASK_spectral_solverAL.f90 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/DAMASK_spectral_solverAL.f90 b/code/DAMASK_spectral_solverAL.f90 index 768de4d98..2e09567f8 100644 --- a/code/DAMASK_spectral_solverAL.f90 +++ b/code/DAMASK_spectral_solverAL.f90 @@ -475,12 +475,15 @@ subroutine AL_converged(snes_local,it,xnorm,snorm,fnorm,reason,dummy,ierr) reason = 0 endif - write(6,'(a,es14.7)') 'error stress BC = ', & - err_stress/min(maxval(abs(P_av))*err_stress_tolrel,err_stress_tolabs) - write(6,'(a,es14.7)') 'error F = ',& - err_f/sqrt(sum((F_aim-math_I3)*(F_aim-math_I3)))/err_f_tol - write(6,'(a,es14.7)') 'error P = ', & - err_p/sqrt(sum((F_aim-math_I3)*(F_aim-math_I3)))/err_p_tol + write(6,'(a,f12.7,1x,1a,1x,es9.3)') 'error stress BC = ', & + err_stress/min(maxval(abs(P_av))*err_stress_tolrel,err_stress_tolabs),& + '@',min(maxval(abs(P_av))*err_stress_tolrel,err_stress_tolabs) + write(6,'(a,f12.7,1x,1a,1x,es9.3)') 'error F = ',& + err_f/sqrt(sum((F_aim-math_I3)*(F_aim-math_I3)))/err_f_tol,& + '@',err_f_tol + write(6,'(a,f12.7,1x,1a,1x,es9.3)') 'error P = ', & + err_p/sqrt(sum((F_aim-math_I3)*(F_aim-math_I3)))/err_p_tol,& + '@',err_p_tol write(6,'(/,a)') '==========================================================================' end subroutine AL_converged