From 2627ed1a829577a94018d2544f4b7539fcf0b789 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 22 Dec 2020 10:44:43 +0100 Subject: [PATCH] cleaning --- src/constitutive.f90 | 19 +------------------ src/constitutive_mech.f90 | 6 +++++- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/constitutive.f90 b/src/constitutive.f90 index 47a7dfc4b..3c4e21989 100644 --- a/src/constitutive.f90 +++ b/src/constitutive.f90 @@ -60,11 +60,7 @@ module constitutive logical, dimension(:,:,:), allocatable :: & crystallite_converged !< convergence flag - type :: tOutput !< new requested output (per phase) - character(len=pStringLen), allocatable, dimension(:) :: & - label - end type tOutput - type(tOutput), allocatable, dimension(:) :: output_constituent + type :: tTensorContainer real(pReal), dimension(:,:,:), allocatable :: data @@ -201,19 +197,6 @@ module function constitutive_deltaState(S, Fi, ipc, ip, el, phase, of) result(br end function constitutive_deltaState - module function source_active(source_label,src_length) result(active_source) - character(len=*), intent(in) :: source_label - integer, intent(in) :: src_length - logical, dimension(:,:), allocatable :: active_source - end function source_active - - module function kinematics_active(kinematics_label,kinematics_length) result(active_kinematics) - character(len=*), intent(in) :: kinematics_label - integer, intent(in) :: kinematics_length - logical, dimension(:,:), allocatable :: active_kinematics - end function kinematics_active - - module subroutine source_damage_anisoBrittle_dotState(S, ipc, ip, el) integer, intent(in) :: & ipc, & !< component-ID of integration point diff --git a/src/constitutive_mech.f90 b/src/constitutive_mech.f90 index 7516e6ca5..c000e6c43 100644 --- a/src/constitutive_mech.f90 +++ b/src/constitutive_mech.f90 @@ -270,7 +270,11 @@ submodule(constitutive) constitutive_mech end interface - + type :: tOutput !< new requested output (per phase) + character(len=pStringLen), allocatable, dimension(:) :: & + label + end type tOutput + type(tOutput), allocatable, dimension(:) :: output_constituent contains