From 6826eb34fb22e0a40549cf4218a08c15d10161fc Mon Sep 17 00:00:00 2001 From: David A Minton Date: Wed, 7 Jul 2021 14:19:53 -0400 Subject: [PATCH] Changed lfirst flag to be part of the body class not the system class --- src/modules/swiftest_classes.f90 | 2 +- src/modules/whm_classes.f90 | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/modules/swiftest_classes.f90 b/src/modules/swiftest_classes.f90 index f55b1b016..a1d4d4f78 100644 --- a/src/modules/swiftest_classes.f90 +++ b/src/modules/swiftest_classes.f90 @@ -135,6 +135,7 @@ module swiftest_classes !> An abstract class for a generic collection of Swiftest bodies type, abstract, public, extends(swiftest_base) :: swiftest_body !! Superclass that defines the generic elements of a Swiftest particle + logical :: lfirst = .true. !! Run the current step as a first integer(I4B) :: nbody = 0 !! Number of bodies integer(I4B), dimension(:), allocatable :: name !! External identifier integer(I4B), dimension(:), allocatable :: status !! An integrator-specific status indicator @@ -258,7 +259,6 @@ module swiftest_classes real(DP) :: pe = 0.0_DP !! System potential energy real(DP) :: te = 0.0_DP !! System total energy real(DP), dimension(NDIM) :: htot = 0.0_DP !! System angular momentum vector - logical :: lfirst = .true. !! Run the current step as a first contains private !> Each integrator will have its own version of the step diff --git a/src/modules/whm_classes.f90 b/src/modules/whm_classes.f90 index 52f87249b..502fa9be3 100644 --- a/src/modules/whm_classes.f90 +++ b/src/modules/whm_classes.f90 @@ -29,7 +29,6 @@ module whm_classes real(DP), dimension(:), allocatable :: ir3j !! Third term of heliocentric acceleration !! Note to developers: If you add componenets to this class, be sure to update methods and subroutines that traverse the !! component list, such as whm_setup_pl and whm_spill_pl - logical :: lfirst = .true. contains procedure, public :: h2j => whm_coord_h2j_pl !! Convert position and velcoity vectors from heliocentric to Jacobi coordinates procedure, public :: j2h => whm_coord_j2h_pl !! Convert position and velcoity vectors from Jacobi to helliocentric coordinates @@ -56,7 +55,6 @@ module whm_classes type, public, extends(swiftest_tp) :: whm_tp !! Note to developers: If you add componenets to this class, be sure to update methods and subroutines that traverse the !! component list, such as whm_setup_tp and whm_spill_tp - logical :: lfirst = .true. contains private procedure, public :: drift => whm_drift_tp !! Loop through test particles and call Danby drift routine