standard names

This commit is contained in:
Martin Diehl 2020-12-23 15:03:03 +01:00
parent 18458d34e9
commit ea25b22f13
1 changed files with 17 additions and 16 deletions

View File

@ -407,12 +407,13 @@ contains
subroutine constitutive_init subroutine constitutive_init
integer :: & integer :: &
p, & !< counter in phase loop ph, & !< counter in phase loop
s !< counter in source loop so !< counter in source loop
class (tNode), pointer :: & class (tNode), pointer :: &
debug_constitutive, & debug_constitutive, &
phases phases
debug_constitutive => config_debug%get('constitutive', defaultVal=emptyList) debug_constitutive => config_debug%get('constitutive', defaultVal=emptyList)
debugConstitutive%basic = debug_constitutive%contains('basic') debugConstitutive%basic = debug_constitutive%contains('basic')
debugConstitutive%extensive = debug_constitutive%contains('extensive') debugConstitutive%extensive = debug_constitutive%contains('extensive')
@ -423,26 +424,26 @@ subroutine constitutive_init
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! initialize constitutive laws ! initialize constitutive laws
print'(/,a)', ' <<<+- constitutive init -+>>>'; flush(IO_STDOUT)
call mech_init call mech_init
call damage_init call damage_init
call thermal_init call thermal_init
print'(/,a)', ' <<<+- constitutive init -+>>>'; flush(IO_STDOUT)
phases => config_material%get('phase') phases => config_material%get('phase')
constitutive_source_maxSizeDotState = 0 constitutive_source_maxSizeDotState = 0
PhaseLoop2:do p = 1,phases%length PhaseLoop2:do ph = 1,phases%length
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! partition and initialize state ! partition and initialize state
plasticState(p)%partitionedState0 = plasticState(p)%state0 plasticState(ph)%partitionedState0 = plasticState(ph)%state0
plasticState(p)%state = plasticState(p)%partitionedState0 plasticState(ph)%state = plasticState(ph)%partitionedState0
forall(s = 1:phase_Nsources(p)) forall(so = 1:phase_Nsources(ph))
sourceState(p)%p(s)%partitionedState0 = sourceState(p)%p(s)%state0 sourceState(ph)%p(so)%partitionedState0 = sourceState(ph)%p(so)%state0
sourceState(p)%p(s)%state = sourceState(p)%p(s)%partitionedState0 sourceState(ph)%p(so)%state = sourceState(ph)%p(so)%partitionedState0
end forall end forall
constitutive_source_maxSizeDotState = max(constitutive_source_maxSizeDotState, & constitutive_source_maxSizeDotState = max(constitutive_source_maxSizeDotState, &
maxval(sourceState(p)%p%sizeDotState)) maxval(sourceState(ph)%p%sizeDotState))
enddo PhaseLoop2 enddo PhaseLoop2
constitutive_plasticity_maxSizeDotState = maxval(plasticState%sizeDotState) constitutive_plasticity_maxSizeDotState = maxval(plasticState%sizeDotState)
@ -617,26 +618,26 @@ end subroutine constitutive_LiAndItsTangents
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief contains the constitutive equation for calculating the rate of change of microstructure !> @brief contains the constitutive equation for calculating the rate of change of microstructure
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function constitutive_damage_collectDotState(S, co, ip, el,phase,of) result(broken) function constitutive_damage_collectDotState(S, co, ip, el,ph,of) result(broken)
integer, intent(in) :: & integer, intent(in) :: &
co, & !< component-ID of integration point co, & !< component-ID of integration point
ip, & !< integration point ip, & !< integration point
el, & !< element el, & !< element
phase, & ph, &
of of
real(pReal), intent(in), dimension(3,3) :: & real(pReal), intent(in), dimension(3,3) :: &
S !< 2nd Piola Kirchhoff stress (vector notation) S !< 2nd Piola Kirchhoff stress (vector notation)
integer :: & integer :: &
i !< counter in source loop so !< counter in source loop
logical :: broken logical :: broken
broken = .false. broken = .false.
SourceLoop: do i = 1, phase_Nsources(phase) SourceLoop: do so = 1, phase_Nsources(ph)
sourceType: select case (phase_source(i,phase)) sourceType: select case (phase_source(so,ph))
case (SOURCE_damage_anisoBrittle_ID) sourceType case (SOURCE_damage_anisoBrittle_ID) sourceType
call source_damage_anisoBrittle_dotState(S, co, ip, el) ! correct stress? call source_damage_anisoBrittle_dotState(S, co, ip, el) ! correct stress?
@ -649,7 +650,7 @@ function constitutive_damage_collectDotState(S, co, ip, el,phase,of) result(brok
end select sourceType end select sourceType
broken = broken .or. any(IEEE_is_NaN(sourceState(phase)%p(i)%dotState(:,of))) broken = broken .or. any(IEEE_is_NaN(sourceState(ph)%p(so)%dotState(:,of)))
enddo SourceLoop enddo SourceLoop