Skip to content

SubDyn summary file: fixes #1911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrew-platt merged 2 commits into from
Dec 4, 2023
Merged

SubDyn summary file: fixes #1911

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d42d3b8
SubDyn summary file: fixes
RBergua Dec 1, 2023
1e2014c
SubDyn.f90 spaces instead of tabs
RBergua Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion modules/subdyn/src/SubDyn.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3567,6 +3567,7 @@ SUBROUTINE OutSummary(Init, p, m, InitInput, CBparams, Modes, Omega, Omega_Gy, E
INTEGER(IntKi) :: i, j, k, propIDs(2), Iprop(2) !counter and temporary holders
INTEGER(IntKi) :: iNode1, iNode2 ! Node indices
INTEGER(IntKi) :: mType ! Member Type
INTEGER :: iDirCos
REAL(ReKi) :: mMass, mLength ! Member mass and length
REAL(ReKi) :: M_O(6,6) ! Equivalent mass matrix at origin
REAL(ReKi) :: M_P(6,6) ! Equivalent mass matrix at P (ref point)
Expand Down Expand Up @@ -3835,11 +3836,25 @@ SUBROUTINE OutSummary(Init, p, m, InitInput, CBparams, Modes, Omega, Omega_Gy, E
WRITE(UnSum, '(A, I6)') '#Direction Cosine Matrices for all Members: GLOBAL-2-LOCAL. No. of 3x3 matrices=', p%NMembers
WRITE(UnSum, '(A9,9(A15))') '#Member ID', 'DC(1,1)', 'DC(1,2)', 'DC(1,3)', 'DC(2,1)','DC(2,2)','DC(2,3)','DC(3,1)','DC(3,2)','DC(3,3)'
DO i=1,p%NMembers
mType = Init%Members(I, iMType)
iNode1 = FINDLOCI(Init%Joints(:,1), Init%Members(i,2)) ! index of joint 1 of member i
iNode2 = FINDLOCI(Init%Joints(:,1), Init%Members(i,3)) ! index of joint 2 of member i
XYZ1 = Init%Joints(iNode1,2:4)
XYZ2 = Init%Joints(iNode2,2:4)
CALL GetDirCos(XYZ1(1:3), XYZ2(1:3), mType, DirCos, mLength, ErrStat, ErrMsg)
if ((mType == idMemberSpring) .or. (mType == idMemberBeamArb)) then ! The direction cosine for these member types must be provided by the user
iDirCos = p%Elems(i, iMDirCosID)
DirCos(1, 1) = Init%COSMs(iDirCos, 2)
DirCos(2, 1) = Init%COSMs(iDirCos, 3)
DirCos(3, 1) = Init%COSMs(iDirCos, 4)
DirCos(1, 2) = Init%COSMs(iDirCos, 5)
DirCos(2, 2) = Init%COSMs(iDirCos, 6)
DirCos(3, 2) = Init%COSMs(iDirCos, 7)
DirCos(1, 3) = Init%COSMs(iDirCos, 8)
DirCos(2, 3) = Init%COSMs(iDirCos, 9)
DirCos(3, 3) = Init%COSMs(iDirCos, 10)
else
CALL GetDirCos(XYZ1(1:3), XYZ2(1:3), mType, DirCos, mLength, ErrStat, ErrMsg)
endif
DirCos=TRANSPOSE(DirCos) !This is now global to local
WRITE(UnSum, '("#",I9,9(ES28.18E2))') Init%Members(i,1), ((DirCos(k,j),j=1,3),k=1,3)
ENDDO
Expand Down