Skip to content

Commit 4f5a72e

Browse files
committed
Merge branch 'fix_FCC_interaction_matrix' into 'development'
fix incorrect glissile coefficient See merge request damask/DAMASK!1064
2 parents 1b26289 + 2d82568 commit 4f5a72e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/crystal.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,8 @@ function crystal_interaction_SlipBySlip(Nslip,interactionValues,lattice) result(
596596

597597
integer, dimension(CF_NSLIP,CF_NSLIP), parameter :: &
598598
CF_INTERACTIONSLIPSLIP = reshape( [&
599-
1, 2, 2, 4, 7, 5, 3, 5, 5, 4, 6, 7, 10,11,10,11,12,13, & ! -----> acting (forest)
600-
2, 1, 2, 7, 4, 5, 6, 4, 7, 5, 3, 5, 10,11,12,13,10,11, & ! |
599+
1, 2, 2, 4, 7, 6, 3, 5, 5, 4, 6, 7, 10,11,10,11,12,13, & ! -----> acting (forest)
600+
2, 1, 2, 7, 4, 6, 6, 4, 7, 5, 3, 5, 10,11,12,13,10,11, & ! |
601601
2, 2, 1, 5, 5, 3, 6, 7, 4, 7, 6, 4, 12,13,10,11,10,11, & ! |
602602
4, 7, 6, 1, 2, 2, 4, 6, 7, 3, 5, 5, 10,11,11,10,13,12, & ! v
603603
7, 4, 6, 2, 1, 2, 5, 3, 5, 6, 4, 7, 10,11,13,12,11,10, & ! reacting (primary)

0 commit comments

Comments
 (0)