Skip to content

Commit 0657f7e

Browse files
authored
Merge pull request #100 from victorkemp/fix_issues_#95_#96_#98
fix issues #95 #96 #98
2 parents cefdb1d + 9116cb2 commit 0657f7e

1 file changed

Lines changed: 30 additions & 21 deletions

File tree

Source/EMG/EMG8/ROT_AXES_MATL_TO_LOC.f90

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ SUBROUTINE ROT_AXES_MATL_TO_LOC ( WRITE_WARN )
7474
REAL(DOUBLE) :: EBM0(3,3) ! Bend/membr coupling matl matrix before coord transformation
7575
REAL(DOUBLE) :: ES0(6,6) ! 3D stress matl matrix before coord transformation
7676
REAL(DOUBLE) :: ET0(2,2) ! 2D transverse shear matl matrix before coord transformation
77-
78-
REAL(DOUBLE) :: T1transposed(6,6) ! Victor - Bug fix for solid elem default coord issue
77+
78+
REAL(DOUBLE) :: T1transposed(6,6) ! Victor - Bug fix for solid elem default coord issue
7979

8080
! **********************************************************************************************************************************
8181
IF (WRT_LOG >= SUBR_BEGEND) THEN
@@ -129,6 +129,20 @@ SUBROUTINE ROT_AXES_MATL_TO_LOC ( WRITE_WARN )
129129
CALL PLANE_COORD_TRANS_21 ( MATL_AXES_ROTATE, TME, SUBR_NAME )
130130
!xx CALL GET_T1_TRANSFORM_MAT
131131
CALL MATL_TRANSFORM_MATRIX ( TME, T1 )
132+
133+
!Victor - Shell element default cooord system issue #98 - Add start
134+
DO I=1,6
135+
DO J=1,6
136+
T1transposed(I,J) = T1(J,I)
137+
ENDDO
138+
ENDDO
139+
DO I=1,6
140+
DO J=1,6
141+
T1(I,J) = T1transposed(I,J)
142+
ENDDO
143+
ENDDO
144+
!Victor - Shell element default cooord system issue #98 - Add end
145+
132146
! T1_MB is for Sxx, Syy, Sxy which are rows and cols 1,2,4 from T1
133147
T1_MB(1,1) = T1(1,1) ; T1_MB(1,2) = T1(1,2) ; T1_MB(1,3) = T1(1,4)
134148
T1_MB(2,1) = T1(2,1) ; T1_MB(2,2) = T1(2,2) ; T1_MB(2,3) = T1(2,4)
@@ -227,30 +241,25 @@ SUBROUTINE ROT_AXES_MATL_TO_LOC ( WRITE_WARN )
227241

228242
!xx CALL GET_T1_TRANSFORM_MAT
229243
CALL MATL_TRANSFORM_MATRIX ( TME, T1 )
230-
!Victor - Solid element default cooord system issue - Remove 3 lines
231-
!CALL MATMULT_FFF ( ES , T1 , 6, 6, 6, DUM66 )
232-
!CALL MATMULT_FFF_T ( T1 , DUM66, 6, 6, 6, ES )
233-
234-
!CALL MATMULT_FFF_T (T1, ALPVEC, 6, 6, MEMATC, DUM64 )
235-
236-
!Victor - Solid element default cooord system issue - Add start
237-
DO I=1,6
244+
245+
!Victor - Solid element default cooord system issues #95 and #96 - Add start
246+
DO I=1,6
238247
DO J=1,6
239248
T1transposed(I,J) = T1(J,I)
240249
ENDDO
241250
ENDDO
251+
DO I=1,6
252+
DO J=1,6
253+
T1(I,J) = T1transposed(I,J)
254+
ENDDO
255+
ENDDO
256+
!Victor - Solid element default cooord system issues #95 and #96 - Add end
257+
258+
CALL MATMULT_FFF ( ES , T1 , 6, 6, 6, DUM66 )
259+
CALL MATMULT_FFF_T ( T1 , DUM66, 6, 6, 6, ES )
260+
261+
CALL MATMULT_FFF_T (T1, ALPVEC, 6, 6, MEMATC, DUM64 )
242262

243-
CALL MATMULT_FFF ( ES , T1transposed , 6, 6, 6, DUM66 )
244-
CALL MATMULT_FFF_T ( T1transposed , DUM66, 6, 6, 6, ES )
245-
246-
CALL MATMULT_FFF_T (T1transposed, ALPVEC, 6, 6, MEMATC, DUM64 )
247-
!Victor - Solid element default cooord system issue - Add end
248-
249-
250-
251-
252-
253-
254263
DO I=1,6
255264
DO J=1,MEMATC
256265
ALPVEC(I,J) = DUM64(I,J)

0 commit comments

Comments
 (0)