Skip to content

Included failsafe and edited break condition #16

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
kyliow wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Included failsafe and edited break condition #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c6d29f
Included failsafe and edited break condition
kyliow Oct 27, 2021
b57c132
Flatten new_masses
kyliow Oct 28, 2021
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
7 changes: 5 additions & 2 deletions src/amuse/ext/masc/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@ def new_fixed_mass_distribution(
mass = mass[mass.cumsum() < stellar_mass]

additional_mass = [] | units.MSun
while True:
if previous_number_of_stars + len(additional_mass) > len(mass):
count_failsafe = 0
while count_failsafe > 10:
if len(mass) > number_of_stars:
break
# We don't have enough stars yet, or at least not tested this
additional_mass = initial_mass_function(
Expand All @@ -102,6 +103,7 @@ def new_fixed_mass_distribution(
mass.sum() + additional_mass.cumsum() < stellar_mass
]
mass.append(additional_mass)
count_failsafe += 1
number_of_stars = len(mass)
else:
# Give stars their mass
Expand All @@ -111,6 +113,7 @@ def new_fixed_mass_distribution(
mass_max=upper_mass_limit,
)

mass = mass.flatten()
return mass


Expand Down