From 3c6c5d77e83c9afa20d7489e4d691ba0375f29ef Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 6 Jul 2021 22:58:18 +0200 Subject: [PATCH] following paper --- PRIVATE | 2 +- examples/config/phase/damage/anisobrittle_cubic.yaml | 4 ++-- examples/config/phase/damage/isobrittle_generic.yaml | 4 ++-- src/phase_damage.f90 | 10 +++++----- src/phase_thermal.f90 | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PRIVATE b/PRIVATE index 15bb4a182..70310b426 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 15bb4a18292bf4f5d3b371dc1edbf9a33606eb60 +Subproject commit 70310b426d03ef07dc053e080729d35e5eb3f0cb diff --git a/examples/config/phase/damage/anisobrittle_cubic.yaml b/examples/config/phase/damage/anisobrittle_cubic.yaml index 714be6195..5320a4aa9 100644 --- a/examples/config/phase/damage/anisobrittle_cubic.yaml +++ b/examples/config/phase/damage/anisobrittle_cubic.yaml @@ -7,5 +7,5 @@ q: 20 output: [f_phi] -D_11: 1.0 -M: 0.001 +K_11: 1.0 +mu: 0.001 diff --git a/examples/config/phase/damage/isobrittle_generic.yaml b/examples/config/phase/damage/isobrittle_generic.yaml index b4416f995..98c9b9763 100644 --- a/examples/config/phase/damage/isobrittle_generic.yaml +++ b/examples/config/phase/damage/isobrittle_generic.yaml @@ -5,5 +5,5 @@ isoBrittle_atol: 0.01 output: [f_phi] -D_11: 1.0 -M: 0.001 +K_11: 1.0 +mu: 0.001 diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index e9b62b702..d8ac5046a 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -74,7 +74,7 @@ contains module subroutine damage_init integer :: & - ph, & !< counter in phase loop + ph, & Nmembers class(tNode), pointer :: & phases, & @@ -105,10 +105,10 @@ module subroutine damage_init if (sources%length == 1) then damage_active = .true. source => sources%get(1) - param(ph)%mu = source%get_asFloat('M',defaultVal=0.0_pReal) - param(ph)%K(1,1) = source%get_asFloat('D_11',defaultVal=0.0_pReal) - param(ph)%K(3,3) = source%get_asFloat('D_33',defaultVal=0.0_pReal) - param(ph)%K = lattice_applyLatticeSymmetry33(param(ph)%K,phase%get_asString('lattice')) + param(ph)%mu = source%get_asFloat('mu',defaultVal=0.0_pReal) ! ToDo: make mandatory? + param(ph)%K(1,1) = source%get_asFloat('K_11',defaultVal=0.0_pReal) ! ToDo: make mandatory? + param(ph)%K(3,3) = source%get_asFloat('K_33',defaultVal=0.0_pReal) ! ToDo: depends on symmetry + param(ph)%K = lattice_applyLatticeSymmetry33(param(ph)%K,phase_lattice(ph)) endif enddo diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90 index 808cd7cf2..8d2915ef7 100644 --- a/src/phase_thermal.f90 +++ b/src/phase_thermal.f90 @@ -100,10 +100,10 @@ module subroutine thermal_init(phases) allocate(current(ph)%dot_T(Nmembers),source=0.0_pReal) phase => phases%get(ph) thermal => phase%get('thermal',defaultVal=emptyDict) - param(ph)%C_p = thermal%get_asFloat('C_p',defaultVal=0.0_pReal) + param(ph)%C_p = thermal%get_asFloat('C_p',defaultVal=0.0_pReal) ! ToDo: make mandatory? param(ph)%K(1,1) = thermal%get_asFloat('K_11',defaultVal=0.0_pReal) ! ToDo: make mandatory? param(ph)%K(3,3) = thermal%get_asFloat('K_33',defaultVal=0.0_pReal) ! ToDo: depends on symmtery - param(ph)%K = lattice_applyLatticeSymmetry33(param(ph)%K,phase%get_asString('lattice')) + param(ph)%K = lattice_applyLatticeSymmetry33(param(ph)%K,phase_lattice(ph)) sources => thermal%get('source',defaultVal=emptyList) thermal_Nsources(ph) = sources%length