systematic names and sensible defaults
This commit is contained in:
parent
06e76c1a81
commit
ab0e65c6bc
2
PRIVATE
2
PRIVATE
|
@ -1 +1 @@
|
||||||
Subproject commit b017527e18a44fc6aeff61b92deedb5d79c47617
|
Subproject commit 3de8ec639b4fa16a5c9d4999e0ab24626a85045a
|
|
@ -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))
|
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 &
|
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) &
|
r(1:size_so) = damageState(ph)%state (1:size_so,me) &
|
||||||
- damageState(ph)%subState0(1:size_so,me) &
|
- damageState(ph)%subState0(1:size_so,me) &
|
||||||
- damageState(ph)%dotState (1:size_so,me) * dt
|
- damageState(ph)%dotState (1:size_so,me) * dt
|
||||||
|
|
|
@ -94,8 +94,8 @@ module function anisobrittle_init() result(mySources)
|
||||||
|
|
||||||
Nmembers = count(material_phaseID==p)
|
Nmembers = count(material_phaseID==p)
|
||||||
call phase_allocateState(damageState(p),Nmembers,1,1,0)
|
call phase_allocateState(damageState(p),Nmembers,1,1,0)
|
||||||
damageState(p)%atol = src%get_asFloat('anisobrittle_atol',defaultVal=1.0e-9_pReal)
|
damageState(p)%atol = src%get_asFloat('atol_phi',defaultVal=1.0e-9_pReal)
|
||||||
if(any(damageState(p)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' anisobrittle_atol'
|
if(any(damageState(p)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' atol_phi'
|
||||||
|
|
||||||
end associate
|
end associate
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ end function anisobrittle_init
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief calculates derived quantities from state
|
!> @brief
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
module subroutine anisobrittle_dotState(S, ph,me)
|
module subroutine anisobrittle_dotState(S, ph,me)
|
||||||
|
|
||||||
|
|
|
@ -66,8 +66,8 @@ module function isobrittle_init() result(mySources)
|
||||||
|
|
||||||
Nmembers = count(material_phaseID==ph)
|
Nmembers = count(material_phaseID==ph)
|
||||||
call phase_allocateState(damageState(ph),Nmembers,1,1,1)
|
call phase_allocateState(damageState(ph),Nmembers,1,1,1)
|
||||||
damageState(ph)%atol = src%get_asFloat('isobrittle_atol',defaultVal=1.0e-9_pReal)
|
damageState(ph)%atol = src%get_asFloat('atol_phi',defaultVal=1.0e-9_pReal)
|
||||||
if(any(damageState(ph)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' isobrittle_atol'
|
if(any(damageState(ph)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' atol_phi'
|
||||||
|
|
||||||
end associate
|
end associate
|
||||||
|
|
||||||
|
|
|
@ -70,8 +70,8 @@ module function isoductile_init() result(mySources)
|
||||||
|
|
||||||
Nmembers=count(material_phaseID==ph)
|
Nmembers=count(material_phaseID==ph)
|
||||||
call phase_allocateState(damageState(ph),Nmembers,1,1,0)
|
call phase_allocateState(damageState(ph),Nmembers,1,1,0)
|
||||||
damageState(ph)%atol = src%get_asFloat('isoductile_atol',defaultVal=1.0e-9_pReal)
|
damageState(ph)%atol = src%get_asFloat('atol_phi',defaultVal=1.0e-9_pReal)
|
||||||
if(any(damageState(ph)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' isoductile_atol'
|
if(any(damageState(ph)%atol < 0.0_pReal)) extmsg = trim(extmsg)//' atol_phi'
|
||||||
|
|
||||||
end associate
|
end associate
|
||||||
|
|
||||||
|
|
|
@ -231,7 +231,7 @@ module function plastic_nonlocal_init() result(myPlasticity)
|
||||||
mech => phase%get('mechanical')
|
mech => phase%get('mechanical')
|
||||||
pl => mech%get('plastic')
|
pl => mech%get('plastic')
|
||||||
|
|
||||||
plasticState(ph)%nonlocal = pl%get_asBool('flux')
|
plasticState(ph)%nonlocal = pl%get_asBool('flux',defaultVal=.True.)
|
||||||
#if defined (__GFORTRAN__)
|
#if defined (__GFORTRAN__)
|
||||||
prm%output = output_as1dString(pl)
|
prm%output = output_as1dString(pl)
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue