From 0c637aa1236f415774d160c1f8937a54c6cd46ac Mon Sep 17 00:00:00 2001 From: David A Minton Date: Fri, 23 Dec 2022 11:29:55 -0500 Subject: [PATCH] Cleanup and getting velocities under control with correct units --- src/collision/collision_resolve.f90 | 8 ++------ src/fraggle/fraggle_util.f90 | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/collision/collision_resolve.f90 b/src/collision/collision_resolve.f90 index dae44b9cc..419875a80 100644 --- 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 index 80be9062c..22691f17a 100644 --- 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