From 4053cd23c838b7e31a88232dca8733ad6de655b7 Mon Sep 17 00:00:00 2001
From: David A Minton <daminton@purdue.edu>
Date: Fri, 8 Oct 2021 20:40:01 -0400
Subject: [PATCH] fixed bad import/use statements

---
 src/modules/encounter_classes.f90 | 7 ++++---
 src/modules/rmvs_classes.f90      | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/encounter_classes.f90 b/src/modules/encounter_classes.f90
index 96dbb1e83..ea9bb3c4a 100644
--- a/src/modules/encounter_classes.f90
+++ b/src/modules/encounter_classes.f90
@@ -65,7 +65,7 @@ module subroutine encounter_check_all(nenc, index1, index2, x1, v1, x2, v2, renc
       end subroutine encounter_check_all
 
       module subroutine encounter_check_all_plpl(param, npl, x, v, renc, dt, lvdotr, index1, index2, nenc)
-         import swiftest_parameters
+         use swiftest_classes, only: swiftest_parameters
          implicit none
          class(swiftest_parameters),              intent(inout) :: param  !! Current Swiftest run configuration parameter5s
          integer(I4B),                            intent(in)    :: npl    !! Total number of massive bodies
@@ -80,7 +80,7 @@ module subroutine encounter_check_all_plpl(param, npl, x, v, renc, dt, lvdotr, i
       end subroutine encounter_check_all_plpl
 
       module subroutine encounter_check_all_plplm(param, nplm, nplt, xplm, vplm, xplt, vplt, rencm, renct, dt, lvdotr, index1, index2, nenc)
-         import swiftest_parameters
+         use swiftest_classes, only: swiftest_parameters
          implicit none
          class(swiftest_parameters),              intent(inout) :: param  !! Current Swiftest run configuration parameter5s
          integer(I4B),                            intent(in)    :: nplm   !! Total number of fully interacting massive bodies 
@@ -99,7 +99,7 @@ module subroutine encounter_check_all_plplm(param, nplm, nplt, xplm, vplm, xplt,
       end subroutine encounter_check_all_plplm
 
       module subroutine encounter_check_all_pltp(param, npl, ntp, xpl, vpl, xtp, vtp, renc, dt, lvdotr, index1, index2, nenc)
-         import swiftest_parameters
+         use swiftest_classes, only: swiftest_parameters
          implicit none
          class(swiftest_parameters),              intent(inout) :: param  !! Current Swiftest run configuration parameter5s
          integer(I4B),                            intent(in)    :: npl    !! Total number of massive bodies 
@@ -175,6 +175,7 @@ module subroutine encounter_io_write_frame(iu, t, id1, id2, Gmass1, Gmass2, radi
       end subroutine encounter_io_write_frame
 
       module subroutine encounter_io_write_list(self, pl, encbody, param)
+         use swiftest_classes, only : swiftest_pl, swiftest_body, swiftest_parameters
          implicit none
          class(encounter_list),  intent(in) :: self    !! Swiftest encounter list object
          class(swiftest_pl),         intent(in) :: pl      !! Swiftest massive body object
diff --git a/src/modules/rmvs_classes.f90 b/src/modules/rmvs_classes.f90
index 28f41580a..7c89edbd6 100644
--- a/src/modules/rmvs_classes.f90
+++ b/src/modules/rmvs_classes.f90
@@ -112,6 +112,7 @@ module subroutine rmvs_discard_tp(self, system, param)
       end subroutine rmvs_discard_tp
 
       module function rmvs_encounter_check_tp(self, param, system, dt) result(lencounter)
+         use swiftest_classes, only : swiftest_parameters
          implicit none
          class(rmvs_tp),             intent(inout) :: self       !! RMVS test particle object  
          class(swiftest_parameters), intent(inout) :: param      !! Current run configuration parameters