Merge branch '205-name-for-coefficient-of-thermal-expansion' into 'development'
commonly used variable name Closes #205 See merge request damask/DAMASK!660
This commit is contained in:
commit
762a5de6c9
2
PRIVATE
2
PRIVATE
|
@ -1 +1 @@
|
||||||
Subproject commit 7b1ad767256f796f56514d8888027499fe777132
|
Subproject commit 81f5f24d076a623e6052c234825c591267915285
|
|
@ -6,8 +6,8 @@ references:
|
||||||
https://doi.org/10.1016/0040-6031(93)80437-F,
|
https://doi.org/10.1016/0040-6031(93)80437-F,
|
||||||
fit to Fig. 6 (T_min=100K, T_max=1400K)
|
fit to Fig. 6 (T_min=100K, T_max=1400K)
|
||||||
|
|
||||||
A_11: 2.068e-08
|
Alpha_11: 2.068e-08
|
||||||
A_11,T: 1.579e-09
|
Alpha_11,T: 1.579e-09
|
||||||
A_11,T^2: 3.449e-13
|
Alpha_11,T^2: 3.449e-13
|
||||||
|
|
||||||
T_ref: 293.15
|
T_ref: 293.15
|
||||||
|
|
|
@ -4,4 +4,4 @@ references:
|
||||||
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
||||||
293.15K
|
293.15K
|
||||||
|
|
||||||
A_11: 23.1e-6
|
Alpha_11: 23.1e-6
|
||||||
|
|
|
@ -4,4 +4,4 @@ references:
|
||||||
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
||||||
293.15K
|
293.15K
|
||||||
|
|
||||||
A_11: 14.e-6
|
Alpha_11: 14.e-6
|
||||||
|
|
|
@ -4,8 +4,8 @@ references:
|
||||||
- https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg,
|
- https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg,
|
||||||
fit to image description (Scilab code)
|
fit to image description (Scilab code)
|
||||||
|
|
||||||
A_11: 12.70371e-6
|
Alpha_11: 12.70371e-6
|
||||||
A_11,T: 7.54e-9
|
Alpha_11,T: 7.54e-9
|
||||||
A_11,T^2: -1.0e-11
|
Alpha_11,T^2: -1.0e-11
|
||||||
|
|
||||||
T_ref: 273.0
|
T_ref: 273.0
|
||||||
|
|
|
@ -4,4 +4,4 @@ references:
|
||||||
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
||||||
293.15K
|
293.15K
|
||||||
|
|
||||||
A_11: 17.e-6
|
Alpha_11: 17.e-6
|
||||||
|
|
|
@ -4,4 +4,4 @@ references:
|
||||||
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
||||||
293.15K
|
293.15K
|
||||||
|
|
||||||
A_11: 11.8e-6
|
Alpha_11: 11.8e-6
|
||||||
|
|
|
@ -6,12 +6,12 @@ references:
|
||||||
https://doi.org/10.1107/S0365110X62000742,
|
https://doi.org/10.1107/S0365110X62000742,
|
||||||
fit to Tab. 2 (T_min=30ºC, T_max=210ºC)
|
fit to Tab. 2 (T_min=30ºC, T_max=210ºC)
|
||||||
|
|
||||||
A_11: 1.639e-05
|
Alpha_11: 1.639e-05
|
||||||
A_11,T: 1.799e-08
|
Alpha_11,T: 1.799e-08
|
||||||
A_11,T^2: 1.734e-10
|
Alpha_11,T^2: 1.734e-10
|
||||||
|
|
||||||
A_33: 3.263e-05
|
Alpha_33: 3.263e-05
|
||||||
A_33,T: 1.387e-08
|
Alpha_33,T: 1.387e-08
|
||||||
A_33,T^2: 5.794e-10
|
Alpha_33,T^2: 5.794e-10
|
||||||
|
|
||||||
T_ref: 293.15
|
T_ref: 293.15
|
||||||
|
|
|
@ -4,4 +4,4 @@ references:
|
||||||
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
- https://en.wikipedia.org/wiki/Thermal_expansion,
|
||||||
293.15K
|
293.15K
|
||||||
|
|
||||||
A_11: 4.5e-6
|
Alpha_11: 4.5e-6
|
||||||
|
|
|
@ -4,7 +4,7 @@ references:
|
||||||
- https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg,
|
- https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg,
|
||||||
fit to image description (Scilab code)
|
fit to image description (Scilab code)
|
||||||
|
|
||||||
A_11: 11.365e-6
|
Alpha_11: 11.365e-6
|
||||||
A_11,T: 5.0e-9
|
Alpha_11,T: 5.0e-9
|
||||||
|
|
||||||
T_ref: 273.0
|
T_ref: 273.0
|
||||||
|
|
|
@ -9,8 +9,8 @@ submodule(phase:eigen) thermalexpansion
|
||||||
|
|
||||||
type :: tParameters
|
type :: tParameters
|
||||||
type(tPolynomial) :: &
|
type(tPolynomial) :: &
|
||||||
A_11, &
|
Alpha_11, &
|
||||||
A_33
|
Alpha_33
|
||||||
end type tParameters
|
end type tParameters
|
||||||
|
|
||||||
type(tParameters), dimension(:), allocatable :: param
|
type(tParameters), dimension(:), allocatable :: param
|
||||||
|
@ -57,9 +57,9 @@ module function thermalexpansion_init(kinematics_length) result(myKinematics)
|
||||||
if (myKinematics(k,p)) then
|
if (myKinematics(k,p)) then
|
||||||
associate(prm => param(kinematics_thermal_expansion_instance(p)))
|
associate(prm => param(kinematics_thermal_expansion_instance(p)))
|
||||||
|
|
||||||
prm%A_11 = polynomial(kinematics%get_dict(k),'A_11','T')
|
prm%Alpha_11 = polynomial(kinematics%get_dict(k),'Alpha_11','T')
|
||||||
if (any(phase_lattice(p) == ['hP','tI'])) &
|
if (any(phase_lattice(p) == ['hP','tI'])) &
|
||||||
prm%A_33 = polynomial(kinematics%get_dict(k),'A_33','T')
|
prm%Alpha_33 = polynomial(kinematics%get_dict(k),'Alpha_33','T')
|
||||||
end associate
|
end associate
|
||||||
end if
|
end if
|
||||||
end do
|
end do
|
||||||
|
@ -80,7 +80,7 @@ module subroutine thermalexpansion_LiAndItsTangent(Li, dLi_dTstar, ph,me)
|
||||||
dLi_dTstar !< derivative of Li with respect to Tstar (4th-order tensor defined to be zero)
|
dLi_dTstar !< derivative of Li with respect to Tstar (4th-order tensor defined to be zero)
|
||||||
|
|
||||||
real(pReal) :: T, dot_T
|
real(pReal) :: T, dot_T
|
||||||
real(pReal), dimension(3,3) :: A
|
real(pReal), dimension(3,3) :: Alpha
|
||||||
|
|
||||||
|
|
||||||
T = thermal_T(ph,me)
|
T = thermal_T(ph,me)
|
||||||
|
@ -88,11 +88,11 @@ module subroutine thermalexpansion_LiAndItsTangent(Li, dLi_dTstar, ph,me)
|
||||||
|
|
||||||
associate(prm => param(kinematics_thermal_expansion_instance(ph)))
|
associate(prm => param(kinematics_thermal_expansion_instance(ph)))
|
||||||
|
|
||||||
A = 0.0_pReal
|
Alpha = 0.0_pReal
|
||||||
A(1,1) = prm%A_11%at(T)
|
Alpha(1,1) = prm%Alpha_11%at(T)
|
||||||
if (any(phase_lattice(ph) == ['hP','tI'])) A(3,3) = prm%A_33%at(T)
|
if (any(phase_lattice(ph) == ['hP','tI'])) Alpha(3,3) = prm%Alpha_33%at(T)
|
||||||
A = lattice_symmetrize_33(A,phase_lattice(ph))
|
Alpha = lattice_symmetrize_33(Alpha,phase_lattice(ph))
|
||||||
Li = dot_T * A
|
Li = dot_T * Alpha
|
||||||
|
|
||||||
end associate
|
end associate
|
||||||
dLi_dTstar = 0.0_pReal
|
dLi_dTstar = 0.0_pReal
|
||||||
|
|
Loading…
Reference in New Issue