Added new SyMBA examples and fixed bugs in encounter list resizing.

examples/symba_swifter_comparison/1pl_1tp_encounter/init_cond.py

@@ -0,0 +1,178 @@
+#!/usr/bin/env python3
+"""
+For testing RMVS, the code generates clones of test particles based on one that is fated to impact Mercury.
+To use the script, modify the variables just after the  "if __name__ == '__main__':" line
+"""
+import numpy as np
+import swiftest 
+from scipy.io import FortranFile
+import sys
+
+swifter_input  = "param.swifter.in"
+swifter_pl     = "pl.swifter.in"
+swifter_tp     = "tp.swifter.in"
+swifter_bin    = "bin.swifter.dat"
+swifter_enc    = "enc.swifter.dat"
+
+swiftest_input = "param.swiftest.in"
+swiftest_pl    = "pl.swiftest.in"
+swiftest_tp    = "tp.swiftest.in"
+swiftest_cb    = "cb.swiftest.in"
+swiftest_bin   = "bin.swiftest.dat"
+swiftest_enc   = "enc.swiftest.dat"
+
+MU2KG = swiftest.MSun
+TU2S = swiftest.YR2S
+DU2M = swiftest.AU2M
+
+GMSun = swiftest.GMSunSI * TU2S**2 / DU2M**3
+
+# Simple initial conditions of a circular planet with one test particle in a close encounter state
+# Simulation start, stop, and output cadence times
+t_0	  = 0 # simulation start time
+deltaT	= 0.25 * swiftest.JD2S / TU2S   # simulation step size
+end_sim = 0.15
+t_print = deltaT  #output interval to print results
+
+iout = int(np.ceil(t_print / deltaT))
+rmin = swiftest.RSun / swiftest.AU2M
+rmax = 1000.0
+
+npl = 1
+plid = 2
+tpid = 100
+
+radius = np.double(4.25875607065041e-05)
+mass = np.double(0.00012002693582795244940133) 
+apl = np.longdouble(1.0)
+atp = np.longdouble(1.01)
+vpl = np.longdouble(2 * np.pi)
+vtp = np.longdouble(2 * np.pi / np.sqrt(atp))
+
+p_pl = np.array([apl, 0.0, 0.0], dtype=np.double)
+v_pl = np.array([0.0, vpl, 0.0], dtype=np.double)
+
+p_tp = np.array([atp, 0.0, 0.0], dtype=np.double)
+v_tp = np.array([0.0, vtp, 0.0], dtype=np.double)
+
+Rhill = apl * 0.0100447248332378922085
+
+#Make Swifter files
+plfile = open(swifter_pl, 'w')
+print(npl+1, f'! Planet input file generated using init_cond.py',file=plfile)
+print(1,GMSun,file=plfile)
+print('0.0 0.0 0.0',file=plfile)
+print('0.0 0.0 0.0',file=plfile)
+print(plid,"{:.23g}".format(mass),Rhill, file=plfile)
+print(radius, file=plfile)
+print(*p_pl, file=plfile)
+print(*v_pl, file=plfile)
+plfile.close()
+
+tpfile = open(swifter_tp, 'w')
+print(1,file=tpfile)
+print(tpid, file=tpfile)
+print(*p_tp, file=tpfile)
+print(*v_tp, file=tpfile)
+tpfile.close()
+
+sys.stdout = open(swifter_input, "w")
+print(f'! Swifter input file generated using init_cond.py')
+print(f'T0            {t_0} ')
+print(f'TSTOP         {end_sim}')
+print(f'DT            {deltaT}')
+print(f'PL_IN         {swifter_pl}')
+print(f'TP_IN         {swifter_tp}')
+print(f'IN_TYPE       ASCII')
+print(f'ISTEP_OUT     {iout:d}')
+print(f'ISTEP_DUMP    {iout:d}')
+print(f'BIN_OUT       {swifter_bin}')
+print(f'OUT_TYPE      REAL8')
+print(f'OUT_FORM      XV')
+print(f'OUT_STAT      UNKNOWN')
+print(f'J2            {swiftest.J2Sun}')
+print(f'J4            {swiftest.J4Sun}')
+print(f'CHK_CLOSE     yes')
+print(f'CHK_RMIN      {rmin}')
+print(f'CHK_RMAX      {rmax}')
+print(f'CHK_EJECT     {rmax}')
+print(f'CHK_QMIN      {rmin}')
+print(f'CHK_QMIN_COORD HELIO')
+print(f'CHK_QMIN_RANGE {rmin} {rmax}')
+print(f'ENC_OUT        {swifter_enc}')
+print(f'EXTRA_FORCE    no')
+print(f'BIG_DISCARD    no')
+print(f'RHILL_PRESENT  yes')
+sys.stdout = sys.__stdout__
+
+#Now make Swiftest files
+cbfile = FortranFile(swiftest_cb, 'w')
+Msun = np.double(1.0)
+cbfile.write_record(0)
+cbfile.write_record(np.double(GMSun))
+cbfile.write_record(np.double(rmin))
+cbfile.write_record(np.double(swiftest.J2Sun))
+cbfile.write_record(np.double(swiftest.J4Sun))
+cbfile.close()
+
+plfile = FortranFile(swiftest_pl, 'w')
+plfile.write_record(npl)
+
+plfile.write_record(plid)
+plfile.write_record(p_pl[0])
+plfile.write_record(p_pl[1])
+plfile.write_record(p_pl[2])
+plfile.write_record(v_pl[0])
+plfile.write_record(v_pl[1])
+plfile.write_record(v_pl[2])
+plfile.write_record(mass)
+plfile.write_record(radius)
+plfile.close()
+tpfile = FortranFile(swiftest_tp, 'w')
+ntp = 1
+tpfile.write_record(ntp)
+tpfile.write_record(tpid)
+tpfile.write_record(p_tp[0])
+tpfile.write_record(p_tp[1])
+tpfile.write_record(p_tp[2])
+tpfile.write_record(v_tp[0])
+tpfile.write_record(v_tp[1])
+tpfile.write_record(v_tp[2])
+
+tpfile.close()
+
+sys.stdout = open(swiftest_input, "w")
+print(f'! Swiftest input file generated using init_cond.py')
+print(f'T0             {t_0} ')
+print(f'TSTOP          {end_sim}')
+print(f'DT             {deltaT}')
+print(f'CB_IN          {swiftest_cb}')
+print(f'PL_IN          {swiftest_pl}')
+print(f'TP_IN          {swiftest_tp}')
+print(f'IN_TYPE        REAL8')
+print(f'ISTEP_OUT      {iout:d}')
+print(f'ISTEP_DUMP     {iout:d}')
+print(f'BIN_OUT        {swiftest_bin}')
+print(f'OUT_TYPE       REAL8')
+print(f'OUT_FORM       XV')
+print(f'OUT_STAT       REPLACE')
+print(f'CHK_CLOSE      yes')
+print(f'CHK_RMIN       {rmin}')
+print(f'CHK_RMAX       {rmax}')
+print(f'CHK_EJECT      {rmax}')
+print(f'CHK_QMIN       {rmin}')
+print(f'CHK_QMIN_COORD HELIO')
+print(f'CHK_QMIN_RANGE {rmin} {rmax}')
+print(f'ENC_OUT        {swiftest_enc}')
+print(f'EXTRA_FORCE    no')
+print(f'BIG_DISCARD    no')
+print(f'ROTATION       no')
+print(f'GR             no')
+print(f'MU2KG          {MU2KG}')
+print(f'DU2M           {DU2M}')
+print(f'TU2S           {TU2S}')
+
+
+
+
+

examples/symba_swifter_comparison/1pl_1tp_encounter/param.swifter.in

@@ -0,0 +1,26 @@
+! Swifter input file generated using init_cond.py
+T0            0 
+TSTOP         0.15
+DT            0.0006844626967830253
+PL_IN         pl.swifter.in
+TP_IN         tp.swifter.in
+IN_TYPE       ASCII
+ISTEP_OUT     1
+ISTEP_DUMP    1
+BIN_OUT       bin.swifter.dat
+OUT_TYPE      REAL8
+OUT_FORM      XV
+OUT_STAT      UNKNOWN
+J2            2.198e-07
+J4            -4.805e-09
+CHK_CLOSE     yes
+CHK_RMIN      0.004650467260962157
+CHK_RMAX      1000.0
+CHK_EJECT     1000.0
+CHK_QMIN      0.004650467260962157
+CHK_QMIN_COORD HELIO
+CHK_QMIN_RANGE 0.004650467260962157 1000.0
+ENC_OUT        enc.swifter.dat
+EXTRA_FORCE    no
+BIG_DISCARD    no
+RHILL_PRESENT  yes

examples/symba_swifter_comparison/1pl_1tp_encounter/param.swiftest.in

@@ -0,0 +1,29 @@
+! Swiftest input file generated using init_cond.py
+T0             0 
+TSTOP          0.15
+DT             0.0006844626967830253
+CB_IN          cb.swiftest.in
+PL_IN          pl.swiftest.in
+TP_IN          tp.swiftest.in
+IN_TYPE        REAL8
+ISTEP_OUT      1
+ISTEP_DUMP     1
+BIN_OUT        bin.swiftest.dat
+OUT_TYPE       REAL8
+OUT_FORM       XV
+OUT_STAT       REPLACE
+CHK_CLOSE      yes
+CHK_RMIN       0.004650467260962157
+CHK_RMAX       1000.0
+CHK_EJECT      1000.0
+CHK_QMIN       0.004650467260962157
+CHK_QMIN_COORD HELIO
+CHK_QMIN_RANGE 0.004650467260962157 1000.0
+ENC_OUT        enc.swiftest.dat
+EXTRA_FORCE    no
+BIG_DISCARD    no
+ROTATION       no
+GR             no
+MU2KG          1.988409870698051e+30
+DU2M           149597870700.0
+TU2S           31557600.0

examples/symba_swifter_comparison/1pl_1tp_encounter/pl.swifter.in

@@ -0,0 +1,8 @@
+2 ! Planet input file generated using init_cond.py
+1 39.476926408897625196
+0.0 0.0 0.0
+0.0 0.0 0.0
+2 0.00012002693582795244940133 0.010044724833237891545
+4.25875607065041e-05
+1.0 0.0 0.0
+0.0 6.283185307179586 0.0

examples/symba_swifter_comparison/1pl_1tp_encounter/tp.swifter.in

@@ -0,0 +1,4 @@
+1
+100
+1.01 0.0 0.0
+0.0 6.252003053624663 0.0

examples/symba_swifter_comparison/9pl_18tp_encounters/cb.in

@@ -0,0 +1,5 @@
+0
+0.00029591220819207774
+0.004650467260962157
+4.7535806948127355e-12
+-2.2473967953572827e-18

examples/symba_swifter_comparison/9pl_18tp_encounters/cb.swiftest.in

@@ -0,0 +1,5 @@
+0
+0.00029591220819207774
+0.004650467260962157
+4.7535806948127355e-12
+-2.2473967953572827e-18