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

tangent is not included anymore

This commit is contained in:
Martin Diehl 2021-01-11 16:13:59 +01:00
parent 209d59534a
commit b5bfb1dba9
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DAMASK_marc.f90
View File

@ -365,7 +365,7 @@ subroutine flux(f,ts,n,time)
f
f(2) = 0.0_pReal
call thermal_conduction_getSourceAndItsTangent(f(1), ts(3), n(3),mesh_FEM2DAMASK_elem(n(1)))
call thermal_conduction_getSource(f(1), ts(3), n(3),mesh_FEM2DAMASK_elem(n(1)))
end subroutine flux

6
src/constitutive.f90
View File

@ -283,7 +283,7 @@ module constitutive
dPhiDot_dPhi
end subroutine constitutive_damage_getRateAndItsTangents
module subroutine constitutive_thermal_getRateAndItsTangents(TDot, T,ip,el)
module subroutine constitutive_thermal_getRate(TDot, T,ip,el)
integer, intent(in) :: &
ip, & !< integration point number
el !< element number
@ -291,7 +291,7 @@ module constitutive
T
real(pReal), intent(out) :: &
TDot
end subroutine constitutive_thermal_getRateAndItsTangents
end subroutine constitutive_thermal_getRate
@ -384,7 +384,7 @@ module constitutive
constitutive_init, &
constitutive_homogenizedC, &
constitutive_damage_getRateAndItsTangents, &
constitutive_thermal_getRateAndItsTangents, &
constitutive_thermal_getRate, &
constitutive_results, &
constitutive_allocateState, &
constitutive_forward, &

16
src/constitutive_thermal.f90
View File

@ -36,7 +36,7 @@ submodule(constitutive) constitutive_thermal
end function kinematics_thermal_expansion_init
module subroutine source_thermal_dissipation_getRateAndItsTangent(TDot, Tstar,Lp,phase)
module subroutine thermal_dissipation_getRate(TDot, Tstar,Lp,phase)
integer, intent(in) :: &
phase !< phase ID of element
real(pReal), intent(in), dimension(3,3) :: &
@ -45,15 +45,15 @@ submodule(constitutive) constitutive_thermal
Lp !< plastic velocuty gradient for a given element
real(pReal), intent(out) :: &
TDot
end subroutine source_thermal_dissipation_getRateAndItsTangent
end subroutine thermal_dissipation_getRate
module subroutine source_thermal_externalheat_getRateAndItsTangent(TDot, phase,of)
module subroutine thermal_externalheat_getRate(TDot, phase,of)
integer, intent(in) :: &
phase, &
of
real(pReal), intent(out) :: &
TDot
end subroutine source_thermal_externalheat_getRateAndItsTangent
end subroutine thermal_externalheat_getRate
end interface
@ -127,7 +127,7 @@ end subroutine thermal_init
!----------------------------------------------------------------------------------------------
!< @brief calculates thermal dissipation rate
!----------------------------------------------------------------------------------------------
module subroutine constitutive_thermal_getRateAndItsTangents(TDot, T, ip, el)
module subroutine constitutive_thermal_getRate(TDot, T, ip, el)
integer, intent(in) :: &
ip, & !< integration point number
@ -157,10 +157,10 @@ module subroutine constitutive_thermal_getRateAndItsTangents(TDot, T, ip, el)
do so = 1, thermal_Nsources(ph)
select case(thermal_source(so,ph))
case (THERMAL_DISSIPATION_ID)
call source_thermal_dissipation_getRateAndItsTangent(my_Tdot, mech_S(ph,me),mech_L_p(ph,me),ph)
call thermal_dissipation_getRate(my_Tdot, mech_S(ph,me),mech_L_p(ph,me),ph)
case (THERMAL_EXTERNALHEAT_ID)
call source_thermal_externalheat_getRateAndItsTangent(my_Tdot, ph,me)
call thermal_externalheat_getRate(my_Tdot, ph,me)
case default
my_Tdot = 0.0_pReal
@ -169,7 +169,7 @@ module subroutine constitutive_thermal_getRateAndItsTangents(TDot, T, ip, el)
enddo
enddo
end subroutine constitutive_thermal_getRateAndItsTangents
end subroutine constitutive_thermal_getRate
!--------------------------------------------------------------------------------------------------

4
src/constitutive_thermal_dissipation.f90
View File

@ -78,7 +78,7 @@ end function source_thermal_dissipation_init
!--------------------------------------------------------------------------------------------------
!> @brief Ninstancess dissipation rate
!--------------------------------------------------------------------------------------------------
module subroutine source_thermal_dissipation_getRateAndItsTangent(TDot, Tstar, Lp, phase)
module subroutine thermal_dissipation_getRate(TDot, Tstar, Lp, phase)
integer, intent(in) :: &
phase
@ -94,6 +94,6 @@ module subroutine source_thermal_dissipation_getRateAndItsTangent(TDot, Tstar, L
TDot = prm%kappa*sum(abs(Tstar*Lp))
end associate
end subroutine source_thermal_dissipation_getRateAndItsTangent
end subroutine thermal_dissipation_getRate
end submodule source_dissipation

4
src/constitutive_thermal_externalheat.f90
View File

@ -104,7 +104,7 @@ end subroutine source_thermal_externalheat_dotState
!--------------------------------------------------------------------------------------------------
!> @brief returns local heat generation rate
!--------------------------------------------------------------------------------------------------
module subroutine source_thermal_externalheat_getRateAndItsTangent(TDot, phase, of)
module subroutine thermal_externalheat_getRate(TDot, phase, of)
integer, intent(in) :: &
phase, &
@ -132,6 +132,6 @@ module subroutine source_thermal_externalheat_getRateAndItsTangent(TDot, phase,
enddo
end associate
end subroutine source_thermal_externalheat_getRateAndItsTangent
end subroutine thermal_externalheat_getRate
end submodule source_externalheat

2
src/grid/grid_thermal_spectral.f90
View File

@ -278,7 +278,7 @@ subroutine formResidual(in,x_scal,f_scal,dummy,ierr)
cell = 0
do k = 1, grid3; do j = 1, grid(2); do i = 1,grid(1)
cell = cell + 1
call thermal_conduction_getSourceAndItsTangent(Tdot, T_current(i,j,k), 1, cell)
call thermal_conduction_getSource(Tdot, T_current(i,j,k), 1, cell)
scalarField_real(i,j,k) = params%timeinc*(scalarField_real(i,j,k) + Tdot) &
+ thermal_conduction_getMassDensity (1,cell)* &
thermal_conduction_getSpecificHeat(1,cell)*(T_lastInc(i,j,k) - &

8
src/thermal_conduction.f90
View File

@ -25,7 +25,7 @@ module thermal_conduction
public :: &
thermal_conduction_init, &
thermal_conduction_getSourceAndItsTangent, &
thermal_conduction_getSource, &
thermal_conduction_getConductivity, &
thermal_conduction_getSpecificHeat, &
thermal_conduction_getMassDensity, &
@ -91,7 +91,7 @@ end subroutine thermal_conduction_init
!--------------------------------------------------------------------------------------------------
!> @brief return heat generation rate
!--------------------------------------------------------------------------------------------------
subroutine thermal_conduction_getSourceAndItsTangent(Tdot, T,ip,el)
subroutine thermal_conduction_getSource(Tdot, T,ip,el)
integer, intent(in) :: &
ip, & !< integration point number
@ -105,11 +105,11 @@ subroutine thermal_conduction_getSourceAndItsTangent(Tdot, T,ip,el)
homog
homog = material_homogenizationAt(el)
call constitutive_thermal_getRateAndItsTangents(TDot, T,ip,el)
call constitutive_thermal_getRate(TDot, T,ip,el)
Tdot = Tdot/real(homogenization_Nconstituents(homog),pReal)
end subroutine thermal_conduction_getSourceAndItsTangent
end subroutine thermal_conduction_getSource
!--------------------------------------------------------------------------------------------------