From ef435ee7d1b1d53a5154cb8cc3cea37e55a1a9ec Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 18 Nov 2022 07:14:05 +0100 Subject: [PATCH] commonly used variable name --- PRIVATE | 2 +- .../eigen/thermalexpansion_AISI304.yaml | 6 +++--- .../mechanical/eigen/thermalexpansion_Al.yaml | 2 +- .../mechanical/eigen/thermalexpansion_Au.yaml | 2 +- .../eigen/thermalexpansion_C35E.yaml | 6 +++--- .../mechanical/eigen/thermalexpansion_Cu.yaml | 2 +- .../mechanical/eigen/thermalexpansion_Fe.yaml | 2 +- .../eigen/thermalexpansion_Sn-beta.yaml | 12 +++++------ .../mechanical/eigen/thermalexpansion_W.yaml | 2 +- .../eigen/thermalexpansion_X20Cr13.yaml | 4 ++-- ...hase_mechanical_eigen_thermalexpansion.f90 | 20 +++++++++---------- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/PRIVATE b/PRIVATE index 7b1ad7672..81f5f24d0 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 7b1ad767256f796f56514d8888027499fe777132 +Subproject commit 81f5f24d076a623e6052c234825c591267915285 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_AISI304.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_AISI304.yaml index bc0db5c5e..d96c253b9 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_AISI304.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_AISI304.yaml @@ -6,8 +6,8 @@ references: https://doi.org/10.1016/0040-6031(93)80437-F, fit to Fig. 6 (T_min=100K, T_max=1400K) -A_11: 2.068e-08 -A_11,T: 1.579e-09 -A_11,T^2: 3.449e-13 +Alpha_11: 2.068e-08 +Alpha_11,T: 1.579e-09 +Alpha_11,T^2: 3.449e-13 T_ref: 293.15 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Al.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Al.yaml index 495680b4e..7f323f710 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Al.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Al.yaml @@ -4,4 +4,4 @@ references: - https://en.wikipedia.org/wiki/Thermal_expansion, 293.15K -A_11: 23.1e-6 +Alpha_11: 23.1e-6 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Au.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Au.yaml index a14ac6b0f..b0ff0360d 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Au.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Au.yaml @@ -4,4 +4,4 @@ references: - https://en.wikipedia.org/wiki/Thermal_expansion, 293.15K -A_11: 14.e-6 +Alpha_11: 14.e-6 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_C35E.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_C35E.yaml index 08e9d6894..98937cea8 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_C35E.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_C35E.yaml @@ -4,8 +4,8 @@ references: - https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg, fit to image description (Scilab code) -A_11: 12.70371e-6 -A_11,T: 7.54e-9 -A_11,T^2: -1.0e-11 +Alpha_11: 12.70371e-6 +Alpha_11,T: 7.54e-9 +Alpha_11,T^2: -1.0e-11 T_ref: 273.0 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Cu.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Cu.yaml index a0a35c955..74418c55c 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Cu.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Cu.yaml @@ -4,4 +4,4 @@ references: - https://en.wikipedia.org/wiki/Thermal_expansion, 293.15K -A_11: 17.e-6 +Alpha_11: 17.e-6 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Fe.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Fe.yaml index da8ead4c1..6b64ca1a2 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Fe.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Fe.yaml @@ -4,4 +4,4 @@ references: - https://en.wikipedia.org/wiki/Thermal_expansion, 293.15K -A_11: 11.8e-6 +Alpha_11: 11.8e-6 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_Sn-beta.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_Sn-beta.yaml index f77f79bba..1bbd4c012 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_Sn-beta.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_Sn-beta.yaml @@ -6,12 +6,12 @@ references: https://doi.org/10.1107/S0365110X62000742, fit to Tab. 2 (T_min=30ºC, T_max=210ºC) -A_11: 1.639e-05 -A_11,T: 1.799e-08 -A_11,T^2: 1.734e-10 +Alpha_11: 1.639e-05 +Alpha_11,T: 1.799e-08 +Alpha_11,T^2: 1.734e-10 -A_33: 3.263e-05 -A_33,T: 1.387e-08 -A_33,T^2: 5.794e-10 +Alpha_33: 3.263e-05 +Alpha_33,T: 1.387e-08 +Alpha_33,T^2: 5.794e-10 T_ref: 293.15 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_W.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_W.yaml index cb29ab270..ca4d2566b 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_W.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_W.yaml @@ -4,4 +4,4 @@ references: - https://en.wikipedia.org/wiki/Thermal_expansion, 293.15K -A_11: 4.5e-6 +Alpha_11: 4.5e-6 diff --git a/examples/config/phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml b/examples/config/phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml index 1b8f1545b..d4b5d1df9 100644 --- a/examples/config/phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml +++ b/examples/config/phase/mechanical/eigen/thermalexpansion_X20Cr13.yaml @@ -4,7 +4,7 @@ references: - https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg, fit to image description (Scilab code) -A_11: 11.365e-6 -A_11,T: 5.0e-9 +Alpha_11: 11.365e-6 +Alpha_11,T: 5.0e-9 T_ref: 273.0 diff --git a/src/phase_mechanical_eigen_thermalexpansion.f90 b/src/phase_mechanical_eigen_thermalexpansion.f90 index 7713650ea..ddd495687 100644 --- a/src/phase_mechanical_eigen_thermalexpansion.f90 +++ b/src/phase_mechanical_eigen_thermalexpansion.f90 @@ -9,8 +9,8 @@ submodule(phase:eigen) thermalexpansion type :: tParameters type(tPolynomial) :: & - A_11, & - A_33 + Alpha_11, & + Alpha_33 end type tParameters type(tParameters), dimension(:), allocatable :: param @@ -57,9 +57,9 @@ module function thermalexpansion_init(kinematics_length) result(myKinematics) if (myKinematics(k,p)) then 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'])) & - 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 if 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) real(pReal) :: T, dot_T - real(pReal), dimension(3,3) :: A + real(pReal), dimension(3,3) :: Alpha 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))) - A = 0.0_pReal - A(1,1) = prm%A_11%at(T) - if (any(phase_lattice(ph) == ['hP','tI'])) A(3,3) = prm%A_33%at(T) - A = lattice_symmetrize_33(A,phase_lattice(ph)) - Li = dot_T * A + Alpha = 0.0_pReal + Alpha(1,1) = prm%Alpha_11%at(T) + if (any(phase_lattice(ph) == ['hP','tI'])) Alpha(3,3) = prm%Alpha_33%at(T) + Alpha = lattice_symmetrize_33(Alpha,phase_lattice(ph)) + Li = dot_T * Alpha end associate dLi_dTstar = 0.0_pReal