From 974e75a693027c0108abd027134250f7b06e07ad Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 19 Mar 2021 15:18:10 +0000 Subject: [PATCH 1/4] Restyled by black --- src/amuse/ext/masc/cluster.py | 106 ++++++++++++++++------------------ 1 file changed, 50 insertions(+), 56 deletions(-) diff --git a/src/amuse/ext/masc/cluster.py b/src/amuse/ext/masc/cluster.py index ae7cc1d..b90a510 100644 --- a/src/amuse/ext/masc/cluster.py +++ b/src/amuse/ext/masc/cluster.py @@ -24,6 +24,7 @@ from amuse.datamodel.particles import Particles from amuse.ic.plummer import new_plummer_sphere from amuse.ic.kingmodel import new_king_model + try: from amuse.ic.fractalcluster import new_fractal_cluster_model except ImportError: @@ -31,18 +32,18 @@ def new_star_cluster( - stellar_mass=False, - initial_mass_function="salpeter", - upper_mass_limit=125. | units.MSun, - lower_mass_limit=0.1 | units.MSun, - number_of_stars=1024, - effective_radius=3.0 | units.parsec, - star_distribution="plummer", - star_distribution_w0=7.0, - star_distribution_fd=2.0, - star_metallicity=0.01, - # initial_binary_fraction=0, - **kwargs + stellar_mass=False, + initial_mass_function="salpeter", + upper_mass_limit=125.0 | units.MSun, + lower_mass_limit=0.1 | units.MSun, + number_of_stars=1024, + effective_radius=3.0 | units.parsec, + star_distribution="plummer", + star_distribution_w0=7.0, + star_distribution_fd=2.0, + star_metallicity=0.01, + # initial_binary_fraction=0, + **kwargs ): """ Create stars. @@ -54,24 +55,28 @@ def new_star_cluster( imf_name = initial_mass_function.lower() if imf_name == "salpeter": from amuse.ic.salpeter import new_salpeter_mass_distribution + initial_mass_function = new_salpeter_mass_distribution elif imf_name == "kroupa": from amuse.ic.brokenimf import new_kroupa_mass_distribution + initial_mass_function = new_kroupa_mass_distribution elif imf_name == "flat": from amuse.ic.flatimf import new_flat_mass_distribution + initial_mass_function = new_flat_mass_distribution elif imf_name == "fixed": from amuse.ic.flatimf import new_flat_mass_distribution def new_fixed_mass_distribution( - number_of_particles, *list_arguments, **keyword_arguments + number_of_particles, *list_arguments, **keyword_arguments ): return new_flat_mass_distribution( number_of_particles, - mass_min=stellar_mass/number_of_stars, - mass_max=stellar_mass/number_of_stars, + mass_min=stellar_mass / number_of_stars, + mass_max=stellar_mass / number_of_stars, ) + initial_mass_function = new_fixed_mass_distribution else: raise ValueError("This imf is not implemented") @@ -104,7 +109,7 @@ def new_fixed_mass_distribution( converter = generic_unit_converter.ConvertBetweenGenericAndSiUnits( total_mass, - 1. | units.kms, + 1.0 | units.kms, effective_radius, ) # Give stars a position and velocity, based on the distribution model. @@ -158,27 +163,28 @@ def new_fixed_mass_distribution( stars.collection_attributes.star_metallicity = star_metallicity # Derived/legacy values - stars.collection_attributes.converter_mass = \ - converter.to_si(1 | nbody_system.mass) - stars.collection_attributes.converter_length =\ - converter.to_si(1 | nbody_system.length) - stars.collection_attributes.converter_speed =\ - converter.to_si(1 | nbody_system.speed) + stars.collection_attributes.converter_mass = converter.to_si(1 | nbody_system.mass) + stars.collection_attributes.converter_length = converter.to_si( + 1 | nbody_system.length + ) + stars.collection_attributes.converter_speed = converter.to_si( + 1 | nbody_system.speed + ) return stars def new_stars_from_sink( - origin, - upper_mass_limit=125 | units.MSun, - lower_mass_limit=0.1 | units.MSun, - default_radius=0.25 | units.pc, - velocity_dispersion=1 | units.kms, - logger=None, - initial_mass_function="kroupa", - distribution="random", - randomseed=None, - **keyword_arguments + origin, + upper_mass_limit=125 | units.MSun, + lower_mass_limit=0.1 | units.MSun, + default_radius=0.25 | units.pc, + velocity_dispersion=1 | units.kms, + logger=None, + initial_mass_function="kroupa", + distribution="random", + randomseed=None, + **keyword_arguments ): """ Form stars from an origin particle that keeps track of the properties of @@ -194,10 +200,7 @@ def new_stars_from_sink( except AttributeError: initialised = False if not initialised: - logger.debug( - "Initialising origin particle %i for star formation", - origin.key - ) + logger.debug("Initialising origin particle %i for star formation", origin.key) next_mass = new_star_cluster( initial_mass_function=initial_mass_function, upper_mass_limit=upper_mass_limit, @@ -210,8 +213,7 @@ def new_stars_from_sink( if origin.mass < origin.next_primary_mass: logger.debug( - "Not enough in star forming region %i to form the next star", - origin.key + "Not enough in star forming region %i to form the next star", origin.key ) return Particles() @@ -237,13 +239,8 @@ def new_stars_from_sink( except AttributeError: radius = default_radius rho = numpy.random.random(number_of_stars) * radius - theta = ( - numpy.random.random(number_of_stars) - * (2 * numpy.pi | units.rad) - ) - phi = ( - numpy.random.random(number_of_stars) * numpy.pi | units.rad - ) + theta = numpy.random.random(number_of_stars) * (2 * numpy.pi | units.rad) + phi = numpy.random.random(number_of_stars) * numpy.pi | units.rad x = rho * sin(phi) * cos(theta) y = rho * sin(phi) * sin(theta) z = rho * cos(phi) @@ -251,18 +248,15 @@ def new_stars_from_sink( new_stars.y += y new_stars.z += z - velocity_magnitude = numpy.random.normal( - scale=velocity_dispersion.value_in(units.kms), - size=number_of_stars, - ) | units.kms - velocity_theta = ( - numpy.random.random(number_of_stars) - * (2 * numpy.pi | units.rad) - ) - velocity_phi = ( - numpy.random.random(number_of_stars) - * (numpy.pi | units.rad) + velocity_magnitude = ( + numpy.random.normal( + scale=velocity_dispersion.value_in(units.kms), + size=number_of_stars, + ) + | units.kms ) + velocity_theta = numpy.random.random(number_of_stars) * (2 * numpy.pi | units.rad) + velocity_phi = numpy.random.random(number_of_stars) * (numpy.pi | units.rad) vx = velocity_magnitude * sin(velocity_phi) * cos(velocity_theta) vy = velocity_magnitude * sin(velocity_phi) * sin(velocity_theta) vz = velocity_magnitude * cos(velocity_phi) From b31bc1a2110fba3beb8c6448507686e43af01d08 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 19 Mar 2021 15:18:12 +0000 Subject: [PATCH 2/4] Restyled by isort --- src/amuse/ext/masc/cluster.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/amuse/ext/masc/cluster.py b/src/amuse/ext/masc/cluster.py index b90a510..343755e 100644 --- a/src/amuse/ext/masc/cluster.py +++ b/src/amuse/ext/masc/cluster.py @@ -13,17 +13,13 @@ """ import logging -import numpy -from amuse.units import ( - units, - nbody_system, - generic_unit_converter, -) -from amuse.units.trigo import sin, cos +import numpy from amuse.datamodel.particles import Particles -from amuse.ic.plummer import new_plummer_sphere from amuse.ic.kingmodel import new_king_model +from amuse.ic.plummer import new_plummer_sphere +from amuse.units import generic_unit_converter, nbody_system, units +from amuse.units.trigo import cos, sin try: from amuse.ic.fractalcluster import new_fractal_cluster_model From 26c0f56af4b531f3c06d0f36d7f63c72f80e38be Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 19 Mar 2021 15:18:16 +0000 Subject: [PATCH 3/4] Restyled by reorder-python-imports --- src/amuse/ext/masc/cluster.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/amuse/ext/masc/cluster.py b/src/amuse/ext/masc/cluster.py index 343755e..8a9f89e 100644 --- a/src/amuse/ext/masc/cluster.py +++ b/src/amuse/ext/masc/cluster.py @@ -11,15 +11,17 @@ -- Steven Rieder steven at rieder punt nl """ - import logging import numpy from amuse.datamodel.particles import Particles from amuse.ic.kingmodel import new_king_model from amuse.ic.plummer import new_plummer_sphere -from amuse.units import generic_unit_converter, nbody_system, units -from amuse.units.trigo import cos, sin +from amuse.units import generic_unit_converter +from amuse.units import nbody_system +from amuse.units import units +from amuse.units.trigo import cos +from amuse.units.trigo import sin try: from amuse.ic.fractalcluster import new_fractal_cluster_model From 21ab2a015bc55fbc205b93fa8da8dfeebad1d18e Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 19 Mar 2021 15:18:21 +0000 Subject: [PATCH 4/4] Restyled by yapf --- src/amuse/ext/masc/cluster.py | 90 ++++++++++++++++------------------- 1 file changed, 42 insertions(+), 48 deletions(-) diff --git a/src/amuse/ext/masc/cluster.py b/src/amuse/ext/masc/cluster.py index 8a9f89e..91e8b8c 100644 --- a/src/amuse/ext/masc/cluster.py +++ b/src/amuse/ext/masc/cluster.py @@ -30,19 +30,18 @@ def new_star_cluster( - stellar_mass=False, - initial_mass_function="salpeter", - upper_mass_limit=125.0 | units.MSun, - lower_mass_limit=0.1 | units.MSun, - number_of_stars=1024, - effective_radius=3.0 | units.parsec, - star_distribution="plummer", - star_distribution_w0=7.0, - star_distribution_fd=2.0, - star_metallicity=0.01, - # initial_binary_fraction=0, - **kwargs -): + stellar_mass=False, + initial_mass_function="salpeter", + upper_mass_limit=125.0 | units.MSun, + lower_mass_limit=0.1 | units.MSun, + number_of_stars=1024, + effective_radius=3.0 | units.parsec, + star_distribution="plummer", + star_distribution_w0=7.0, + star_distribution_fd=2.0, + star_metallicity=0.01, + # initial_binary_fraction=0, + **kwargs): """ Create stars. When using an IMF, either the stellar mass is fixed (within @@ -66,9 +65,8 @@ def new_star_cluster( elif imf_name == "fixed": from amuse.ic.flatimf import new_flat_mass_distribution - def new_fixed_mass_distribution( - number_of_particles, *list_arguments, **keyword_arguments - ): + def new_fixed_mass_distribution(number_of_particles, *list_arguments, + **keyword_arguments): return new_flat_mass_distribution( number_of_particles, mass_min=stellar_mass / number_of_stars, @@ -92,8 +90,7 @@ def new_fixed_mass_distribution( 1, mass_min=lower_mass_limit, mass_max=upper_mass_limit, - )[0] - ) + )[0]) total_mass = mass.sum() number_of_stars = len(mass) else: @@ -161,29 +158,26 @@ def new_fixed_mass_distribution( stars.collection_attributes.star_metallicity = star_metallicity # Derived/legacy values - stars.collection_attributes.converter_mass = converter.to_si(1 | nbody_system.mass) + stars.collection_attributes.converter_mass = converter.to_si( + 1 | nbody_system.mass) stars.collection_attributes.converter_length = converter.to_si( - 1 | nbody_system.length - ) + 1 | nbody_system.length) stars.collection_attributes.converter_speed = converter.to_si( - 1 | nbody_system.speed - ) + 1 | nbody_system.speed) return stars -def new_stars_from_sink( - origin, - upper_mass_limit=125 | units.MSun, - lower_mass_limit=0.1 | units.MSun, - default_radius=0.25 | units.pc, - velocity_dispersion=1 | units.kms, - logger=None, - initial_mass_function="kroupa", - distribution="random", - randomseed=None, - **keyword_arguments -): +def new_stars_from_sink(origin, + upper_mass_limit=125 | units.MSun, + lower_mass_limit=0.1 | units.MSun, + default_radius=0.25 | units.pc, + velocity_dispersion=1 | units.kms, + logger=None, + initial_mass_function="kroupa", + distribution="random", + randomseed=None, + **keyword_arguments): """ Form stars from an origin particle that keeps track of the properties of this region. @@ -198,21 +192,21 @@ def new_stars_from_sink( except AttributeError: initialised = False if not initialised: - logger.debug("Initialising origin particle %i for star formation", origin.key) + logger.debug("Initialising origin particle %i for star formation", + origin.key) next_mass = new_star_cluster( initial_mass_function=initial_mass_function, upper_mass_limit=upper_mass_limit, lower_mass_limit=lower_mass_limit, number_of_stars=1, - **keyword_arguments - ) + **keyword_arguments) origin.next_primary_mass = next_mass[0].mass origin.initialised = True if origin.mass < origin.next_primary_mass: logger.debug( - "Not enough in star forming region %i to form the next star", origin.key - ) + "Not enough in star forming region %i to form the next star", + origin.key) return Particles() mass_reservoir = origin.mass - origin.next_primary_mass @@ -246,15 +240,15 @@ def new_stars_from_sink( new_stars.y += y new_stars.z += z - velocity_magnitude = ( - numpy.random.normal( - scale=velocity_dispersion.value_in(units.kms), - size=number_of_stars, - ) - | units.kms + velocity_magnitude = (numpy.random.normal( + scale=velocity_dispersion.value_in(units.kms), + size=number_of_stars, ) - velocity_theta = numpy.random.random(number_of_stars) * (2 * numpy.pi | units.rad) - velocity_phi = numpy.random.random(number_of_stars) * (numpy.pi | units.rad) + | units.kms) + velocity_theta = numpy.random.random(number_of_stars) * (2 * numpy.pi + | units.rad) + velocity_phi = numpy.random.random(number_of_stars) * (numpy.pi + | units.rad) vx = velocity_magnitude * sin(velocity_phi) * cos(velocity_theta) vy = velocity_magnitude * sin(velocity_phi) * sin(velocity_theta) vz = velocity_magnitude * cos(velocity_phi)