From 1042ac018f456d0283939eab6a1d6224198ac3f0 Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Fri, 24 Feb 2012 08:21:18 +0000 Subject: [PATCH] output values used for Lp_frac and analyticJaco improved comment for Lp_frac on numerics.config --- code/config/numerics.config | 2 +- code/numerics.f90 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/config/numerics.config b/code/config/numerics.config index 3419f6a93..eb19f95a9 100644 --- a/code/config/numerics.config +++ b/code/config/numerics.config @@ -9,7 +9,7 @@ pert_Fg 1.0e-7 # deformation gradient perturbation for gr pert_method 1 # perturbation method (1 = forward, 2 = backward or 3 = central) integrator 1 # integration method (1 = Fixed Point Iteration, 2 = Euler, 3 = Adaptive Euler, 4 = classical 4th order Runge-Kutta, 5 = 5th order Runge-Kutta Cash-Karp) integratorStiffness 1 # integration method used for stiffness (1 = Fixed Point Iteration, 2 = Euler, 3 = Adaptive Euler, 4 = classical 4th order Runge-Kutta, 5 = 5th order Runge-Kutta Cash-Karp) -Lp_frac 0.5 # fraction of Lp current and Lp previous step to use when integrating Fp from previous step to current +Lp_frac 0.5 # when integrating Fp from previous step to current Lp is calculated as (1-Lp_frac)*Lp previous + Lp_frac*Lp current analyticJaco 0 # use analytic Jacobian or perturbation (0 = perturbations, 1 = analytic) ## crystallite numerical parameters ## diff --git a/code/numerics.f90 b/code/numerics.f90 index bbe99bf79..dd37a681f 100644 --- a/code/numerics.f90 +++ b/code/numerics.f90 @@ -313,6 +313,8 @@ subroutine numerics_init() write(6,'(a24,1x,e8.1)') ' rTol_crystalliteStress: ',rTol_crystalliteStress write(6,'(a24,1x,e8.1)') ' aTol_crystalliteStress: ',aTol_crystalliteStress write(6,'(a24,2(1x,i8),/)')' integrator: ',numerics_integrator + write(6,'(a24,1x,e8.1)') ' Lp_frac: ',Lp_frac + write(6,'(a24,1x,L8)') ' analytic Jacobian: ',analyticJaco write(6,'(a24,1x,i8)') ' nHomog: ',nHomog write(6,'(a24,1x,e8.1)') ' subStepMinHomog: ',subStepMinHomog