From f525999f521300ff1410ae3775a7b1d20409ad06 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 24 May 2021 17:39:09 +0200 Subject: [PATCH] updated tests --- PRIVATE | 2 +- src/lattice.f90 | 32 +++++++++----------------------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/PRIVATE b/PRIVATE index 14e754308..51fd42213 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 14e754308e81545a231220f9d993fb4571729ced +Subproject commit 51fd422131bbef9ea37a8e63429d907473b778cd diff --git a/src/lattice.f90 b/src/lattice.f90 index 88f18ac2e..a285d4ffb 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -462,10 +462,8 @@ subroutine lattice_init lattice_C66(4,4,ph) = elasticity%get_asFloat('C_44') lattice_C66(1,3,ph) = elasticity%get_asFloat('C_13',defaultVal=0.0_pReal) - lattice_C66(2,2,ph) = elasticity%get_asFloat('C_22',defaultVal=0.0_pReal) lattice_C66(2,3,ph) = elasticity%get_asFloat('C_23',defaultVal=0.0_pReal) lattice_C66(3,3,ph) = elasticity%get_asFloat('C_33',defaultVal=0.0_pReal) - lattice_C66(5,5,ph) = elasticity%get_asFloat('C_55',defaultVal=0.0_pReal) lattice_C66(6,6,ph) = elasticity%get_asFloat('C_66',defaultVal=0.0_pReal) select case(phase%get_asString('lattice')) @@ -1715,34 +1713,22 @@ function applyLatticeSymmetryC66(C66,structure) result(C66_sym) select case(structure) case ('cF','cI') - C66_sym(1,1) = C66(1,1) - C66_sym(2,2) = C66(1,1) - C66_sym(3,3) = C66(1,1) - C66_sym(1,2) = C66(1,2) - C66_sym(1,3) = C66(1,2) - C66_sym(2,3) = C66(1,2) - C66_sym(4,4) = C66(4,4) ! isotropic C_44 = (C_11-C_12)/2 - C66_sym(5,5) = C66(4,4) - C66_sym(6,6) = C66(4,4) + C66_sym(1,1) = C66(1,1); C66_sym(2,2) = C66(1,1); C66_sym(3,3) = C66(1,1) + C66_sym(1,2) = C66(1,2); C66_sym(1,3) = C66(1,2); C66_sym(2,3) = C66(1,2) + C66_sym(4,4) = C66(4,4); C66_sym(5,5) = C66(4,4); C66_sym(6,6) = C66(4,4) ! isotropic C_44 = (C_11-C_12)/2 case ('hP') - C66_sym(1,1) = C66(1,1) - C66_sym(2,2) = C66(1,1) + C66_sym(1,1) = C66(1,1); C66_sym(2,2) = C66(1,1) C66_sym(3,3) = C66(3,3) C66_sym(1,2) = C66(1,2) - C66_sym(1,3) = C66(1,3) - C66_sym(2,3) = C66(1,3) - C66_sym(4,4) = C66(4,4) - C66_sym(5,5) = C66(4,4) + C66_sym(1,3) = C66(1,3); C66_sym(2,3) = C66(1,3) + C66_sym(4,4) = C66(4,4); C66_sym(5,5) = C66(4,4) C66_sym(6,6) = 0.5_pReal*(C66(1,1)-C66(1,2)) case ('tI') - C66_sym(1,1) = C66(1,1) - C66_sym(2,2) = C66(1,1) + C66_sym(1,1) = C66(1,1); C66_sym(2,2) = C66(1,1) C66_sym(3,3) = C66(3,3) C66_sym(1,2) = C66(1,2) - C66_sym(1,3) = C66(1,3) - C66_sym(2,3) = C66(1,3) - C66_sym(4,4) = C66(4,4) - C66_sym(5,5) = C66(4,4) + C66_sym(1,3) = C66(1,3); C66_sym(2,3) = C66(1,3) + C66_sym(4,4) = C66(4,4); C66_sym(5,5) = C66(4,4) C66_sym(6,6) = C66(6,6) case default call IO_error(137,ext_msg='applyLatticeSymmetryC66: '//trim(structure))