From 9d71ffa3eee182ca1d28232b2975f11daa8c2084 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Thu, 24 Nov 2022 11:23:10 +0100 Subject: [PATCH] better naming --- examples/config/numerics.yaml | 2 +- src/grid/grid_damage_spectral.f90 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/config/numerics.yaml b/examples/config/numerics.yaml index 4363b97cc..e2759ab92 100644 --- a/examples/config/numerics.yaml +++ b/examples/config/numerics.yaml @@ -80,4 +80,4 @@ commercialFEM: generic: random_seed: 0 # fixed seeding for pseudo-random number generator, Default 0: use random seed. - residualStiffness: 1.0e-6 # non-zero residual damage. + phi_min: 1.0e-6 # non-zero residual damage. diff --git a/src/grid/grid_damage_spectral.f90 b/src/grid/grid_damage_spectral.f90 index 3e514b960..cd7c20ef8 100644 --- a/src/grid/grid_damage_spectral.f90 +++ b/src/grid/grid_damage_spectral.f90 @@ -33,7 +33,7 @@ module grid_damage_spectral integer :: & itmax !< maximum number of iterations real(pReal) :: & - residualStiffness, & !< non-zero residual damage + phi_min, & !< non-zero residual damage eps_damage_atol, & !< absolute tolerance for damage evolution eps_damage_rtol !< relative tolerance for damage evolution end type tNumerics @@ -95,9 +95,9 @@ subroutine grid_damage_spectral_init() num%eps_damage_rtol = num_grid%get_asFloat ('eps_damage_rtol',defaultVal=1.0e-6_pReal) num_generic => config_numerics%get_dict('generic',defaultVal=emptyDict) - num%residualStiffness = num_generic%get_asFloat('residualStiffness', defaultVal=1.0e-6_pReal) + num%phi_min = num_generic%get_asFloat('phi_min', defaultVal=1.0e-6_pReal) - if (num%residualStiffness < 0.0_pReal) call IO_error(301,ext_msg='residualStiffness') + if (num%phi_min < 0.0_pReal) call IO_error(301,ext_msg='phi_min') if (num%itmax <= 1) call IO_error(301,ext_msg='itmax') if (num%eps_damage_atol <= 0.0_pReal) call IO_error(301,ext_msg='eps_damage_atol') if (num%eps_damage_rtol <= 0.0_pReal) call IO_error(301,ext_msg='eps_damage_rtol') @@ -325,7 +325,7 @@ subroutine formResidual(in,x_scal,r,dummy,err_PETSc) !-------------------------------------------------------------------------------------------------- ! constructing residual - r = max(min(utilities_GreenConvolution(r, K_ref, mu_ref, params%Delta_t),phi_lastInc),num%residualStiffness) & + r = max(min(utilities_GreenConvolution(r, K_ref, mu_ref, params%Delta_t),phi_lastInc),num%phi_min) & - phi_current err_PETSc = 0