Skip to content

Bug Fixes #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Bug Fixes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21aa3c8
Enable Multiple Force Calculations
Aug 26, 2019
dae7ae6
Refactor force functions
Aug 26, 2019
221aee8
Merge branch 'master' into dev
Janderion47 Sep 1, 2019
ebf2143
Merge branch 'master' into dev
Sep 8, 2019
e9836d0
Bug Fixes
Sep 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FundamentalForces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def calculate_gravity(a_pos, a_type, b_pos, b_type):


def calculate_electromagnetic(a_pos, a_type, b_pos, b_type):
if a_type or b_type == 'n':
if a_type == "n" or b_type == 'n':
return [0, 0]

x_diff = b_pos[0] - a_pos[0]
Expand Down
8 changes: 4 additions & 4 deletions ParticleSimulator_2D.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ def __init__(self, particletype, position, acceleration, velocity):
continue
force = [0, 0]
# Gravity function
force += calculate_gravity(a_position, a_type, b_position, b_type)
g_force = calculate_gravity(a_position, a_type, b_position, b_type)
# Electromagnetic Function
force += calculate_electromagnetic(a_position, a_type, b_position, b_type)
e_force = calculate_electromagnetic(a_position, a_type, b_position, b_type)
# Strong Nuclear Force Function

fx_total += force[0]
fy_total += force[1]
fx_total += force[0] + g_force[0] + e_force[0]
fy_total += force[1] + g_force[1] + e_force[1]

a_acceleration[0] = fx_total / a_mass
a_acceleration[1] = fy_total / a_mass
Expand Down