From 619a525c5b0bcc9d82cd718414b1f49625d1376b Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 17 Jun 2021 11:12:31 -0400 Subject: [PATCH 1/3] Removed associate statement used for debugging that I needed before I got the intel debugger working properly --- src/rmvs/rmvs_step.f90 | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/rmvs/rmvs_step.f90 b/src/rmvs/rmvs_step.f90 index be62331aa..bc6eea6ec 100644 --- a/src/rmvs/rmvs_step.f90 +++ b/src/rmvs/rmvs_step.f90 @@ -98,8 +98,6 @@ subroutine rmvs_step_out(pl, cb, tp, dt, config) rts = RHPSCALE lencounter = tp%encounter_check(cb, pl, dt, rts) if (lencounter) then - associate(xbeg => pl%outer(outer_index - 1)%x(:, :), xend => pl%outer(outer_index )%x(:, :), & - tpxbeg => tp%xbeg, tpxend => tp%xend) ! Interpolate planets in inner encounter region call rmvs_interp_in(pl, cb, dto, outer_index, config) ! Step through the inner region @@ -108,7 +106,6 @@ subroutine rmvs_step_out(pl, cb, tp, dt, config) tp%lfirst = .true. call tp%step(cb, pl, config, outer_time, dto) tp%lfirst = lfirsttp - end associate else call tp%step(cb, pl, config, outer_time, dto) end if From 378b91dc0e508b4ed86944243d4ba73d968a802c Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 17 Jun 2021 11:13:42 -0400 Subject: [PATCH 2/3] Changed input files in example for troubleshooting --- .../9pl_18tp_encounters/config.swiftest.in | 2 +- .../9pl_18tp_encounters/param.swifter.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/config.swiftest.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/config.swiftest.in index ce9a380aa..a46c4abbd 100644 --- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/config.swiftest.in +++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/config.swiftest.in @@ -1,6 +1,6 @@ ! Swiftest input file generated using init_cond.py T0 0 -TSTOP 365.25 +TSTOP 80.0 DT 1.0 CB_IN cb.swiftest.in PL_IN pl.swiftest.in diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in index 1f400dfb2..23506c7f0 100644 --- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in +++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/param.swifter.in @@ -1,6 +1,6 @@ ! Swifter input file generated using init_cond.py T0 0 -TSTOP 365.25 +TSTOP 80.0 DT 1.0 PL_IN pl.swifter.in TP_IN tp.in From 60706702d2190ae6e18f07c4426b7b1b8714f770 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 17 Jun 2021 11:14:24 -0400 Subject: [PATCH 3/3] Simplified tp.in to only include the one particle that is giving me trouble --- .../9pl_18tp_encounters/tp.in | 53 +------------------ 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in index c17f59612..a71e3325c 100644 --- a/examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in +++ b/examples/rmvs_swifter_comparison/9pl_18tp_encounters/tp.in @@ -1,55 +1,4 @@ -18 -101 -0.008082903154349985 -0.4615820430265793 -0.03846017738329229 -0.025090740792557683 0.001934639213990692 -0.001904656977422976 -110 -0.008036781741686682 -0.46162816443924254 -0.03846017738329229 -0.019883641848539375 0.001934639213990692 -0.001904656977422976 -102 --0.5115303112484343 0.5031390851942046 0.03642547299277956 --0.007907923549198176 -0.01452868630179309 0.0006232072038298823 -111 --0.5116447318293788 0.5030246646132601 0.03642547299277956 --0.02060239095988896 -0.01452868630179309 0.0006232072038298823 -103 --0.10894183284815118 -1.0098335771038265 4.823302918632528e-05 -0.023719359459963285 -0.001910549762056979 3.992660742687128e-08 -112 --0.10906228866003023 -1.0099540329157057 4.823302918632528e-05 -0.009930478991415534 -0.001910549762056979 3.992660742687128e-08 -104 --1.3428658869178822 0.9778975536820278 0.05343398538723887 --0.004632836547169314 -0.01011917844182223 -2.287744801261131e-05 -113 --1.34292997174539 0.97783346885452 0.05343398538723887 --0.010791794743617099 -0.01011917844182223 -2.287744801261131e-05 -105 -3.923845092422412 -3.167758871475071 -0.0746147877972047 -0.04153776984063323 0.006232623300954468 -0.0001300429201057457 -114 -3.9225232944062176 -3.169080669491265 -0.0746147877972047 --0.03222666456266163 0.006232623300954468 -0.0001300429201057457 -106 -6.186344955150397 -7.803624345449696 -0.110498432926239 -0.026180002087518608 0.003458637040736611 -0.0002219310939327014 -115 -6.185243970440136 -7.804725330159957 -0.110498432926239 --0.01804633567954857 0.003458637040736611 -0.0002219310939327014 -107 -14.929337415534302 12.929736493716492 -0.1454099139559955 -0.01049520557801523 0.002795888198858545 4.391864857782088e-05 -116 -14.928857899559898 12.929256977742087 -0.1454099139559955 --0.015694321499308557 0.002795888198858545 4.391864857782088e-05 -108 -29.544394452699596 -4.716688841268022 -0.5838030174427992 -0.014914899434230449 0.00312573757291745 -7.53264045199501e-05 +1 117 29.543928927807162 -4.717154366160452 -0.5838030174427992 -0.013956372192325811 0.00312573757291745 -7.53264045199501e-05 -109 -14.544494696107316 -31.052223962419365 -0.8828000265625595 -0.003711039980269588 0.0006625916902153526 -0.0009142553677224461 -118 -14.544472229076623 -31.052246429450054 -0.8828000265625595 -0.00213511525511389 0.0006625916902153526 -0.0009142553677224461