From 08fa40a7aeeaf0e22230ec0c2df362305b9ac94e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 1 Jul 2020 19:41:46 +0200 Subject: [PATCH] simplified --- src/constitutive.f90 | 6 ++---- src/constitutive_plastic_phenopowerlaw.f90 | 10 +++------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/constitutive.f90 b/src/constitutive.f90 index dc15644d5..695941c31 100644 --- a/src/constitutive.f90 +++ b/src/constitutive.f90 @@ -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) diff --git a/src/constitutive_plastic_phenopowerlaw.f90 b/src/constitutive_plastic_phenopowerlaw.f90 index 1d3bb9961..53e55b319 100644 --- a/src/constitutive_plastic_phenopowerlaw.f90 +++ b/src/constitutive_plastic_phenopowerlaw.f90 @@ -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))