223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'YAML-compatible-debug' of magit1.mpie.de:damask/DAMASK into YAML-compatible-debug

This commit is contained in:
Sharan Roongta 2020-07-01 19:54:44 +02:00
parent b0ce55de7a 08fa40a7ae
commit a7d26cd1c3
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/constitutive.f90
View File

@ -45,9 +45,7 @@ module constitutive
debug_constitutive !< pointer to constitutive debug options
end subroutine plastic_isotropic_init
module subroutine plastic_phenopowerlaw_init(debug_constitutive)
class(tNode), pointer , intent(in) :: &
debug_constitutive !< pointer to constitutive debug options
module subroutine plastic_phenopowerlaw_init
end subroutine plastic_phenopowerlaw_init
module subroutine plastic_kinehardening_init(debug_constitutive)
@ -378,7 +376,7 @@ subroutine constitutive_init
! initialized plasticity
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_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_DISLOTWIN_ID)) call plastic_dislotwin_init(debug_constitutive)
if (any(phase_plasticity == PLASTICITY_DISLOUCLA_ID)) call plastic_disloucla_init(debug_constitutive)

10
src/constitutive_plastic_phenopowerlaw.f90
View File

@ -66,10 +66,7 @@ contains
!> @brief Perform module initialization.
!> @details reads in material parameters, allocates arrays, and does sanity checks
!--------------------------------------------------------------------------------------------------
module subroutine plastic_phenopowerlaw_init(debug_constitutive)
class(tNode), pointer, intent(in) :: &
debug_constitutive !< pointer to constitutive debug options
module subroutine plastic_phenopowerlaw_init
integer :: &
Ninstance, &
@ -86,11 +83,10 @@ module subroutine plastic_phenopowerlaw_init(debug_constitutive)
character(len=pStringLen) :: &
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)
if (debug_constitutive%contains('basic')) &
write(6,'(a16,1x,i5,/)') '# instances:',Ninstance
write(6,'(a16,1x,i5,/)') '# instances:',Ninstance; flush(6)
allocate(param(Ninstance))
allocate(state(Ninstance))