mirror/rebound-collisions
1
0
Fork 0
mirror of https://github.com/Findus23/rebound-collisions.git synced 2024-09-19 15:53:48 +02:00
Code Releases Activity

reorder radius utils

Browse source
This commit is contained in:
Lukas Winkler 2021-05-21 16:01:23 +02:00
parent d50923c036
commit 68e1099e0f
Signed by: lukas
GPG key ID: 54DE4D798D244853
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
utils/__init__.py
View file

@ -4,3 +4,4 @@ from .math import *
from .os_tools import * from .os_tools import *
from .plotting import * from .plotting import *
from .simulation import * from .simulation import *
from .radius import *

0
radius_utils.py → utils/radius.py
View file

11
water_sim.py
View file

@ -14,9 +14,8 @@ from scipy.constants import astronomical_unit, mega, year
from extradata import ExtraData, ParticleData from extradata import ExtraData, ParticleData
from merge import merge_particles from merge import merge_particles
from radius_utils import PlanetaryRadius
from utils import unique_hash, filename_from_argv, innermost_period, total_momentum, process_friendlyness, total_mass, \ from utils import unique_hash, filename_from_argv, innermost_period, total_momentum, process_friendlyness, total_mass, \
third_kepler_law, solar_radius, git_hash, check_heartbeat_needs_recompile third_kepler_law, solar_radius, git_hash, check_heartbeat_needs_recompile, PlanetaryRadius
MIN_TIMESTEP_PER_ORBIT = 20 MIN_TIMESTEP_PER_ORBIT = 20
@ -51,7 +50,7 @@ def main(fn: Path, testrun=False):
with open(fn.with_suffix(".yaml")) as f: with open(fn.with_suffix(".yaml")) as f:
parameters = Parameters(**yaml.safe_load(f)) parameters = Parameters(**yaml.safe_load(f))
else: else:
parameters = Parameters(perfect_merging=True, initcon_file="initcon/conditions_many.input") parameters = Parameters(perfect_merging=False, initcon_file="initcon/conditions_many.input")
# set up a fresh simulation # set up a fresh simulation
sim = Simulation() sim = Simulation()
@ -123,9 +122,13 @@ def main(fn: Path, testrun=False):
if columns[1] == 0: # that should not be needed, but nevertheless is if columns[1] == 0: # that should not be needed, but nevertheless is
part = Particle(m=columns[0], hash=hash, r=solar_radius / astronomical_unit) part = Particle(m=columns[0], hash=hash, r=solar_radius / astronomical_unit)
else: else:
inc = columns[3]
if testrun:
# force particles to collide early when running tests
inc /= 1000
part = Particle( part = Particle(
m=columns[0], a=columns[1], e=columns[2], m=columns[0], a=columns[1], e=columns[2],
inc=columns[3], omega=columns[4], inc=inc, omega=columns[4],
Omega=columns[5], M=columns[6], Omega=columns[5], M=columns[6],
simulation=sim, simulation=sim,
hash=hash, hash=hash,