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

improved comments and naming

This commit is contained in:
Martin Diehl 2023-07-24 18:30:02 +02:00
parent d953e6bedf
commit 039d5e0fce
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/phase.f90
View File

@ -68,9 +68,10 @@ module phase
integer(kind(UNDEFINED)), dimension(:), allocatable :: & integer(kind(UNDEFINED)), dimension(:), allocatable :: &
mechanical_plasticity_type, & !< plasticity of each phase mechanical_plasticity_type, & !< plasticity of each phase
damage_type !< active sources mechanisms of each phase damage_type !< damage type of each phase
integer(kind(UNDEFINED)), dimension(:,:), allocatable :: & integer(kind(UNDEFINED)), dimension(:,:), allocatable :: &
thermal_source_type thermal_source_type, &
mechanical_eigen_kinematics_type
character(len=2), allocatable, dimension(:) :: phase_lattice character(len=2), allocatable, dimension(:) :: phase_lattice
real(pREAL), allocatable, dimension(:) :: phase_cOverA real(pREAL), allocatable, dimension(:) :: phase_cOverA

3
src/phase_damage.f90
View File

@ -195,13 +195,14 @@ module function phase_f_phi(phi,co,ce) result(f)
ph, & ph, &
en en
ph = material_ID_phase(co,ce) ph = material_ID_phase(co,ce)
en = material_entry_phase(co,ce) en = material_entry_phase(co,ce)
select case(damage_type(ph)) select case(damage_type(ph))
case(DAMAGE_ISOBRITTLE,DAMAGE_ANISOBRITTLE) case(DAMAGE_ISOBRITTLE,DAMAGE_ANISOBRITTLE)
f = 1.0_pREAL & f = 1.0_pREAL &
- 2.0_pREAL * phi*damageState(ph)%state(1,en) - 2.0_pREAL * phi*damageState(ph)%state(1,en) ! ToDo: MD: seems to be phi**2
case default case default
f = 0.0_pREAL f = 0.0_pREAL
end select end select

9
src/phase_mechanical_eigen.f90
View File

@ -3,9 +3,6 @@ submodule(phase:mechanical) eigen
integer, dimension(:), allocatable :: & integer, dimension(:), allocatable :: &
Nmodels Nmodels
integer(kind(UNDEFINED)), dimension(:,:), allocatable :: &
model
interface interface
module function thermalexpansion_init(kinematics_length) result(myKinematics) module function thermalexpansion_init(kinematics_length) result(myKinematics)
@ -55,10 +52,10 @@ module subroutine eigen_init(phases)
Nmodels(ph) = kinematics%length Nmodels(ph) = kinematics%length
end do end do
allocate(model(maxval(Nmodels),phases%length), source = UNDEFINED) allocate(mechanical_eigen_kinematics_type(maxval(Nmodels),phases%length), source = UNDEFINED)
if (maxval(Nmodels) /= 0) then if (maxval(Nmodels) /= 0) then
where(thermalexpansion_init(maxval(Nmodels))) model = MECHANICAL_EIGEN_THERMALEXPANSION where(thermalexpansion_init(maxval(Nmodels))) mechanical_eigen_kinematics_type = MECHANICAL_EIGEN_THERMALEXPANSION
end if end if
end subroutine eigen_init end subroutine eigen_init
@ -164,7 +161,7 @@ module subroutine phase_LiAndItsTangents(Li, dLi_dS, dLi_dFi, &
KinematicsLoop: do k = 1, Nmodels(ph) KinematicsLoop: do k = 1, Nmodels(ph)
kinematicsType: select case (model(k,ph)) kinematicsType: select case (mechanical_eigen_kinematics_type(k,ph))
case (MECHANICAL_EIGEN_THERMALEXPANSION) kinematicsType case (MECHANICAL_EIGEN_THERMALEXPANSION) kinematicsType
call thermalexpansion_LiAndItsTangent(my_Li, my_dLi_dS, ph,en) call thermalexpansion_LiAndItsTangent(my_Li, my_dLi_dS, ph,en)
Li = Li + my_Li Li = Li + my_Li