diff --git a/src/Marc/DAMASK_Marc.f90 b/src/Marc/DAMASK_Marc.f90 index b1d9d91ba..69ee7091c 100644 --- a/src/Marc/DAMASK_Marc.f90 +++ b/src/Marc/DAMASK_Marc.f90 @@ -173,7 +173,6 @@ end module DAMASK_interface #include "../phase_mechanical_plastic_dislotungsten.f90" #include "../phase_mechanical_plastic_nonlocal.f90" #include "../phase_mechanical_eigen.f90" -#include "../phase_mechanical_eigen_cleavageopening.f90" #include "../phase_mechanical_eigen_thermalexpansion.f90" #include "../phase_thermal.f90" #include "../phase_thermal_source_dissipation.f90" diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index 729309b82..f3afaec99 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -18,14 +18,14 @@ submodule(phase) damage integer :: phase_damage_maxSizeDotState - type :: tDataContainer + type :: tFieldQuantities real(pREAL), dimension(:), allocatable :: phi - end type tDataContainer + end type tFieldQuantities integer(kind(DAMAGE_UNDEFINED_ID)), dimension(:), allocatable :: & phase_damage !< active sources mechanisms of each phase - type(tDataContainer), dimension(:), allocatable :: current + type(tFieldQuantities), dimension(:), allocatable :: current type(tDamageParameters), dimension(:), allocatable :: param diff --git a/src/phase_mechanical_eigen.f90 b/src/phase_mechanical_eigen.f90 index ec1bcfbbc..7b965bf23 100644 --- a/src/phase_mechanical_eigen.f90 +++ b/src/phase_mechanical_eigen.f90 @@ -68,7 +68,7 @@ module subroutine eigen_init(phases) allocate(model_damage(phases%length), source = EIGEN_UNDEFINED_ID) - where(damage_anisobrittle_init()) model_damage = EIGEN_cleavage_opening_ID + where(kinematics_active2('anisobrittle')) model_damage = EIGEN_cleavage_opening_ID end subroutine eigen_init @@ -191,13 +191,13 @@ module subroutine phase_LiAndItsTangents(Li, dLi_dS, dLi_dFi, & end select kinematicsType end do KinematicsLoop - select case (model_damage(ph)) + damageType: select case (model_damage(ph)) case (EIGEN_cleavage_opening_ID) call damage_anisobrittle_LiAndItsTangent(my_Li, my_dLi_dS, S, ph, en) Li = Li + my_Li dLi_dS = dLi_dS + my_dLi_dS active = .true. - end select + end select damageType if (.not. active) return diff --git a/src/phase_mechanical_eigen_cleavageopening.f90 b/src/phase_mechanical_eigen_cleavageopening.f90 deleted file mode 100644 index 780ed22b2..000000000 --- a/src/phase_mechanical_eigen_cleavageopening.f90 +++ /dev/null @@ -1,30 +0,0 @@ -!-------------------------------------------------------------------------------------------------- -!> @author Luv Sharma, Max-Planck-Institut für Eisenforschung GmbH -!> @author Pratheek Shanthraj, Max-Planck-Institut für Eisenforschung GmbH -!> @brief material subroutine incorporating kinematics resulting from opening of cleavage planes -!> @details to be done -!-------------------------------------------------------------------------------------------------- -submodule(phase:eigen) cleavageopening - -contains - - -!-------------------------------------------------------------------------------------------------- -!> @brief module initialization -!> @details reads in material parameters, allocates arrays, and does sanity checks -!-------------------------------------------------------------------------------------------------- -module function damage_anisobrittle_init() result(myKinematics) - - logical, dimension(:), allocatable :: myKinematics - - - myKinematics = kinematics_active2('anisobrittle') - if (count(myKinematics) == 0) return - - print'(/,1x,a)', '<<<+- phase:mechanical:eigen:cleavageopening init -+>>>' - print'(/,a,i2)', ' # phases: ',count(myKinematics); flush(IO_STDOUT) - -end function damage_anisobrittle_init - - -end submodule cleavageopening