Fixed bugs in encounter checking coming from mismatched argument list…

… in encounter_check_one
MintonGroup · Sep 27, 2021 · bff585f · bff585f
1 parent 11dc4dd
commit bff585f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/encounter/encounter.f90 b/src/encounter/encounter.f90
@@ -200,7 +200,7 @@ module subroutine encounter_check_all_triangular_pltp(npl, ntp, xpl, vpl, xtp, v
    end subroutine encounter_check_all_triangular_pltp
 
 
-   module pure subroutine encounter_check_one(xr, yr, zr, vxr, vyr, vzr, dt, renc, lencounter, lvdotr)
+   module pure subroutine encounter_check_one(xr, yr, zr, vxr, vyr, vzr, renc, dt, lencounter, lvdotr)
       !$omp declare simd(encounter_check_one)
       !! author: David A. Minton
       !!
@@ -212,8 +212,8 @@ module pure subroutine encounter_check_one(xr, yr, zr, vxr, vyr, vzr, dt, renc,
       ! Arguments
       real(DP), intent(in)  :: xr, yr, zr    !! Relative distance vector components
       real(DP), intent(in)  :: vxr, vyr, vzr !! Relative velocity vector components
-      real(DP), intent(in)  :: dt            !! Step size
       real(DP), intent(in)  :: renc        !! Square of the critical encounter distance
+      real(DP), intent(in)  :: dt            !! Step size
       logical,  intent(out) :: lencounter    !! Flag indicating that an encounter has occurred
       logical,  intent(out) :: lvdotr        !! Logical flag indicating the direction of the v .dot. r vector
       ! Internals

diff --git a/src/modules/swiftest_classes.f90 b/src/modules/swiftest_classes.f90
@@ -612,13 +612,13 @@ module subroutine encounter_check_all_triangular_pltp(npl, ntp, xpl, vpl, xtp, v
          integer(I4B),                            intent(out) :: nenc   !! Total number of encounters
       end subroutine encounter_check_all_triangular_pltp
 
-      module pure subroutine encounter_check_one(xr, yr, zr, vxr, vyr, vzr, dt, renc, lencounter, lvdotr)
+      module pure subroutine encounter_check_one(xr, yr, zr, vxr, vyr, vzr, renc, dt, lencounter, lvdotr)
          !$omp declare simd(encounter_check_one)
          implicit none
          real(DP), intent(in)  :: xr, yr, zr    !! Relative distance vector components
          real(DP), intent(in)  :: vxr, vyr, vzr !! Relative velocity vector components
-         real(DP), intent(in)  :: dt            !! Step size
          real(DP), intent(in)  :: renc          !! Critical encounter distance
+         real(DP), intent(in)  :: dt            !! Step size
          logical,  intent(out) :: lencounter    !! Flag indicating that an encounter has occurred
          logical,  intent(out) :: lvdotr        !! Logical flag indicating the direction of the v .dot. r vector
       end subroutine encounter_check_one