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

standardized names

This commit is contained in:
Martin Diehl 2021-04-07 07:26:54 +02:00
parent 5a361c12f8
commit cb6b7a5fb9
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/homogenization.f90
View File

@ -117,6 +117,16 @@ module homogenization
integer, intent(in) :: ho integer, intent(in) :: ho
end subroutine mechanical_results end subroutine mechanical_results
module subroutine damage_results(ho,group)
integer, intent(in) :: ho
character(len=*), intent(in) :: group
end subroutine damage_results
module subroutine thermal_results(ho,group)
integer, intent(in) :: ho
character(len=*), intent(in) :: group
end subroutine thermal_results
module function mechanical_updateState(subdt,subF,ce) result(doneAndHappy) module function mechanical_updateState(subdt,subF,ce) result(doneAndHappy)
real(pReal), intent(in) :: & real(pReal), intent(in) :: &
subdt !< current time step subdt !< current time step
@ -148,11 +158,6 @@ module homogenization
real(pReal), intent(in) :: T, dot_T real(pReal), intent(in) :: T, dot_T
end subroutine homogenization_thermal_setField end subroutine homogenization_thermal_setField
module subroutine thermal_conduction_results(ho,group)
integer, intent(in) :: ho
character(len=*), intent(in) :: group
end subroutine thermal_conduction_results
module function homogenization_thermal_T(ce) result(T) module function homogenization_thermal_T(ce) result(T)
integer, intent(in) :: ce integer, intent(in) :: ce
real(pReal) :: T real(pReal) :: T
@ -184,11 +189,6 @@ module homogenization
phi phi
end subroutine damage_nonlocal_putNonLocalDamage end subroutine damage_nonlocal_putNonLocalDamage
module subroutine damage_nonlocal_results(ho,group)
integer, intent(in) :: ho
character(len=*), intent(in) :: group
end subroutine damage_nonlocal_results
end interface end interface
public :: & public :: &
@ -371,14 +371,14 @@ subroutine homogenization_results
case(DAMAGE_NONLOCAL_ID) case(DAMAGE_NONLOCAL_ID)
group = trim(group_base)//'/damage' group = trim(group_base)//'/damage'
call results_closeGroup(results_addGroup(group)) call results_closeGroup(results_addGroup(group))
call damage_nonlocal_results(ho,group) call damage_results(ho,group)
end select end select
select case(thermal_type(ho)) select case(thermal_type(ho))
case(THERMAL_CONDUCTION_ID) case(THERMAL_CONDUCTION_ID)
group = trim(group_base)//'/thermal' group = trim(group_base)//'/thermal'
call results_closeGroup(results_addGroup(group)) call results_closeGroup(results_addGroup(group))
call thermal_conduction_results(ho,group) call thermal_results(ho,group)
end select end select
enddo enddo

4
src/homogenization_damage.f90
View File

@ -153,7 +153,7 @@ end subroutine damage_nonlocal_putNonLocalDamage
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief writes results to HDF5 output file !> @brief writes results to HDF5 output file
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module subroutine damage_nonlocal_results(ho,group) module subroutine damage_results(ho,group)
integer, intent(in) :: ho integer, intent(in) :: ho
character(len=*), intent(in) :: group character(len=*), intent(in) :: group
@ -170,6 +170,6 @@ module subroutine damage_nonlocal_results(ho,group)
enddo outputsLoop enddo outputsLoop
end associate end associate
end subroutine damage_nonlocal_results end subroutine damage_results
end submodule damage end submodule damage

4
src/homogenization_thermal.f90
View File

@ -193,7 +193,7 @@ end subroutine homogenization_thermal_setField
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief writes results to HDF5 output file !> @brief writes results to HDF5 output file
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module subroutine thermal_conduction_results(ho,group) module subroutine thermal_results(ho,group)
integer, intent(in) :: ho integer, intent(in) :: ho
character(len=*), intent(in) :: group character(len=*), intent(in) :: group
@ -209,7 +209,7 @@ module subroutine thermal_conduction_results(ho,group)
enddo outputsLoop enddo outputsLoop
end associate end associate
end subroutine thermal_conduction_results end subroutine thermal_results
module function homogenization_thermal_T(ce) result(T) module function homogenization_thermal_T(ce) result(T)