polishing
This commit is contained in:
parent
8a0873ace7
commit
fcaa319f56
|
@ -28,8 +28,6 @@
|
||||||
#include "lattice.f90"
|
#include "lattice.f90"
|
||||||
#include "constitutive.f90"
|
#include "constitutive.f90"
|
||||||
#include "constitutive_plastic.f90"
|
#include "constitutive_plastic.f90"
|
||||||
#include "constitutive_damage.f90"
|
|
||||||
#include "constitutive_thermal.f90"
|
|
||||||
#include "constitutive_plastic_none.f90"
|
#include "constitutive_plastic_none.f90"
|
||||||
#include "constitutive_plastic_isotropic.f90"
|
#include "constitutive_plastic_isotropic.f90"
|
||||||
#include "constitutive_plastic_phenopowerlaw.f90"
|
#include "constitutive_plastic_phenopowerlaw.f90"
|
||||||
|
@ -37,15 +35,17 @@
|
||||||
#include "constitutive_plastic_dislotwin.f90"
|
#include "constitutive_plastic_dislotwin.f90"
|
||||||
#include "constitutive_plastic_disloUCLA.f90"
|
#include "constitutive_plastic_disloUCLA.f90"
|
||||||
#include "constitutive_plastic_nonlocal.f90"
|
#include "constitutive_plastic_nonlocal.f90"
|
||||||
|
#include "constitutive_thermal.f90"
|
||||||
#include "source_thermal_dissipation.f90"
|
#include "source_thermal_dissipation.f90"
|
||||||
#include "source_thermal_externalheat.f90"
|
#include "source_thermal_externalheat.f90"
|
||||||
|
#include "kinematics_thermal_expansion.f90"
|
||||||
|
#include "constitutive_damage.f90"
|
||||||
#include "source_damage_isoBrittle.f90"
|
#include "source_damage_isoBrittle.f90"
|
||||||
#include "source_damage_isoDuctile.f90"
|
#include "source_damage_isoDuctile.f90"
|
||||||
#include "source_damage_anisoBrittle.f90"
|
#include "source_damage_anisoBrittle.f90"
|
||||||
#include "source_damage_anisoDuctile.f90"
|
#include "source_damage_anisoDuctile.f90"
|
||||||
#include "kinematics_cleavage_opening.f90"
|
#include "kinematics_cleavage_opening.f90"
|
||||||
#include "kinematics_slipplane_opening.f90"
|
#include "kinematics_slipplane_opening.f90"
|
||||||
#include "kinematics_thermal_expansion.f90"
|
|
||||||
#include "crystallite.f90"
|
#include "crystallite.f90"
|
||||||
#include "thermal_isothermal.f90"
|
#include "thermal_isothermal.f90"
|
||||||
#include "thermal_adiabatic.f90"
|
#include "thermal_adiabatic.f90"
|
||||||
|
|
|
@ -368,8 +368,7 @@ subroutine constitutive_init
|
||||||
debugConstitutive%ip = debug_root%get_asInt('integrationpoint',defaultVal = 1)
|
debugConstitutive%ip = debug_root%get_asInt('integrationpoint',defaultVal = 1)
|
||||||
debugConstitutive%grain = debug_root%get_asInt('grain',defaultVal = 1)
|
debugConstitutive%grain = debug_root%get_asInt('grain',defaultVal = 1)
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
! initialized plasticity
|
|
||||||
call plastic_init
|
call plastic_init
|
||||||
call damage_init
|
call damage_init
|
||||||
call thermal_init
|
call thermal_init
|
||||||
|
@ -386,8 +385,7 @@ subroutine constitutive_init
|
||||||
sourceState(ph)%p(s)%partionedState0 = sourceState(ph)%p(s)%state0
|
sourceState(ph)%p(s)%partionedState0 = sourceState(ph)%p(s)%state0
|
||||||
sourceState(ph)%p(s)%state = sourceState(ph)%p(s)%partionedState0
|
sourceState(ph)%p(s)%state = sourceState(ph)%p(s)%partionedState0
|
||||||
end forall
|
end forall
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
! determine max size of source state
|
|
||||||
constitutive_source_maxSizeDotState = max(constitutive_source_maxSizeDotState, &
|
constitutive_source_maxSizeDotState = max(constitutive_source_maxSizeDotState, &
|
||||||
maxval(sourceState(ph)%p%sizeDotState))
|
maxval(sourceState(ph)%p%sizeDotState))
|
||||||
enddo PhaseLoop2
|
enddo PhaseLoop2
|
||||||
|
@ -404,9 +402,9 @@ function constitutive_homogenizedC(ipc,ip,el)
|
||||||
real(pReal), dimension(6,6) :: &
|
real(pReal), dimension(6,6) :: &
|
||||||
constitutive_homogenizedC
|
constitutive_homogenizedC
|
||||||
integer, intent(in) :: &
|
integer, intent(in) :: &
|
||||||
ipc, &
|
ipc, & !< component-ID of integration point
|
||||||
ip, &
|
ip, & !< integration point
|
||||||
el
|
el !< element
|
||||||
|
|
||||||
plasticityType: select case (phase_plasticity(material_phaseAt(ipc,el)))
|
plasticityType: select case (phase_plasticity(material_phaseAt(ipc,el)))
|
||||||
case (PLASTICITY_DISLOTWIN_ID) plasticityType
|
case (PLASTICITY_DISLOTWIN_ID) plasticityType
|
||||||
|
@ -628,9 +626,9 @@ function constitutive_collectDotState(S, FArray, Fi, FpArray, subdt, ipc, ip, el
|
||||||
real(pReal), dimension(3,3) :: &
|
real(pReal), dimension(3,3) :: &
|
||||||
Mp
|
Mp
|
||||||
integer :: &
|
integer :: &
|
||||||
ho, &
|
ho, & !< homogenization
|
||||||
tme, &
|
tme, & !< thermal member position
|
||||||
i, &
|
i, & !< counter in source loop
|
||||||
instance
|
instance
|
||||||
logical :: broken
|
logical :: broken
|
||||||
|
|
||||||
|
@ -685,7 +683,6 @@ function constitutive_collectDotState(S, FArray, Fi, FpArray, subdt, ipc, ip, el
|
||||||
|
|
||||||
enddo SourceLoop
|
enddo SourceLoop
|
||||||
|
|
||||||
|
|
||||||
end function constitutive_collectDotState
|
end function constitutive_collectDotState
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -175,12 +175,10 @@ contains
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief allocates arrays pointing to array of the various constitutive modules
|
!> @brief Initialize constitutive models for plasticity
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
module subroutine plastic_init
|
module subroutine plastic_init
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
! initialized plasticity
|
|
||||||
if (any(phase_plasticity == PLASTICITY_NONE_ID)) call plastic_none_init
|
if (any(phase_plasticity == PLASTICITY_NONE_ID)) call plastic_none_init
|
||||||
if (any(phase_plasticity == PLASTICITY_ISOTROPIC_ID)) call plastic_isotropic_init
|
if (any(phase_plasticity == PLASTICITY_ISOTROPIC_ID)) call plastic_isotropic_init
|
||||||
if (any(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID)) call plastic_phenopowerlaw_init
|
if (any(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID)) call plastic_phenopowerlaw_init
|
||||||
|
|
Loading…
Reference in New Issue