diff --git a/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb b/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb index fbe6d8246..6e3effc7c 100644 --- a/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb +++ b/examples/symba_swifter_comparison/1pl_1tp_encounter/swiftest_vs_swifter.ipynb @@ -81,8 +81,8 @@ { "data": { "text/plain": [ - "[,\n", - " ]" + "[,\n", + " ]" ] }, "execution_count": 6, @@ -91,7 +91,7 @@ }, { "data": { - "image/png": "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\n", + "image/png": "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\n", "text/plain": [ "
" ] @@ -106,6 +106,536 @@ "swiftdiff['px'].plot.line(x=\"time (y)\")" ] }, + { + "cell_type": "code", + "execution_count": 7, + "metadata": {}, + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "
<xarray.DataArray 'px' (time (y): 199, id: 2)>\n",
+       "array([[ 0.00000000e+00,  0.00000000e+00],\n",
+       "       [ 0.00000000e+00, -7.12220460e-09],\n",
+       "       [ 0.00000000e+00, -2.84900827e-08],\n",
+       "       [ 0.00000000e+00, -6.41074152e-08],\n",
+       "       [ 0.00000000e+00, -1.13980512e-07],\n",
+       "       [ 0.00000000e+00, -1.78118202e-07],\n",
+       "       [ 0.00000000e+00, -2.56531852e-07],\n",
+       "       [ 0.00000000e+00, -3.49235353e-07],\n",
+       "       [ 0.00000000e+00, -4.56245140e-07],\n",
+       "       [ 0.00000000e+00, -5.77580189e-07],\n",
+       "       [ 0.00000000e+00, -7.13262030e-07],\n",
+       "       [ 0.00000000e+00, -8.63314745e-07],\n",
+       "       [ 0.00000000e+00, -1.02776499e-06],\n",
+       "       [ 0.00000000e+00, -1.20664199e-06],\n",
+       "       [ 0.00000000e+00, -1.39997756e-06],\n",
+       "       [ 0.00000000e+00, -1.60780612e-06],\n",
+       "       [ 0.00000000e+00, -1.83016468e-06],\n",
+       "       [ 0.00000000e+00, -2.06709291e-06],\n",
+       "       [ 0.00000000e+00, -2.31863308e-06],\n",
+       "       [ 0.00000000e+00, -2.58483014e-06],\n",
+       "...\n",
+       "       [-4.44089210e-16, -5.00980628e-04],\n",
+       "       [-1.22124533e-15, -5.18253726e-04],\n",
+       "       [-3.33066907e-15, -5.36896942e-04],\n",
+       "       [-4.44089210e-15, -5.57134011e-04],\n",
+       "       [-5.44009282e-15, -5.79246689e-04],\n",
+       "       [-5.44009282e-15, -6.03596238e-04],\n",
+       "       [-5.32907052e-15, -6.30655877e-04],\n",
+       "       [-5.21804822e-15, -6.61061384e-04],\n",
+       "       [-5.10702591e-15, -6.95693612e-04],\n",
+       "       [-4.99600361e-15, -7.35820563e-04],\n",
+       "       [-4.99600361e-15, -7.83359285e-04],\n",
+       "       [ 1.33226763e-15, -8.41403959e-04],\n",
+       "       [ 4.77395901e-15, -9.15431516e-04],\n",
+       "       [-2.22044605e-16, -1.01661465e-03],\n",
+       "       [ 3.77475828e-15, -1.17430457e-03],\n",
+       "       [ 1.29488925e-06, -1.53697214e-03],\n",
+       "       [ 3.16460020e-03,  1.93749443e-03],\n",
+       "       [ 3.17685641e-03,  3.61711129e-02],\n",
+       "       [ 3.18905387e-03,  7.04843014e-02],\n",
+       "       [ 3.20119234e-03,             nan]])\n",
+       "Coordinates:\n",
+       "  * id        (id) int64 2 100\n",
+       "  * time (y)  (time (y)) float64 0.0 0.0006845 0.001369 ... 0.1342 0.1348 0.1355
" + ], + "text/plain": [ + "\n", + "array([[ 0.00000000e+00, 0.00000000e+00],\n", + " [ 0.00000000e+00, -7.12220460e-09],\n", + " [ 0.00000000e+00, -2.84900827e-08],\n", + " [ 0.00000000e+00, -6.41074152e-08],\n", + " [ 0.00000000e+00, -1.13980512e-07],\n", + " [ 0.00000000e+00, -1.78118202e-07],\n", + " [ 0.00000000e+00, -2.56531852e-07],\n", + " [ 0.00000000e+00, -3.49235353e-07],\n", + " [ 0.00000000e+00, -4.56245140e-07],\n", + " [ 0.00000000e+00, -5.77580189e-07],\n", + " [ 0.00000000e+00, -7.13262030e-07],\n", + " [ 0.00000000e+00, -8.63314745e-07],\n", + " [ 0.00000000e+00, -1.02776499e-06],\n", + " [ 0.00000000e+00, -1.20664199e-06],\n", + " [ 0.00000000e+00, -1.39997756e-06],\n", + " [ 0.00000000e+00, -1.60780612e-06],\n", + " [ 0.00000000e+00, -1.83016468e-06],\n", + " [ 0.00000000e+00, -2.06709291e-06],\n", + " [ 0.00000000e+00, -2.31863308e-06],\n", + " [ 0.00000000e+00, -2.58483014e-06],\n", + "...\n", + " [-4.44089210e-16, -5.00980628e-04],\n", + " [-1.22124533e-15, -5.18253726e-04],\n", + " [-3.33066907e-15, -5.36896942e-04],\n", + " [-4.44089210e-15, -5.57134011e-04],\n", + " [-5.44009282e-15, -5.79246689e-04],\n", + " [-5.44009282e-15, -6.03596238e-04],\n", + " [-5.32907052e-15, -6.30655877e-04],\n", + " [-5.21804822e-15, -6.61061384e-04],\n", + " [-5.10702591e-15, -6.95693612e-04],\n", + " [-4.99600361e-15, -7.35820563e-04],\n", + " [-4.99600361e-15, -7.83359285e-04],\n", + " [ 1.33226763e-15, -8.41403959e-04],\n", + " [ 4.77395901e-15, -9.15431516e-04],\n", + " [-2.22044605e-16, -1.01661465e-03],\n", + " [ 3.77475828e-15, -1.17430457e-03],\n", + " [ 1.29488925e-06, -1.53697214e-03],\n", + " [ 3.16460020e-03, 1.93749443e-03],\n", + " [ 3.17685641e-03, 3.61711129e-02],\n", + " [ 3.18905387e-03, 7.04843014e-02],\n", + " [ 3.20119234e-03, nan]])\n", + "Coordinates:\n", + " * id (id) int64 2 100\n", + " * time (y) (time (y)) float64 0.0 0.0006845 0.001369 ... 0.1342 0.1348 0.1355" + ] + }, + "execution_count": 7, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "swiftdiff['px']" + ] + }, { "cell_type": "code", "execution_count": null, diff --git a/src/symba/symba_encounter_check.f90 b/src/symba/symba_encounter_check.f90 index 87f227058..17383f9c0 100644 --- a/src/symba/symba_encounter_check.f90 +++ b/src/symba/symba_encounter_check.f90 @@ -71,6 +71,7 @@ module function symba_encounter_check_pltpenc(self, system, dt, irec) result(lan real(DP) :: rlim2, rji2 lany_encounter = .false. + if (self%nenc == 0) return select type(self) class is (symba_plplenc) isplpl = .true. diff --git a/src/symba/symba_step.f90 b/src/symba/symba_step.f90 index d34956f4b..0ef7f8df8 100644 --- a/src/symba/symba_step.f90 +++ b/src/symba/symba_step.f90 @@ -86,9 +86,9 @@ module subroutine symba_step_interp_system(self, param, t, dt) call pl%kick(dth) call tp%kick(dth) - call pl%vh2vb(cb) + call pl%vb2vh(cb) call pl%lindrift(cb, dth, lbeg=.false.) - call tp%vh2vb(vbcb = -cb%ptend) + call tp%vb2vh(vbcb = -cb%ptend) call tp%lindrift(cb, dth, lbeg=.false.) end select end select diff --git a/src/symba/symba_util.f90 b/src/symba/symba_util.f90 index c356d686b..031ae4ae5 100644 --- a/src/symba/symba_util.f90 +++ b/src/symba/symba_util.f90 @@ -55,12 +55,13 @@ module subroutine symba_util_resize_pltpenc(self, nrequested) integer(I4B) :: nold nold = size(self%status) - if (nrequested <= nold) return - allocate(enc_temp, source=self) - call self%setup(2 * nrequested) - call self%copy(enc_temp) + if (nrequested > nold) then + allocate(enc_temp, source=self) + call self%setup(2 * nrequested) + call self%copy(enc_temp) + deallocate(enc_temp) + end if self%nenc = nrequested - deallocate(enc_temp) return end subroutine symba_util_resize_pltpenc