Merge branch 'debug'

MintonGroup · Aug 17, 2021 · d7c009a · d7c009a
2 parents f19c68d + d44b452
commit d7c009a
Show file tree

Hide file tree

Showing 36 changed files with 17,864 additions and 1,699 deletions.
diff --git a/examples/symba_mars_disk/mars.in b/examples/symba_mars_disk/mars.in
@@ -1,4 +1,16 @@
 1500        ! Mars System in SI units
+727 1.71022032e+06 2.13948145e+04       ! particle number mass Rhill
+1.24108926e+04                    !particle radius in m
+-8.12608230e+06 -4.37306608e+06 -9.62736144e+03      ! x y z 
+9.87984575e+02 -1.88769371e+03 1.06882012e+01       ! vx vy vz 
+0.4 0.4 0.4 ! Ip
+0.0 0.0 0.0 ! rot
+231 6.25152932e+05 1.58916481e+04       ! particle number mass Rhill
+8.87389776e+03                    !particle radius in m
+-8.21586374e+06 -4.28792953e+06 2.41010139e+04      ! x y z 
+1.01581225e+03 -1.90933511e+03 -2.60449634e+00       ! vx vy vz 
+0.4 0.4 0.4 ! Ip
+0.0 0.0 0.0 ! rot
 2 9.90685589e+04 8.35558297e+03       ! particle number mass Rhill
 7.07643092e+03                    !particle radius in m
 -2.35807426e+06 8.60445552e+06 1.25224401e+04      ! x y z 
@@ -1373,12 +1385,6 @@
 -1.24261883e+03 1.71209694e+03 -6.95777672e+00       ! vx vy vz 
 0.4 0.4 0.4 ! Ip
 0.0 0.0 0.0 ! rot
-231 6.25152932e+05 1.58916481e+04       ! particle number mass Rhill
-8.87389776e+03                    !particle radius in m
--8.21586374e+06 -4.28792953e+06 2.41010139e+04      ! x y z 
-1.01581225e+03 -1.90933511e+03 -2.60449634e+00       ! vx vy vz 
-0.4 0.4 0.4 ! Ip
-0.0 0.0 0.0 ! rot
 232 1.02687634e+05 1.54462392e+04       ! particle number mass Rhill
 4.85987440e+03                    !particle radius in m
 1.62736579e+07 2.82256969e+06 3.66384128e+04      ! x y z 
@@ -4349,12 +4355,6 @@
 -1.87648989e+03 1.17295601e+03 -5.20044045e-01       ! vx vy vz 
 0.4 0.4 0.4 ! Ip
 0.0 0.0 0.0 ! rot
-727 1.71022032e+06 2.13948145e+04       ! particle number mass Rhill
-1.24108926e+04                    !particle radius in m
--8.12608230e+06 -4.37306608e+06 -9.62736144e+03      ! x y z 
-9.87984575e+02 -1.88769371e+03 1.06882012e+01       ! vx vy vz 
-0.4 0.4 0.4 ! Ip
-0.0 0.0 0.0 ! rot
 728 7.56089690e+05 4.18623276e+04       ! particle number mass Rhill
 9.45460600e+03                    !particle radius in m
 -2.34951111e+05 2.32053308e+07 -5.22036528e+04      ! x y z 

diff --git a/examples/symba_mars_disk/param.in b/examples/symba_mars_disk/param.in
@@ -22,9 +22,9 @@ CHK_QMIN_RANGE 3389500.0 338950000000.0
 EXTRA_FORCE    no
 BIG_DISCARD    no
 RHILL_PRESENT  yes
-GMTINY          1000.0
+GMTINY         1000.0
 ENERGY         yes
-FRAGMENTATION  yes
+FRAGMENTATION  no  
 ROTATION       yes
 MU2KG          1.0
 DU2M           1.0

diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/param.swifter.in b/examples/symba_swifter_comparison/1pl_1pl_encounter/param.swifter.in
@@ -24,3 +24,4 @@ ENC_OUT        enc.swifter.dat
 EXTRA_FORCE    no
 BIG_DISCARD    no
 RHILL_PRESENT  yes
+ENERGY         yes
diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/swiftest_vs_swifter.ipynb b/examples/symba_swifter_comparison/1pl_1pl_encounter/swiftest_vs_swifter.ipynb
diff --git a/examples/symba_swifter_comparison/mars_disk/cb.in b/examples/symba_swifter_comparison/mars_disk/cb.in
@@ -0,0 +1,7 @@
+0  ! id
+4.28388662e+13 ! G*mass
+3389500.0 ! radius
+0.0 ! J2
+0.0 ! J4
+0.4 0.4 0.4 ! Ip
+0.0 0.0 0.0 ! rot
diff --git a/examples/symba_swifter_comparison/mars_disk/param.swifter.in b/examples/symba_swifter_comparison/mars_disk/param.swifter.in
@@ -0,0 +1,27 @@
+T0             0.0 
+TSTOP          3000.0 
+DT             600.0
+PL_IN          pl.swifter.in
+TP_IN          tp.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             0.0
+J4             0.0
+CHK_CLOSE      yes
+CHK_RMIN       3389500.0
+CHK_RMAX       3389500000.0
+CHK_EJECT      3389500000.0
+CHK_QMIN       3389500.0
+CHK_QMIN_COORD HELIO
+CHK_QMIN_RANGE 3389500.0 338950000000.0
+ENC_OUT        /dev/null
+EXTRA_FORCE    no
+BIG_DISCARD    no
+RHILL_PRESENT  yes
+WALLTIME       yes
+ENERGY         yes
diff --git a/examples/symba_swifter_comparison/mars_disk/param.swiftest.in b/examples/symba_swifter_comparison/mars_disk/param.swiftest.in
@@ -0,0 +1,32 @@
+!Parameter file for the SyMBA-RINGMOONS test
+T0             0.0 
+TSTOP          3000.0 
+DT             600.0
+PL_IN          pl.swiftest.in
+TP_IN          tp.in
+IN_TYPE        ASCII
+ISTEP_OUT      1
+ISTEP_DUMP     1
+BIN_OUT        bin.swiftest.dat
+PARTICLE_OUT   particle.dat
+OUT_TYPE       REAL8
+OUT_FORM       XV
+OUT_STAT       REPLACE
+CHK_CLOSE      yes
+CHK_RMIN       3389500.0
+CHK_RMAX       3389500000.0
+CHK_EJECT      3389500000.0
+CHK_QMIN       3389500.0
+CHK_QMIN_COORD HELIO
+CHK_QMIN_RANGE 3389500.0 338950000000.0
+EXTRA_FORCE    no
+BIG_DISCARD    no
+RHILL_PRESENT  yes
+GMTINY         1000.0
+ENERGY         yes
+FRAGMENTATION  yes 
+ROTATION       yes
+MU2KG          1.0
+DU2M           1.0
+TU2S           1.0
+SEED           2 3080983 2220830
diff --git a/examples/symba_swifter_comparison/mars_disk/pl.swifter.in b/examples/symba_swifter_comparison/mars_disk/pl.swifter.in