"
+ ],
+ "text/plain": [
+ "\n",
+ "Dimensions: (name: 10, time: 1)\n",
+ "Coordinates:\n",
+ " * name (name) 4) self%spinner = 1
+ select case(self%spinner)
+ case(1)
+ self%barstr(pos:pos) = "/"
+ case(2)
+ self%barstr(pos:pos) = "-"
+ case(3)
+ self%barstr(pos:pos) = "\"
+ case(4)
+ self%barstr(pos:pos) = "|"
+ end select
+
+ write(*,fmt=self%fmt) char(13),self%barstr
+
+
+ return
+ end subroutine io_pbar_update
+
+
+
+
module subroutine io_conservation_report(self, param, lterminal)
!! author: The Purdue Swiftest Team - David A. Minton, Carlisle A. Wishard, Jennifer L.L. Pouplin, and Jacob R. Elliott
!!
diff --git a/src/main/swiftest_driver.f90 b/src/main/swiftest_driver.f90
index 467403269..0eca02509 100644
--- a/src/main/swiftest_driver.f90
+++ b/src/main/swiftest_driver.f90
@@ -31,6 +31,7 @@ program swiftest_driver
real(DP) :: old_t_final = 0.0_DP !! Output time at which writing should start, in order to prevent duplicate lines being written for restarts
type(walltimer) :: integration_timer !! Object used for computing elapsed wall time
real(DP) :: tfrac
+ type(progress_bar) :: pbar !! Object used to print out a progress bar
character(*), parameter :: statusfmt = '("Time = ", ES12.5, "; fraction done = ", F6.3, ' // &
'"; Number of active pl, tp = ", I5, ", ", I5)'
character(*), parameter :: symbastatfmt = '("Time = ", ES12.5, "; fraction done = ", F6.3, ' // &
@@ -88,6 +89,7 @@ program swiftest_driver
!$ write(*,'(a,i3,/)') ' Number of threads = ', nthreads
write(*, *) " *************** Main Loop *************** "
if (param%lrestart .and. param%lenergy) call nbody_system%conservation_report(param, lterminal=.true.)
+ call pbar%reset(nloops)
do iloop = 1, nloops
!> Step the system forward in time
call integration_timer%start()
@@ -100,6 +102,7 @@ program swiftest_driver
call nbody_system%discard(param)
!> If the loop counter is at the output cadence value, append the data file with a single frame
+ call pbar%update(iloop)
if (istep_out > 0) then
iout = iout - 1
if (iout == 0) then
@@ -108,15 +111,15 @@ program swiftest_driver
tfrac = (param%t - param%t0) / (param%tstop - param%t0)
- select type(pl => nbody_system%pl)
- class is (symba_pl)
- write(*, symbastatfmt) param%t, tfrac, pl%nplm, pl%nbody, nbody_system%tp%nbody
- class default
- write(*, statusfmt) param%t, tfrac, pl%nbody, nbody_system%tp%nbody
- end select
+ ! select type(pl => nbody_system%pl)
+ ! class is (symba_pl)
+ ! write(*, symbastatfmt) param%t, tfrac, pl%nplm, pl%nbody, nbody_system%tp%nbody
+ ! class default
+ ! write(*, statusfmt) param%t, tfrac, pl%nbody, nbody_system%tp%nbody
+ ! end select
if (param%lenergy) call nbody_system%conservation_report(param, lterminal=.true.)
- call integration_timer%report(message="Integration steps:", nsubsteps=istep_out)
- call integration_timer%reset()
+ !call integration_timer%report(message="Integration steps:", nsubsteps=istep_out)
+ !call integration_timer%reset()
iout = istep_out
end if
diff --git a/src/modules/swiftest_classes.f90 b/src/modules/swiftest_classes.f90
index 6c0ac2be3..49735a424 100644
--- a/src/modules/swiftest_classes.f90
+++ b/src/modules/swiftest_classes.f90
@@ -414,6 +414,21 @@ module swiftest_classes
generic :: read_particle_info => read_particle_info_bin, read_particle_info_netcdf !! Genereric method call for reading in the particle information metadata
end type swiftest_nbody_system
+ type :: progress_bar
+ !! author: David A. Minton
+ !!
+ !! Implements a class for a simple progress bar that can print on the screen.
+ integer(I4B) :: PBARSIZE = 80 !! Number of characters acros for a whole progress bar
+ integer(I8B) :: nloops !! The total number of loops that the progrees bar is executing
+ character(len=:), allocatable :: barstr !! The string that prints out as the progress bar
+ integer(I4B) :: spinner !! Position of the "spinner" that indicates that progress is being made
+ character(len=1) :: barchar = "=" !! The progress bar character
+ character(len=32) :: fmt !! The format string that is used to define the progress bar itself
+ contains
+ procedure :: reset => io_pbar_reset !! Resets the progress bar to the beginning
+ procedure :: update => io_pbar_update !! Updates the progress bar with new values and causes the "spinner" to flip.
+ end type progress_bar
+
abstract interface
subroutine abstract_accel(self, system, param, t, lbeg)
@@ -582,6 +597,18 @@ pure module subroutine gr_vh2pv_body(self, param)
class(swiftest_parameters), intent(in) :: param !! Current run configuration parameters
end subroutine gr_vh2pv_body
+ module subroutine io_pbar_reset(self, nloops)
+ implicit none
+ class(progress_bar),intent(inout) :: self
+ integer(I8B), intent(in) :: nloops
+ end subroutine io_pbar_reset
+
+ module subroutine io_pbar_update(self,i)
+ implicit none
+ class(progress_bar), intent(inout) :: self
+ integer(I8B), intent(in) :: i
+ end subroutine io_pbar_update
+
module subroutine io_conservation_report(self, param, lterminal)
implicit none
class(swiftest_nbody_system), intent(inout) :: self !! Swiftest nbody system object