Cleanup and getting velocities under control with correct units

MintonGroup · Dec 23, 2022 · 0c637aa · 0c637aa
1 parent 9627d1f
commit 0c637aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/collision/collision_resolve.f90 b/src/collision/collision_resolve.f90
@@ -345,12 +345,8 @@ module subroutine collision_resolve_mergeaddsub(nbody_system, param, t, status)
             plnew%id(1:nfrag) = fragments%id(1:nfrag) 
             plnew%rb(:, 1:nfrag) = fragments%rb(:, 1:nfrag) 
             plnew%vb(:, 1:nfrag) = fragments%vb(:, 1:nfrag)
-            call pl%vb2vh(cb)
-            call pl%rh2rb(cb)
-            do i = 1, nfrag
-               plnew%rh(:,i) = fragments%rb(:, i) - cb%rb(:)
-               plnew%vh(:,i) = fragments%vb(:, i) - cb%vb(:)
-            end do
+            plnew%status(1:nfrag) = ACTIVE
+            call plnew%b2h(cb)
             plnew%mass(1:nfrag) = fragments%mass(1:nfrag)
             plnew%Gmass(1:nfrag) = param%GU * fragments%mass(1:nfrag)
             plnew%radius(1:nfrag) = fragments%radius(1:nfrag)

diff --git a/src/fraggle/fraggle_util.f90 b/src/fraggle/fraggle_util.f90
@@ -211,6 +211,7 @@ module subroutine fraggle_util_set_natural_scale_factors(self)
          impactors%rbcom(:)    = impactors%rbcom(:)    / collision_merge%dscale
          impactors%vbcom(:)    = impactors%vbcom(:)    / collision_merge%vscale
          impactors%rbimp(:)    = impactors%rbimp(:)    / collision_merge%dscale
+         impactors%vbimp(:)    = impactors%vbimp(:)    / collision_merge%vscale
          impactors%rb(:,:)     = impactors%rb(:,:)     / collision_merge%dscale
          impactors%vb(:,:)     = impactors%vb(:,:)     / collision_merge%vscale
          impactors%mass(:)     = impactors%mass(:)     / collision_merge%mscale
@@ -253,6 +254,7 @@ module subroutine fraggle_util_set_original_scale_factors(self)
          impactors%rbcom(:) = impactors%rbcom(:) * collision_merge%dscale
          impactors%vbcom(:) = impactors%vbcom(:) * collision_merge%vscale
          impactors%rbimp(:) = impactors%rbimp(:) * collision_merge%dscale
+         impactors%vbimp(:) = impactors%vbimp(:) * collision_merge%vscale
 
          impactors%mass   = impactors%mass   * collision_merge%mscale
          impactors%radius = impactors%radius * collision_merge%dscale