From a2ad146c3ea7f691a66b1e3ecbbcc45fc5eac190 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 26 Jan 2022 21:47:07 +0100 Subject: [PATCH 1/2] TWIP/TRIP is broken, skip testing at the moment --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 2495e15d0..5598ec489 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 2495e15d064dea61e0faf078f817e32a637d6eda +Subproject commit 5598ec4892b0921fccf63e8570f9fcd8e0365716 From c5fd467b448c09db261ef104176fe978eeafd2df Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 26 Jan 2022 07:21:56 +0100 Subject: [PATCH 2/2] power to one not needed --- src/phase_mechanical_eigen_thermalexpansion.f90 | 4 ++-- src/phase_mechanical_elastic.f90 | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/phase_mechanical_eigen_thermalexpansion.f90 b/src/phase_mechanical_eigen_thermalexpansion.f90 index 087cf7d3d..70bf84cd8 100644 --- a/src/phase_mechanical_eigen_thermalexpansion.f90 +++ b/src/phase_mechanical_eigen_thermalexpansion.f90 @@ -99,11 +99,11 @@ module subroutine thermalexpansion_LiAndItsTangent(Li, dLi_dTstar, ph,me) associate(prm => param(kinematics_thermal_expansion_instance(ph))) Li = dot_T * ( & prm%A(1:3,1:3,1) & ! constant coefficient - + prm%A(1:3,1:3,2)*(T - prm%T_ref)**1 & ! linear coefficient + + prm%A(1:3,1:3,2)*(T - prm%T_ref) & ! linear coefficient + prm%A(1:3,1:3,3)*(T - prm%T_ref)**2 & ! quadratic coefficient ) / & (1.0_pReal & - + prm%A(1:3,1:3,1)*(T - prm%T_ref)**1 / 1.0_pReal & + + prm%A(1:3,1:3,1)*(T - prm%T_ref) / 1.0_pReal & + prm%A(1:3,1:3,2)*(T - prm%T_ref)**2 / 2.0_pReal & + prm%A(1:3,1:3,3)*(T - prm%T_ref)**3 / 3.0_pReal & ) diff --git a/src/phase_mechanical_elastic.f90 b/src/phase_mechanical_elastic.f90 index bb530747b..8972367d5 100644 --- a/src/phase_mechanical_elastic.f90 +++ b/src/phase_mechanical_elastic.f90 @@ -101,32 +101,32 @@ pure module function elastic_C66(ph,en) result(C66) T = thermal_T(ph,en) C66(1,1) = prm%C_11(1) & - + prm%C_11(2)*(T - prm%T_ref)**1 & + + prm%C_11(2)*(T - prm%T_ref) & + prm%C_11(3)*(T - prm%T_ref)**2 C66(1,2) = prm%C_12(1) & - + prm%C_12(2)*(T - prm%T_ref)**1 & + + prm%C_12(2)*(T - prm%T_ref) & + prm%C_12(3)*(T - prm%T_ref)**2 C66(4,4) = prm%C_44(1) & - + prm%C_44(2)*(T - prm%T_ref)**1 & + + prm%C_44(2)*(T - prm%T_ref) & + prm%C_44(3)*(T - prm%T_ref)**2 if (any(phase_lattice(ph) == ['hP','tI'])) then C66(1,3) = prm%C_13(1) & - + prm%C_13(2)*(T - prm%T_ref)**1 & + + prm%C_13(2)*(T - prm%T_ref) & + prm%C_13(3)*(T - prm%T_ref)**2 C66(3,3) = prm%C_33(1) & - + prm%C_33(2)*(T - prm%T_ref)**1 & + + prm%C_33(2)*(T - prm%T_ref) & + prm%C_33(3)*(T - prm%T_ref)**2 end if if (phase_lattice(ph) == 'tI') then C66(6,6) = prm%C_66(1) & - + prm%C_66(2)*(T - prm%T_ref)**1 & + + prm%C_66(2)*(T - prm%T_ref) & + prm%C_66(3)*(T - prm%T_ref)**2 end if