From ab0e65c6bcdd0dbfed7c0313de1e5d14d2adcb20 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 25 Jun 2021 13:26:08 +0200 Subject: [PATCH] systematic names and sensible defaults --- PRIVATE | 2 +- src/phase_damage.f90 | 2 +- src/phase_damage_anisobrittle.f90 | 6 +++--- src/phase_damage_isobrittle.f90 | 4 ++-- src/phase_damage_isoductile.f90 | 4 ++-- src/phase_mechanical_plastic_nonlocal.f90 | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/PRIVATE b/PRIVATE index b017527e1..3de8ec639 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit b017527e18a44fc6aeff61b92deedb5d79c47617 +Subproject commit 3de8ec639b4fa16a5c9d4999e0ab24626a85045a diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index ca1855a00..2edf4728b 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -242,7 +242,7 @@ module function integrateDamageState(dt,co,ce) result(broken) zeta = damper(damageState(ph)%dotState(:,me),source_dotState(1:size_so,1),source_dotState(1:size_so,2)) damageState(ph)%dotState(:,me) = damageState(ph)%dotState(:,me) * zeta & - + source_dotState(1:size_so,1)* (1.0_pReal - zeta) + + source_dotState(1:size_so,1)* (1.0_pReal - zeta) r(1:size_so) = damageState(ph)%state (1:size_so,me) & - damageState(ph)%subState0(1:size_so,me) & - damageState(ph)%dotState (1:size_so,me) * dt diff --git a/src/phase_damage_anisobrittle.f90 b/src/phase_damage_anisobrittle.f90 index 4f2dbfdf6..9984e5514 100644 --- a/src/phase_damage_anisobrittle.f90 +++ b/src/phase_damage_anisobrittle.f90 @@ -94,8 +94,8 @@ module function anisobrittle_init() result(mySources) Nmembers = count(material_phaseID==p) call phase_allocateState(damageState(p),Nmembers,1,1,0) - damageState(p)%atol = src%get_asFloat('anisobrittle_atol',defaultVal=1.0e-9_pReal) - if(any(damageState(p)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' anisobrittle_atol' + damageState(p)%atol = src%get_asFloat('atol_phi',defaultVal=1.0e-9_pReal) + if(any(damageState(p)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' atol_phi' end associate @@ -110,7 +110,7 @@ end function anisobrittle_init !-------------------------------------------------------------------------------------------------- -!> @brief calculates derived quantities from state +!> @brief !-------------------------------------------------------------------------------------------------- module subroutine anisobrittle_dotState(S, ph,me) diff --git a/src/phase_damage_isobrittle.f90 b/src/phase_damage_isobrittle.f90 index 7229cb22e..aed6a91e9 100644 --- a/src/phase_damage_isobrittle.f90 +++ b/src/phase_damage_isobrittle.f90 @@ -66,8 +66,8 @@ module function isobrittle_init() result(mySources) Nmembers = count(material_phaseID==ph) call phase_allocateState(damageState(ph),Nmembers,1,1,1) - damageState(ph)%atol = src%get_asFloat('isobrittle_atol',defaultVal=1.0e-9_pReal) - if(any(damageState(ph)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' isobrittle_atol' + damageState(ph)%atol = src%get_asFloat('atol_phi',defaultVal=1.0e-9_pReal) + if(any(damageState(ph)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' atol_phi' end associate diff --git a/src/phase_damage_isoductile.f90 b/src/phase_damage_isoductile.f90 index 0e5489b8c..345301cce 100644 --- a/src/phase_damage_isoductile.f90 +++ b/src/phase_damage_isoductile.f90 @@ -70,8 +70,8 @@ module function isoductile_init() result(mySources) Nmembers=count(material_phaseID==ph) call phase_allocateState(damageState(ph),Nmembers,1,1,0) - damageState(ph)%atol = src%get_asFloat('isoductile_atol',defaultVal=1.0e-9_pReal) - if(any(damageState(ph)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' isoductile_atol' + damageState(ph)%atol = src%get_asFloat('atol_phi',defaultVal=1.0e-9_pReal) + if(any(damageState(ph)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' atol_phi' end associate diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index 7c16b1bc7..1cd5d3e5b 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -231,7 +231,7 @@ module function plastic_nonlocal_init() result(myPlasticity) mech => phase%get('mechanical') pl => mech%get('plastic') - plasticState(ph)%nonlocal = pl%get_asBool('flux') + plasticState(ph)%nonlocal = pl%get_asBool('flux',defaultVal=.True.) #if defined (__GFORTRAN__) prm%output = output_as1dString(pl) #else