From fe9754a41c02730d57900268818156bc1f4428c8 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 2 Sep 2011 10:46:37 +0000 Subject: [PATCH] previous commit was wrong file --- code/lattice.f90 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/code/lattice.f90 b/code/lattice.f90 index 36280b8d0..f70a908e5 100644 --- a/code/lattice.f90 +++ b/code/lattice.f90 @@ -43,7 +43,7 @@ integer(pInt), parameter :: lattice_maxNslipFamily = 5 ! max # of sli integer(pInt), parameter :: lattice_maxNtwinFamily = 4 ! max # of twin system families over lattice structures integer(pInt), parameter :: lattice_maxNslip = 54 ! max # of slip systems over lattice structures integer(pInt), parameter :: lattice_maxNtwin = 24 ! max # of twin systems over lattice structures -integer(pInt), parameter :: lattice_maxNinteraction = 20 ! max # of interaction types (in hardening matrix part) ToDo +integer(pInt), parameter :: lattice_maxNinteraction = 30 ! max # of interaction types (in hardening matrix part) integer(pInt), pointer, dimension(:,:) :: interactionSlipSlip, & interactionSlipTwin, & @@ -552,20 +552,20 @@ integer(pInt), allocatable, dimension(:,:,:) :: lattice_interactionSlipSlip, & integer(pInt), target, dimension(lattice_hex_Nslip,lattice_hex_Nslip) :: lattice_hex_interactionSlipSlip = & reshape((/& - 1, 5, 5, 11,11,11, 15,15,15,15,15,15, 18,18,18,18,18,18,18,18,18,18,18,18, 20,20,20,20,20,20, & - 5, 1, 5, 11,11,11, 15,15,15,15,15,15, 18,18,18,18,18,18,18,18,18,18,18,18, 20,20,20,20,20,20, & - 5, 5, 1, 11,11,11, 15,15,15,15,15,15, 18,18,18,18,18,18,18,18,18,18,18,18, 20,20,20,20,20,20, & + 1, 6, 6, 11,11,11, 15,15,15,15,15,15, 18,18,18,18,18,18,18,18,18,18,18,18, 20,20,20,20,20,20, & + 6, 1, 6, 11,11,11, 15,15,15,15,15,15, 18,18,18,18,18,18,18,18,18,18,18,18, 20,20,20,20,20,20, & + 6, 6, 1, 11,11,11, 15,15,15,15,15,15, 18,18,18,18,18,18,18,18,18,18,18,18, 20,20,20,20,20,20, & ! - 21,21,21, 2, 6, 6, 12,12,12,12,12,12, 16,16,16,16,16,16,16,16,16,16,16,16, 19,19,19,19,19,19, & - 21,21,21, 6, 2, 6, 12,12,12,12,12,12, 16,16,16,16,16,16,16,16,16,16,16,16, 19,19,19,19,19,19, & - 21,21,21, 6, 6, 2, 12,12,12,12,12,12, 16,16,16,16,16,16,16,16,16,16,16,16, 19,19,19,19,19,19, & + 21,21,21, 2, 7, 7, 12,12,12,12,12,12, 16,16,16,16,16,16,16,16,16,16,16,16, 19,19,19,19,19,19, & + 21,21,21, 7, 2, 7, 12,12,12,12,12,12, 16,16,16,16,16,16,16,16,16,16,16,16, 19,19,19,19,19,19, & + 21,21,21, 7, 7, 2, 12,12,12,12,12,12, 16,16,16,16,16,16,16,16,16,16,16,16, 19,19,19,19,19,19, & ! - 25,25,25, 22,22,22, 3, 7, 7, 7, 7, 7, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & - 25,25,25, 22,22,22, 7, 3, 7, 7, 7, 7, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & - 25,25,25, 22,22,22, 7, 7, 3, 7, 7, 7, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & - 25,25,25, 22,22,22, 7, 7, 7, 3, 7, 7, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & - 25,25,25, 22,22,22, 7, 7, 7, 7, 3, 7, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & - 25,25,25, 22,22,22, 7, 7, 7, 7, 7, 3, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & + 25,25,25, 22,22,22, 3, 8, 8, 8, 8, 8, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & + 25,25,25, 22,22,22, 8, 3, 8, 8, 8, 8, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & + 25,25,25, 22,22,22, 8, 8, 3, 8, 8, 8, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & + 25,25,25, 22,22,22, 8, 8, 8, 3, 8, 8, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & + 25,25,25, 22,22,22, 8, 8, 8, 8, 3, 8, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & + 25,25,25, 22,22,22, 8, 8, 8, 8, 8, 3, 13,13,13,13,13,13,13,13,13,13,13,13, 17,17,17,17,17,17, & ! 28,28,28, 26,26,26, 23,23,23,23,23,23, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 14,14,14,14,14,14, & 28,28,28, 26,26,26, 23,23,23,23,23,23, 9, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 14,14,14,14,14,14, &