Merge branch 'debug' into IntelAdvisor

MintonGroup · Oct 19, 2021 · 95aaf97 · 95aaf97
2 parents cc6ae42 + f5807f2
commit 95aaf97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/io/io.f90 b/src/io/io.f90
@@ -1000,7 +1000,7 @@ module subroutine io_param_writer(self, unit, iotype, v_list, iostat, iomsg)
             call io_param_writer_one("LTOT_ORIG", param%Ltot_orig(:), unit)
             call io_param_writer_one("LORBIT_ORIG", param%Lorbit_orig(:), unit)
             call io_param_writer_one("LSPIN_ORIG", param%Lspin_orig(:), unit)
-            call io_param_writer_one("LESCAPE", param%Lspin_orig(:), unit)
+            call io_param_writer_one("LESCAPE", param%Lescape(:), unit)
             call io_param_writer_one("GMESCAPE",param%GMescape, unit)
             call io_param_writer_one("ECOLLISIONS",param%Ecollisions, unit)
             call io_param_writer_one("EUNTRACKED",param%Euntracked, unit)

diff --git a/src/main/swiftest_driver.f90 b/src/main/swiftest_driver.f90
@@ -75,8 +75,9 @@ program swiftest_driver
       !$ write(*,'(a)')   ' OpenMP parameters:'
       !$ write(*,'(a)')   ' ------------------'
       !$ write(*,'(a,i3,/)') ' Number of threads  = ', nthreads 
-      call integration_timer%reset()
       write(*, *) " *************** Main Loop *************** "
+      if (param%lrestart .and. param%lenergy) call nbody_system%conservation_report(param, lterminal=.true.)
+      call integration_timer%reset()
       do iloop = 1, nloops
          !> Step the system forward in time
          call integration_timer%start()

diff --git a/src/netcdf/netcdf.f90 b/src/netcdf/netcdf.f90
@@ -677,6 +677,7 @@ module subroutine netcdf_read_particle_info_system(self, iu, plmask, tpmask)
             do i = 1, ntp
                call tp%info(i)%set_value(status="ACTIVE")
             end do
+            allocate(tpind(ntp))
             tpind(:) = pack([(i, i = 1, idmax)], tpmask(:))
          end if