From bff585f926ed4ebfd80ff9368dfb65c8ada5449f Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 27 Sep 2021 15:07:05 -0400 Subject: [PATCH] Fixed bugs in encounter checking coming from mismatched argument list in encounter_check_one --- src/encounter/encounter.f90 | 4 ++-- src/modules/swiftest_classes.f90 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/encounter/encounter.f90 b/src/encounter/encounter.f90 index 302f7b1b5..56e4aceb9 100644 --- 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 index ef6ad5f2c..4776dc0ba 100644 --- 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