Rearranged the mergeaddsub stuff and set the progress bar to only upd…

…ate on the output steps to cut down on the size of the SLURM-generated output files
MintonGroup · Jan 6, 2023 · 056bcbe · 056bcbe
1 parent 80c7f8c
commit 056bcbe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/collision/collision_resolve.f90 b/src/collision/collision_resolve.f90
@@ -349,6 +349,18 @@ module subroutine collision_resolve_mergeaddsub(nbody_system, param, t, status)
             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)
+
+            if (param%lrotation) then
+               plnew%Ip(:, 1:nfrag) = fragments%Ip(:, 1:nfrag)
+               plnew%rot(:, 1:nfrag) = fragments%rot(:, 1:nfrag)
+            end if
+
+            ! if (param%ltides) then
+            !    plnew%Q = pl%Q(ibiggest)
+            !    plnew%k2 = pl%k2(ibiggest)
+            !    plnew%tlag = pl%tlag(ibiggest)
+            ! end if
+
             do concurrent(i = 1:nfrag)
                volume = 4.0_DP/3.0_DP * PI * plnew%radius(i)**3
                plnew%density(i) = fragments%mass(i) / volume
@@ -407,17 +419,6 @@ module subroutine collision_resolve_mergeaddsub(nbody_system, param, t, status)
                end do 
             end select
 
-            if (param%lrotation) then
-               plnew%Ip(:, 1:nfrag) = fragments%Ip(:, 1:nfrag)
-               plnew%rot(:, 1:nfrag) = fragments%rot(:, 1:nfrag)
-            end if
-
-            ! if (param%ltides) then
-            !    plnew%Q = pl%Q(ibiggest)
-            !    plnew%k2 = pl%k2(ibiggest)
-            !    plnew%tlag = pl%tlag(ibiggest)
-            ! end if
-
             !Copy over or set integration parameters for new bodies
             plnew%lcollision(1:nfrag) = .false.
             plnew%ldiscard(1:nfrag) = .false.

diff --git a/src/swiftest/swiftest_driver.f90 b/src/swiftest/swiftest_driver.f90
@@ -117,7 +117,6 @@ program swiftest_driver
 
             !> Evaluate any discards or collisional outcomes
             call nbody_system%discard(param)
-            if (display_style == "PROGRESS") call pbar%update(iloop)
 
             !> If the loop counter is at the output cadence value, append the data file with a single frame
             if (istep_out > 0) then