223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cell definition follows correct order for 11/12 (7/57 in MSC.Marc)

This commit is contained in:
Martin Diehl 2020-01-26 09:06:45 +01:00
parent 7671e257bd
commit b16f4155d4
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/element.f90
View File

@ -482,34 +482,34 @@ module element
integer, dimension(NNODE(11),NCELLNODE(GEOMTYPE(11))), parameter :: CELLNODEPARENTNODEWEIGHTS11 = &
reshape([&
1, 0, 0, 0, 0, 0, 0, 0, & ! 1
0, 1, 0, 0, 0, 0, 0, 0, & ! 2
0, 0, 1, 0, 0, 0, 0, 0, & ! 3
0, 0, 0, 1, 0, 0, 0, 0, & ! 4
1, 0, 0, 0, 0, 0, 0, 0, & !
0, 1, 0, 0, 0, 0, 0, 0, & !
0, 0, 1, 0, 0, 0, 0, 0, & !
0, 0, 0, 1, 0, 0, 0, 0, & !
0, 0, 0, 0, 1, 0, 0, 0, & ! 5
0, 0, 0, 0, 0, 1, 0, 0, & ! 6
0, 0, 0, 0, 0, 0, 1, 0, & ! 7
0, 0, 0, 0, 0, 0, 0, 1, & ! 8
1, 1, 0, 0, 0, 0, 0, 0, & ! 9
0, 0, 0, 0, 0, 1, 0, 0, & !
0, 0, 0, 0, 0, 0, 1, 0, & !
0, 0, 0, 0, 0, 0, 0, 1, & !
1, 1, 0, 0, 0, 0, 0, 0, & !
0, 1, 1, 0, 0, 0, 0, 0, & ! 10
0, 0, 1, 1, 0, 0, 0, 0, & ! 11
1, 0, 0, 1, 0, 0, 0, 0, & ! 12
0, 0, 0, 0, 1, 1, 0, 0, & ! 17
0, 0, 0, 0, 0, 1, 1, 0, & ! 18
0, 0, 0, 0, 0, 0, 1, 1, & ! 19
0, 0, 0, 0, 1, 0, 0, 1, & ! 20
1, 0, 0, 0, 1, 0, 0, 0, & ! 13
0, 1, 0, 0, 0, 1, 0, 0, & ! 14
0, 0, 1, 0, 0, 0, 1, 0, & ! 15
0, 0, 0, 1, 0, 0, 0, 1, & ! 16
0, 0, 1, 1, 0, 0, 0, 0, & !
1, 0, 0, 1, 0, 0, 0, 0, & !
0, 0, 0, 0, 1, 1, 0, 0, & ! 17 => 13
0, 0, 0, 0, 0, 1, 1, 0, & ! 18 => 14
0, 0, 0, 0, 0, 0, 1, 1, & ! 19 => 15
0, 0, 0, 0, 1, 0, 0, 1, & ! 20 => 16
1, 0, 0, 0, 1, 0, 0, 0, & ! 13 => 17
0, 1, 0, 0, 0, 1, 0, 0, & ! 14 => 18
0, 0, 1, 0, 0, 0, 1, 0, & ! 15 => 19
0, 0, 0, 1, 0, 0, 0, 1, & ! 16 => 20
!
1, 1, 1, 1, 0, 0, 0, 0, & ! 21
1, 1, 0, 0, 1, 1, 0, 0, & ! 22
0, 1, 1, 0, 0, 1, 1, 0, & ! 23
0, 0, 1, 1, 0, 0, 1, 1, & ! 24
1, 1, 1, 1, 0, 0, 0, 0, & !
1, 1, 0, 0, 1, 1, 0, 0, & !
0, 1, 1, 0, 0, 1, 1, 0, & !
0, 0, 1, 1, 0, 0, 1, 1, & !
1, 0, 0, 1, 1, 0, 0, 1, & ! 25
0, 0, 0, 0, 1, 1, 1, 1, & ! 26
1, 1, 1, 1, 1, 1, 1, 1 & ! 27
0, 0, 0, 0, 1, 1, 1, 1, & !
1, 1, 1, 1, 1, 1, 1, 1 & !
#if !defined(__GFORTRAN__)
],shape(CELLNODEPARENTNODEWEIGHTS11)) !< 3D 8node 8ip
#else
@ -720,14 +720,14 @@ module element
integer, dimension(NCELLNODEPERCELL(CELLTYPE(9)),NIP(9)), parameter :: CELL9 = &
reshape([&
1, 9,21,12,13,22,27,25, &
9, 2,10,21,22,14,23,27, &
12,21,11, 4,25,27,24,16, &
21,10, 3,11,27,23,15,24, &
13,22,27,25, 5,17,26,20, &
22,14,23,27,17, 6,18,26, &
25,27,24,16,20,26,19, 8, &
27,23,15,24,26,18, 7,19 &
1, 9,21,12,17,22,27,25, &
9, 2,10,21,22,18,23,27, &
12,21,11, 4,25,27,24,20, &
21,10, 3,11,27,23,19,24, &
17,22,27,25, 5,13,26,16, &
22,18,23,27,13, 6,14,26, &
25,27,24,20,16,26,15, 8, &
27,23,19,24,26,14, 7,15 &
#if !defined(__GFORTRAN__)
],shape(CELL9))
#else