Commit 4298655c authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'remap_ids_in_ics' into 'master'

Cleverer ids for particle splitting

See merge request !1106
parents cd0f858e 976e21dd
......@@ -187,6 +187,9 @@ struct space {
/*! The total number of #bpart in the space. */
size_t nr_bparts;
/*! The total number of #sink in the space. */
size_t nr_sinks;
/*! The total number of #part we allocated memory for */
size_t size_parts;
......@@ -199,6 +202,9 @@ struct space {
/*! The total number of #bpart we allocated memory for */
size_t size_bparts;
/*! The total number of #sink we allocated memory for. */
size_t size_sinks;
/*! Number of inhibted gas particles in the space */
size_t nr_inhibited_parts;
......@@ -211,6 +217,9 @@ struct space {
/*! Number of inhibted black hole particles in the space */
size_t nr_inhibited_bparts;
/*! Number of inhibted sinks in the space */
size_t nr_inhibited_sinks;
/*! Number of extra #part we allocated (for on-the-fly creation) */
size_t nr_extra_parts;
......@@ -223,6 +232,9 @@ struct space {
/*! Number of extra #bpart we allocated (for on-the-fly creation) */
size_t nr_extra_bparts;
/*! Number of extra #sink we allocated (for on-the-fly creation) */
size_t nr_extra_sinks;
/*! The particle data (cells have pointers to this). */
struct part *parts;
......@@ -238,6 +250,9 @@ struct space {
/*! The b-particle data (cells have pointers to this). */
struct bpart *bparts;
/*! The sink particle data (cells have pointers to this). */
struct sink *sinks;
/*! Minimal mass of all the #part */
float min_part_mass;
......@@ -283,21 +298,6 @@ struct space {
/*! Structure dealing with the computation of a unique ID */
struct unique_id unique_id;
/*! The total number of #sink in the space. */
size_t nr_sinks;
/*! The total number of #sink we allocated memory for. */
size_t size_sinks;
/*! Number of inhibted sinks in the space */
size_t nr_inhibited_sinks;
/*! Number of extra #sink we allocated (for on-the-fly creation) */
size_t nr_extra_sinks;
/*! The particle data (cells have pointers to this). */
struct sink *sinks;
#ifdef WITH_MPI
/*! Buffers for parts that we will receive from foreign cells. */
......@@ -340,7 +340,7 @@ void space_init(struct space *s, struct swift_params *params,
struct gpart *gparts, struct sink *sinks, struct spart *sparts,
struct bpart *bparts, size_t Npart, size_t Ngpart, size_t Nsink,
size_t Nspart, size_t Nbpart, int periodic, int replicate,
int generate_gas_in_ics, int hydro, int gravity,
int remap_ids, int generate_gas_in_ics, int hydro, int gravity,
int star_formation, int DM_background, int verbose, int dry_run,
int nr_nodes);
void space_sanitize(struct space *s);
......@@ -400,6 +400,8 @@ void space_check_timesteps(const struct space *s);
void space_check_limiter(struct space *s);
void space_check_swallow(struct space *s);
void space_check_sort_flags(struct space *s);
void space_remap_ids(struct space *s, int nr_nodes, int verbose);
long long space_get_max_parts_id(struct space *s);
void space_replicate(struct space *s, int replicate, int verbose);
void space_generate_gas(struct space *s, const struct cosmology *cosmo,
const struct hydro_props *hydro_properties,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment