From a489d70b3ac70871279680ade14f23b5f38a30d3 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Sat, 7 Jan 2023 23:11:29 -0500 Subject: [PATCH] Simplified output in swiftest.log. Also adjusted the size of the circles in the fragmentation movie maker --- examples/Fragmentation/Fragmentation_Movie.py | 2 +- src/swiftest/swiftest_io.f90 | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/Fragmentation/Fragmentation_Movie.py b/examples/Fragmentation/Fragmentation_Movie.py index c9603a2a8..8d8e11698 100644 --- a/examples/Fragmentation/Fragmentation_Movie.py +++ b/examples/Fragmentation/Fragmentation_Movie.py @@ -168,7 +168,7 @@ def setup_plot(self): scale_frame = abs(rhy1) + abs(rhy2) ax = plt.Axes(fig, [0.1, 0.1, 0.8, 0.8]) - self.ax_pt_size = self.figsize[0] * 0.7 * 72 / scale_frame + self.ax_pt_size = self.figsize[0] * 72 / scale_frame ax.set_xlim(-scale_frame, scale_frame) ax.set_ylim(-scale_frame, scale_frame) ax.set_xticks([]) diff --git a/src/swiftest/swiftest_io.f90 b/src/swiftest/swiftest_io.f90 index 905dde2a6..da3ccb2d2 100644 --- a/src/swiftest/swiftest_io.f90 +++ b/src/swiftest/swiftest_io.f90 @@ -125,10 +125,7 @@ module subroutine swiftest_io_conservation_report(self, param, lterminal) real(DP) :: GMtot_now character(len=STRMAX) :: errmsg integer(I4B), parameter :: EGYIU = 72 - character(len=*), parameter :: EGYTERMFMT = '(" DL/L0 = ", ES12.5 & - "; DE_collisions/|E0| = ", ES12.5, & - "; D(E_orbit+E_collisions)/|E0| = ", ES12.5, & - "; DM/M0 = ", ES12.5)' + character(len=*), parameter :: EGYTERMFMT = '(" DL/L0 = ", ES12.5, "; DE/|E0| = ", ES12.5, "; DM/M0 = ", ES12.5)' associate(nbody_system => self, pl => self%pl, cb => self%cb, npl => self%pl%nbody, display_unit => param%display_unit, nc => param%system_history%nc) @@ -175,7 +172,7 @@ module subroutine swiftest_io_conservation_report(self, param, lterminal) nbody_system%L_total_error = norm2(L_total_now(:) - nbody_system%L_total_orig(:)) / norm2(nbody_system%L_total_orig(:)) nbody_system%Mescape_error = nbody_system%GMescape / nbody_system%GMtot_orig nbody_system%Mtot_error = (GMtot_now - nbody_system%GMtot_orig) / nbody_system%GMtot_orig - if (lterminal) write(display_unit, EGYTERMFMT) nbody_system%L_total_error, nbody_system%Ecoll_error, nbody_system%te_error,nbody_system%Mtot_error + if (lterminal) write(display_unit, EGYTERMFMT) nbody_system%L_total_error, nbody_system%te_error,nbody_system%Mtot_error if (abs(nbody_system%Mtot_error) > 100 * epsilon(nbody_system%Mtot_error)) then write(*,*) "Severe error! Mass not conserved! Halting!" ! Save the frame of data to the bin file in the slot just after the present one for diagnostics