Merge branch 'debug'

src/io/io.f90

@@ -1196,9 +1196,12 @@ module function io_read_frame_system(self, iu, param) result(ierr)
       integer(I4B)                              :: ierr  !! Error code: returns 0 if the read is successful
       ! Internals
       character(len=STRMAX) :: errmsg
+      integer(I4B) :: npl, ntp
 
-      ierr = io_read_hdr(iu, param%t, self%pl%nbody, self%tp%nbody, param%out_form, param%out_type)
+      ierr = io_read_hdr(iu, param%t, npl, ntp, param%out_form, param%out_type)
       if (is_iostat_end(ierr)) return ! Reached the end of the frames
+      call self%pl%setup(npl, param)
+      call self%tp%setup(ntp, param)
 
       if (ierr /= 0) then
          write(errmsg, *) "Cannot read frame header."

src/setup/setup.f90

@@ -264,18 +264,18 @@ module subroutine setup_pl(self, n, param)
       end if
 
       if (param%lrotation) then
-         if (allocated(self%rot)) deallocate(self%rhill)
-         if (allocated(self%Ip)) deallocate(self%rhill)
+         if (allocated(self%rot)) deallocate(self%rot)
+         if (allocated(self%Ip)) deallocate(self%Ip)
          allocate(self%rot(NDIM, n))
          allocate(self%Ip(NDIM, n))
          self%rot(:,:) = 0.0_DP
          self%Ip(:,:) = 0.0_DP
       end if
 
       if (param%ltides) then
-         if (allocated(self%k2)) deallocate(self%rhill)
-         if (allocated(self%Q)) deallocate(self%rhill)
-         if (allocated(self%tlag)) deallocate(self%rhill)
+         if (allocated(self%k2)) deallocate(self%k2)
+         if (allocated(self%Q)) deallocate(self%Q)
+         if (allocated(self%tlag)) deallocate(self%tlag)
          allocate(self%k2(n))
          allocate(self%Q(n))
          allocate(self%tlag(n))