From 0321a449709b316d46f0e327b69f2d9623fdb340 Mon Sep 17 00:00:00 2001 From: David Minton Date: Fri, 21 May 2021 14:39:56 -0400 Subject: [PATCH] Fixed mismatched interface --- src/symba/symba_frag_pos.f90 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/symba/symba_frag_pos.f90 b/src/symba/symba_frag_pos.f90 index 4197da1c5..760ec0e5a 100644 --- a/src/symba/symba_frag_pos.f90 +++ b/src/symba/symba_frag_pos.f90 @@ -93,7 +93,7 @@ end function ke_objective_func_eval end module symba_frag_pos_lambda_implementation subroutine symba_frag_pos (param, symba_plA, family, x, v, L_spin, Ip, mass, radius, & - Ip_frag, m_frag, rad_frag, xb_frag, vb_frag, rot_frag, lmerge, Qloss) + nfrag, Ip_frag, m_frag, rad_frag, xb_frag, vb_frag, rot_frag, lmerge, Qloss) !! Author: Jennifer L.L. Pouplin, Carlisle A. Wishard, and David A. Minton !! !! Places the collision fragments on a circle oriented with a plane defined @@ -109,18 +109,20 @@ subroutine symba_frag_pos (param, symba_plA, family, x, v, L_spin, Ip, mass, rad type(user_input_parameters), intent(in) :: param type(symba_pl), intent(inout) :: symba_plA integer(I4B), dimension(:), intent(in) :: family - real(DP), intent(inout) :: Qloss real(DP), dimension(:,:), intent(inout) :: x, v, L_spin, Ip - real(DP), dimension(:), intent(inout) :: mass, radius, m_frag, rad_frag + real(DP), dimension(:), intent(inout) :: mass, radius + integer(I4B), intent(inout) :: nfrag + real(DP), dimension(:), intent(inout) :: m_frag, rad_frag real(DP), dimension(:,:), intent(inout) :: Ip_frag real(DP), dimension(:,:), intent(inout) :: xb_frag, vb_frag, rot_frag + real(DP), intent(inout) :: Qloss logical, intent(out) :: lmerge ! Answers the question: Should this have been a merger instead? ! Internals real(DP), parameter :: f_spin = 0.00_DP !! Fraction of pre-impact orbital angular momentum that is converted to fragment spin real(DP) :: mscale = 1.0_DP, rscale = 1.0_DP, vscale = 1.0_DP, tscale = 1.0_DP, Lscale = 1.0_DP, Escale = 1.0_DP! Scale factors that reduce quantities to O(~1) in the collisional system real(DP) :: mtot real(DP), dimension(NDIM) :: xcom, vcom - integer(I4B) :: i, j, nfrag, fam_size + integer(I4B) :: i, j, fam_size logical, dimension(:), allocatable :: lexclude real(DP), dimension(NDIM, 2) :: rot, L_orb real(DP), dimension(:,:), allocatable :: x_frag, v_frag, v_r_unit, v_t_unit