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

consistent names

This commit is contained in:
Martin Diehl 2020-12-28 09:18:20 +01:00
parent 830e2a3a99
commit e6f27e91b1
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/homogenization.f90
View File

@ -161,7 +161,7 @@ subroutine materialpoint_stressAndItsTangent(dt,FEsolving_execIP,FEsolving_execE
doneAndHappy doneAndHappy
!$OMP PARALLEL DO PRIVATE(ce,ho,myNgrains,NiterationMPstate,subFrac,converged,subStep,doneAndHappy) !$OMP PARALLEL DO PRIVATE(ce,ho,myNgrains,NiterationMPstate,subFrac,converged,subStep,doneAndHappy)
do el = FEsolving_execElem(1),FEsolving_execElem(2) do el = FEsolving_execElem(1),FEsolving_execElem(2)
ho = material_homogenizationAt(el) ho = material_homogenizationAt(el)
me = material_homogenizationMemberAt(ip,el) me = material_homogenizationMemberAt(ip,el)
@ -321,29 +321,30 @@ subroutine homogenization_results
use material, only: & use material, only: &
material_homogenization_type => homogenization_type material_homogenization_type => homogenization_type
integer :: p integer :: ph
character(len=:), allocatable :: group_base,group character(len=:), allocatable :: group_base,group
call results_closeGroup(results_addGroup('current/homogenization/')) call results_closeGroup(results_addGroup('current/homogenization/'))
do p=1,size(material_name_homogenization) do ph=1,size(material_name_homogenization)
group_base = 'current/homogenization/'//trim(material_name_homogenization(p)) group_base = 'current/homogenization/'//trim(material_name_homogenization(ph))
call results_closeGroup(results_addGroup(group_base)) call results_closeGroup(results_addGroup(group_base))
call mech_results(group_base,p) call mech_results(group_base,ph)
group = trim(group_base)//'/damage' group = trim(group_base)//'/damage'
call results_closeGroup(results_addGroup(group)) call results_closeGroup(results_addGroup(group))
select case(damage_type(p)) select case(damage_type(ph))
case(DAMAGE_NONLOCAL_ID) case(DAMAGE_NONLOCAL_ID)
call damage_nonlocal_results(p,group) call damage_nonlocal_results(ph,group)
end select end select
group = trim(group_base)//'/thermal' group = trim(group_base)//'/thermal'
call results_closeGroup(results_addGroup(group)) call results_closeGroup(results_addGroup(group))
select case(thermal_type(p)) select case(thermal_type(ph))
case(THERMAL_CONDUCTION_ID) case(THERMAL_CONDUCTION_ID)
call thermal_conduction_results(p,group) call thermal_conduction_results(ph,group)
end select end select
enddo enddo
@ -359,6 +360,7 @@ subroutine homogenization_forward
integer :: ho integer :: ho
do ho = 1, size(material_name_homogenization) do ho = 1, size(material_name_homogenization)
homogState (ho)%state0 = homogState (ho)%state homogState (ho)%state0 = homogState (ho)%state
damageState(ho)%state0 = damageState(ho)%state damageState(ho)%state0 = damageState(ho)%state