Skip to content
Snippets Groups Projects
Commit 4647f1b1 authored by Wegener, Johannes's avatar Wegener, Johannes
Browse files

Umbenennen und Aufräumen + README.txt

parent fb6a74a3
No related branches found
No related tags found
No related merge requests found
'particle_simulation.py', ehemals 'geodyn_final.py', ist unser vorzeigecode für die partikelsimulation.
'solarsystem.py', ehemals 'geodyn_update.py', ist unser vorzeigecode für die sonnensystemsimulation.
'_particle_sim_1.py', ehemals 'geodyn_new.py', wird nicht mehr benötigt und wurde deswegen umbenannt. die aktuelle version dieses codes ist 'particle_simulation.py'.
'_solarsystem.py', ehemals 'geodyn.py', ist die alte version von 'geodyn_update.py' und wird nicht mehr benötigt.
\ No newline at end of file
...@@ -2,7 +2,7 @@ from random import random ...@@ -2,7 +2,7 @@ from random import random
from sklearn.metrics import mean_poisson_deviance from sklearn.metrics import mean_poisson_deviance
#from geodyn import simulation #from geodyn import simulation
from geodyn_update import Particle from solarsystem import Particle
import numpy as np import numpy as np
from numpy import empty, sqrt, sign from numpy import empty, sqrt, sign
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
......
File moved
This diff is collapsed.
...@@ -2,7 +2,7 @@ from random import random ...@@ -2,7 +2,7 @@ from random import random
from sklearn.metrics import mean_poisson_deviance from sklearn.metrics import mean_poisson_deviance
#from geodyn import simulation #from geodyn import simulation
from geodyn_update import Particle from solarsystem import Particle
import numpy as np import numpy as np
from numpy import empty, sqrt, sign from numpy import empty, sqrt, sign
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
...@@ -346,12 +346,9 @@ class Cluster(): ...@@ -346,12 +346,9 @@ class Cluster():
ax.plot3D(body.pos_x_history, ax.plot3D(body.pos_x_history,
body.pos_y_history, body.pos_z_history, body.pos_y_history, body.pos_z_history,
color=body.color) color=body.color)
plt.xlabel('x [m]', fontsize=16) ax.set_xlabel('x [m]')
plt.ylabel('y [m]', fontsize=16) ax.set_ylabel('y [m]')
plt.zlabel('z [m]', fontsize=16) ax.set_zlabel('z [m]')
plt.tick_params(axis='x', labelsize=16)
plt.tick_params(axis='y', labelsize=16)
plt.tick_params(axis='z', labelsize=16)
ax.set_xlim3d(-30000,70000) ax.set_xlim3d(-30000,70000)
ax.set_ylim3d(-100000,100000) ax.set_ylim3d(-100000,100000)
ax.set_zlim3d(-100000,100000) ax.set_zlim3d(-100000,100000)
...@@ -396,10 +393,10 @@ class Cluster(): ...@@ -396,10 +393,10 @@ class Cluster():
# Initialization, simulation and plotting # Initialization, simulation and plotting
solarsystem = Cluster(timesteps=int(365*24*100)) solarsystem = Cluster(timesteps=int(365*24*100))
solarsystem.create_bodies(num_bodies=30, min_mass=10 ** 2, max_mass=10 ** 7, max_radius=10 ** 4, max_vel=10 ** (-5), s='2D') solarsystem.create_bodies(num_bodies=30, min_mass=10 ** 2, max_mass=10 ** 7, max_radius=10 ** 4, max_vel=10 ** (-5), s='3D')
solarsystem.simulation(dt=86400 / 24) solarsystem.simulation(dt=86400 / 24)
solarsystem.plot2d() solarsystem.plot2d()
# solarsystem.plot3d() solarsystem.plot3d()
solarsystem._return_collisions() solarsystem._return_collisions()
# solarsystem.animation2d() # solarsystem.animation2d()
# solarsystem._return_collisions() # solarsystem._return_collisions()
\ No newline at end of file
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment