Merge branch 'YAML-compatible-debug' of magit1.mpie.de:damask/DAMASK into YAML-compatible-debug
This commit is contained in:
commit
a7d26cd1c3
|
@ -45,9 +45,7 @@ module constitutive
|
||||||
debug_constitutive !< pointer to constitutive debug options
|
debug_constitutive !< pointer to constitutive debug options
|
||||||
end subroutine plastic_isotropic_init
|
end subroutine plastic_isotropic_init
|
||||||
|
|
||||||
module subroutine plastic_phenopowerlaw_init(debug_constitutive)
|
module subroutine plastic_phenopowerlaw_init
|
||||||
class(tNode), pointer , intent(in) :: &
|
|
||||||
debug_constitutive !< pointer to constitutive debug options
|
|
||||||
end subroutine plastic_phenopowerlaw_init
|
end subroutine plastic_phenopowerlaw_init
|
||||||
|
|
||||||
module subroutine plastic_kinehardening_init(debug_constitutive)
|
module subroutine plastic_kinehardening_init(debug_constitutive)
|
||||||
|
@ -378,7 +376,7 @@ subroutine constitutive_init
|
||||||
! initialized plasticity
|
! initialized plasticity
|
||||||
if (any(phase_plasticity == PLASTICITY_NONE_ID)) call plastic_none_init(debug_constitutive)
|
if (any(phase_plasticity == PLASTICITY_NONE_ID)) call plastic_none_init(debug_constitutive)
|
||||||
if (any(phase_plasticity == PLASTICITY_ISOTROPIC_ID)) call plastic_isotropic_init(debug_constitutive)
|
if (any(phase_plasticity == PLASTICITY_ISOTROPIC_ID)) call plastic_isotropic_init(debug_constitutive)
|
||||||
if (any(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID)) call plastic_phenopowerlaw_init(debug_constitutive)
|
if (any(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID)) call plastic_phenopowerlaw_init
|
||||||
if (any(phase_plasticity == PLASTICITY_KINEHARDENING_ID)) call plastic_kinehardening_init(debug_constitutive)
|
if (any(phase_plasticity == PLASTICITY_KINEHARDENING_ID)) call plastic_kinehardening_init(debug_constitutive)
|
||||||
if (any(phase_plasticity == PLASTICITY_DISLOTWIN_ID)) call plastic_dislotwin_init(debug_constitutive)
|
if (any(phase_plasticity == PLASTICITY_DISLOTWIN_ID)) call plastic_dislotwin_init(debug_constitutive)
|
||||||
if (any(phase_plasticity == PLASTICITY_DISLOUCLA_ID)) call plastic_disloucla_init(debug_constitutive)
|
if (any(phase_plasticity == PLASTICITY_DISLOUCLA_ID)) call plastic_disloucla_init(debug_constitutive)
|
||||||
|
|
|
@ -66,10 +66,7 @@ contains
|
||||||
!> @brief Perform module initialization.
|
!> @brief Perform module initialization.
|
||||||
!> @details reads in material parameters, allocates arrays, and does sanity checks
|
!> @details reads in material parameters, allocates arrays, and does sanity checks
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
module subroutine plastic_phenopowerlaw_init(debug_constitutive)
|
module subroutine plastic_phenopowerlaw_init
|
||||||
|
|
||||||
class(tNode), pointer, intent(in) :: &
|
|
||||||
debug_constitutive !< pointer to constitutive debug options
|
|
||||||
|
|
||||||
integer :: &
|
integer :: &
|
||||||
Ninstance, &
|
Ninstance, &
|
||||||
|
@ -86,11 +83,10 @@ module subroutine plastic_phenopowerlaw_init(debug_constitutive)
|
||||||
character(len=pStringLen) :: &
|
character(len=pStringLen) :: &
|
||||||
extmsg = ''
|
extmsg = ''
|
||||||
|
|
||||||
write(6,'(/,a)') ' <<<+- plastic_'//PLASTICITY_PHENOPOWERLAW_LABEL//' init -+>>>'; flush(6)
|
write(6,'(/,a)') ' <<<+- plastic_'//PLASTICITY_PHENOPOWERLAW_LABEL//' init -+>>>'
|
||||||
|
|
||||||
Ninstance = count(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID)
|
Ninstance = count(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID)
|
||||||
if (debug_constitutive%contains('basic')) &
|
write(6,'(a16,1x,i5,/)') '# instances:',Ninstance; flush(6)
|
||||||
write(6,'(a16,1x,i5,/)') '# instances:',Ninstance
|
|
||||||
|
|
||||||
allocate(param(Ninstance))
|
allocate(param(Ninstance))
|
||||||
allocate(state(Ninstance))
|
allocate(state(Ninstance))
|
||||||
|
|
Loading…
Reference in New Issue