From 12b37b7e7f7fe93a09e0fa99379ee06804a349a5 Mon Sep 17 00:00:00 2001
From: David Minton <daminton@purdue.edu>
Date: Fri, 16 Apr 2021 20:36:44 -0400
Subject: [PATCH] Removed need to copy inner and outer interpolation variables
 to planetocentric object

---
 src/modules/whm_classes.f90 | 2 --
 src/rmvs/rmvs_getacch.f90   | 2 +-
 src/rmvs/rmvs_step.f90      | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/modules/whm_classes.f90 b/src/modules/whm_classes.f90
index 7f1508ae5..24d764722 100644
--- a/src/modules/whm_classes.f90
+++ b/src/modules/whm_classes.f90
@@ -87,8 +87,6 @@ module whm_classes
       procedure, public :: step         => whm_step_tp         !! Steps the particle forward one stepsize
    end type whm_tp
 
-
-
    interface
       !> WHM massive body constructor method
       module subroutine whm_setup_pl(self,n)
diff --git a/src/rmvs/rmvs_getacch.f90 b/src/rmvs/rmvs_getacch.f90
index 50dd38f1e..1628fc8d2 100644
--- a/src/rmvs/rmvs_getacch.f90
+++ b/src/rmvs/rmvs_getacch.f90
@@ -36,7 +36,7 @@ module subroutine rmvs_getacch_tp(self, cb, pl, config, t, xh)
                   config_planetocen%lextra_force = .false.
                   config_planetocen%lgr = .false.
                   ! Now compute the planetocentric values of acceleration
-                  call whm_getacch_tp(tp, cb, pl, config_planetocen, t, pl%xh)
+                  call whm_getacch_tp(tp, cb, pl%planetocentric(ipleP)%pl, config_planetocen, t, pl%xh)
 
                   ! Now compute any heliocentric values of acceleration 
                   if (tp%lfirst) then
diff --git a/src/rmvs/rmvs_step.f90 b/src/rmvs/rmvs_step.f90
index 13fdf2230..01dff9e9c 100644
--- a/src/rmvs/rmvs_step.f90
+++ b/src/rmvs/rmvs_step.f90
@@ -442,7 +442,7 @@ subroutine rmvs_step_in(pl, cb, tp, config, outer_time, dto)
                      plenci%xh(:,:) = xbeg(:,:)
                      plenci%vh(:,:) = vbeg(:,:)
                      call tpenci%set_beg_end(xbeg = xbeg, xend = xend)
-                     call tpenci%step(cbenci, plenci, config, inner_time, dti)
+                     call tpenci%step(cbenci, pl, config, inner_time, dti)
                      do j = 1, nenc(i)
                         tpenci%xheliocentric(:, j) = tpenci%xh(:, j) + pl%inner(enc_index    )%x(:,i)
                      end do
@@ -497,7 +497,6 @@ subroutine rmvs_make_planetocentric(pl, cb, tp, config)
                   tpenci%xh(j, :) = tpenci%xheliocentric(j, :) - pl%inner(0)%x(j, i)
                   tpenci%vh(j, :) = pack(tp%vh(j,:), encmask(:)) - pl%inner(0)%v(j, i)
                end do
-               allocate(plenci%inner, source = pl%inner)
                ! Make sure that the test particles get the planetocentric value of mu 
                call tpenci%set_mu(cbenci)
             end associate
@@ -539,7 +538,6 @@ subroutine rmvs_end_planetocentric(pl, cb, tp)
                   tp%vh(j, tpind(1:nenc(i))) = tpenci%vh(j,1:nenc(i)) + pl%inner(NTPHENC)%v(j, i)
                end do
                deallocate(pl%planetocentric(i)%tp)
-               deallocate(pl%planetocentric(i)%pl%inner)
             end associate
          end do
       end associate