From 88be08ae31f49fdd007843101c4491c04f96b69a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 8 Jan 2021 00:44:16 +0100 Subject: [PATCH] modified structure for thermal tests, fixed damage branching --- PRIVATE | 2 +- src/constitutive_damage.f90 | 22 +++++++++++----------- src/constitutive_thermal.f90 | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PRIVATE b/PRIVATE index 591964dcf..7846c7112 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 591964dcf8521d95f6cccbfe840d462c430e63d9 +Subproject commit 7846c71126705cc5d41dd79f2d595f4864434068 diff --git a/src/constitutive_damage.f90 b/src/constitutive_damage.f90 index ea00b5c94..cc2b62002 100644 --- a/src/constitutive_damage.f90 +++ b/src/constitutive_damage.f90 @@ -347,17 +347,17 @@ module subroutine damage_results(group,ph) sourceType: select case (phase_source(so,ph)) case (DAMAGE_ISOBRITTLE_ID) sourceType - call source_damage_anisoBrittle_results(ph,group//'sources/') - - case (DAMAGE_ISODUCTILE_ID) sourceType - call source_damage_anisoDuctile_results(ph,group//'sources/') - - case (DAMAGE_ANISOBRITTLE_ID) sourceType call source_damage_isoBrittle_results(ph,group//'sources/') - case (DAMAGE_ANISODUCTILE_ID) sourceType + case (DAMAGE_ISODUCTILE_ID) sourceType call source_damage_isoDuctile_results(ph,group//'sources/') + case (DAMAGE_ANISOBRITTLE_ID) sourceType + call source_damage_anisoBrittle_results(ph,group//'sources/') + + case (DAMAGE_ANISODUCTILE_ID) sourceType + call source_damage_anisoDuctile_results(ph,group//'sources/') + end select sourceType enddo SourceLoop @@ -387,16 +387,16 @@ function constitutive_damage_collectDotState(co,ip,el,ph,of) result(broken) sourceType: select case (phase_source(so,ph)) - case (DAMAGE_ISOBRITTLE_ID) sourceType - call source_damage_anisoBrittle_dotState(mech_S(material_phaseAt(co,el),material_phaseMemberAt(co,ip,el)),& - co, ip, el) ! correct stress? - case (DAMAGE_ISODUCTILE_ID) sourceType call source_damage_isoDuctile_dotState(co, ip, el) case (DAMAGE_ANISODUCTILE_ID) sourceType call source_damage_anisoDuctile_dotState(co, ip, el) + case (DAMAGE_ANISOBRITTLE_ID) sourceType + call source_damage_anisoBrittle_dotState(mech_S(material_phaseAt(co,el),material_phaseMemberAt(co,ip,el)),& + co, ip, el) ! correct stress? + end select sourceType broken = broken .or. any(IEEE_is_NaN(sourceState(ph)%p(so)%dotState(:,of))) diff --git a/src/constitutive_thermal.f90 b/src/constitutive_thermal.f90 index e6aa7c4cf..5017904df 100644 --- a/src/constitutive_thermal.f90 +++ b/src/constitutive_thermal.f90 @@ -208,7 +208,7 @@ end function constitutive_thermal_collectDotState !-------------------------------------------------------------------------------------------------- !> @brief integrate state with 1st order explicit Euler method !-------------------------------------------------------------------------------------------------- -function integrateThermalState(Delta_t,co,ip,el) result(broken) +module function integrateThermalState(Delta_t,co,ip,el) result(broken) real(pReal), intent(in) :: Delta_t integer, intent(in) :: &