Skip to content

[BugFix] BD: variable passing in Calc_RR0mEta_rho #2642

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 3 commits into from
Feb 20, 2025
Merged

[BugFix] BD: variable passing in Calc_RR0mEta_rho #2642

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af47e72
[BugFix] Calc_RR0mEta_rho routine argument consistency
andrew-platt Feb 18, 2025
44d8ff8
typo in af47e72
andrew-platt Feb 18, 2025
2a3f53e
BD: pass mEta into Calc_RR0mEta_rho
andrew-platt Feb 18, 2025
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
9 changes: 5 additions & 4 deletions modules/beamdyn/src/BeamDyn.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2662,21 +2662,22 @@ SUBROUTINE BD_QPData_mEta_rho( p, m )
do nelem = 1, p%elem_total
qp_start = (nelem-1)*p%nqp
do idx_qp = 1, p%nqp
call Calc_RR0mEta_rho(m%qp%RR0(:,:,idx_qp,nelem), &
call Calc_RR0mEta_rho(p%qp%mEta(:,idx_qp,nelem), &
m%qp%RR0(:,:,idx_qp,nelem), &
p%Mass0_QP(:,:,qp_start+idx_qp), &
m%qp%RR0mEta(:,idx_qp,nelem), &
m%qp%rho(:,:,idx_qp,nelem))
end do
end do

contains
subroutine Calc_RR0mEta_rho(RR0, Mass0, RR0mEta, rho)
real(BDKi), intent(in) :: RR0(:,:), Mass0(:,:)
subroutine Calc_RR0mEta_rho(mEta, RR0, Mass0, RR0mEta, rho)
real(BDKi), intent(in) :: mEta(:), RR0(:,:), Mass0(:,:)
real(BDKi), intent(out) :: RR0mEta(:), rho(:,:)

!> Calculate the new center of mass times mass at the deflected location
!! as \f$ \left(\underline{\underline{R}}\underline{\underline{R}}_0\right) m \underline{\eta} \f$
m%qp%RR0mEta(:,idx_qp,nelem) = MATMUL(RR0, p%qp%mEta(:,idx_qp,nelem))
RR0mEta(:) = MATMUL(RR0, mEta)

!> Calculate \f$ \rho = \left(\underline{\underline{R}}\underline{\underline{R}}_0\right)
!! \underline{\underline{M}}_{2,2}
Expand Down