diff --git a/examples/symba_energy_momentum/collision_movie.py b/examples/symba_energy_momentum/collision_movie.py index 32be77e8d..2cf98a46d 100644 --- a/examples/symba_energy_momentum/collision_movie.py +++ b/examples/symba_energy_momentum/collision_movie.py @@ -11,7 +11,7 @@ ymax = 20.0 #cases = ['supercat_head', 'supercat_off', 'disruption_head', 'disruption_off'] -cases = ['disruption_off'] +cases = ['disruption_off', 'supercat_off'] def scale_sim(ds, config): @@ -302,6 +302,10 @@ def data_stream(self, frame=0): animfile = 'movies/disruption_headon.mp4' titletext = "Disruption- Head on" configfile = 'param.disruption_headon.in' + elif case == 'merger': + animfile = 'movies/merger.mp4' + titletext = "Merger" + configfile = 'param.merger.in' else: print(f'{case} is an unknown case') exit(-1) diff --git a/examples/symba_energy_momentum/disruption_off_axis.in b/examples/symba_energy_momentum/disruption_off_axis.in index 5773eee19..220bd74d5 100644 --- a/examples/symba_energy_momentum/disruption_off_axis.in +++ b/examples/symba_energy_momentum/disruption_off_axis.in @@ -9,10 +9,10 @@ 1.0 -4.20E-05 0.0 0.00 6.28 0.0 0.4 0.4 0.4 !Ip -0.0 0.0 0.0 !rot +0.0 0.0 6.0e4 !rot 3 7e-10 0.0004 3.25e-06 1.0 4.20E-05 0.0 -0.80 -6.28 0.0 0.4 0.4 0.4 !Ip -0.0 0.0 0.0 !rot +0.0 0.0 1.0e5 !rot diff --git a/examples/symba_energy_momentum/param.merger.in b/examples/symba_energy_momentum/param.merger.in index 7c52e6ba0..1155e1b60 100644 --- a/examples/symba_energy_momentum/param.merger.in +++ b/examples/symba_energy_momentum/param.merger.in @@ -1,10 +1,7 @@ -! -! Parameter file for Mars in SI units -! T0 0.0e0 -TSTOP 0.10 ! simulation length in seconds = 100 years -DT 0.01 ! stepsize in seconds -PL_IN merger.in +TSTOP 0.000100 ! simulation length in seconds = 100 years +DT 0.0000001 ! stepsize in seconds +PL_IN disruption_off_axis.in TP_IN tp.in IN_TYPE ASCII ISTEP_OUT 1 ! output cadence every year @@ -17,8 +14,8 @@ ISTEP_DUMP 1 ! system dump cadence J2 0.0 ! no J2 term J4 0.0 ! no J4 term CHK_CLOSE yes ! check for planetary close encounters -CHK_RMIN 3389.5e3 -CHK_RMAX 3389.5e6 +CHK_RMIN 0.005 +CHK_RMAX 1e6 CHK_EJECT -1.0 ! ignore this check CHK_QMIN -1.0 ! ignore this check !CHK_QMIN_COORD HELIO ! commented out here @@ -27,13 +24,10 @@ ENC_OUT enc.merger.dat EXTRA_FORCE no ! no extra user-defined forces BIG_DISCARD no ! output all planets if anything discarded RHILL_PRESENT yes ! Hill's sphere radii in input file -MTINY 1.0e-6 -FRAGMENTATION yes -MU2KG 1.0 -TU2S 1.0 -DU2M 1.0 -!MU2KG 1.98908e30 -!TU2S 3.1556925e7 -!DU2M 1.49598e11 +MTINY 1.0e-16 +FRAGMENTATION no +MU2KG 1.98908e30 +TU2S 3.1556925e7 +DU2M 1.49598e11 ENERGY yes ROTATION yes diff --git a/examples/symba_energy_momentum/supercatastrophic_off_axis.in b/examples/symba_energy_momentum/supercatastrophic_off_axis.in index 92ed6c564..a97b82237 100644 --- a/examples/symba_energy_momentum/supercatastrophic_off_axis.in +++ b/examples/symba_energy_momentum/supercatastrophic_off_axis.in @@ -9,10 +9,10 @@ 1.0 -4.20E-05 0.0 0.00 6.28 0.0 0.4 0.4 0.4 !Ip -0.0 0.0 0.0 !rot +0.0 0.0 -6.0e4 !rot 3 1e-08 0.0004 3.25e-06 1.0 4.20E-05 0.0 1.00 -6.28 0.0 0.4 0.4 0.4 !Ip -0.0 0.0 0.0 !rot +0.0 0.0 1.0e5 !rot