Commit 65e0568d authored by lhausamm's avatar lhausamm

Change chemistry_data -> chemistry_global_data

parent 1d36b82d
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
void chemistry_init(const struct swift_params* parameter_file, void chemistry_init(const struct swift_params* parameter_file,
const struct unit_system* us, const struct unit_system* us,
const struct phys_const* phys_const, const struct phys_const* phys_const,
struct chemistry_data* data) { struct chemistry_global_data* data) {
chemistry_init_backend(parameter_file, us, phys_const, data); chemistry_init_backend(parameter_file, us, phys_const, data);
} }
...@@ -46,9 +46,9 @@ void chemistry_init(const struct swift_params* parameter_file, ...@@ -46,9 +46,9 @@ void chemistry_init(const struct swift_params* parameter_file,
* *
* Calls chemistry_print_backend for the chosen chemistry model. * Calls chemistry_print_backend for the chosen chemistry model.
* *
* @brief The #chemistry_data containing information about the current model. * @brief The #chemistry_global_data containing information about the current model.
*/ */
void chemistry_print(const struct chemistry_data* data) { void chemistry_print(const struct chemistry_global_data* data) {
chemistry_print_backend(data); chemistry_print_backend(data);
} }
......
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
void chemistry_init(const struct swift_params* parameter_file, void chemistry_init(const struct swift_params* parameter_file,
const struct unit_system* us, const struct unit_system* us,
const struct phys_const* phys_const, const struct phys_const* phys_const,
struct chemistry_data* data); struct chemistry_global_data* data);
void chemistry_print(const struct chemistry_data* data); void chemistry_print(const struct chemistry_global_data* data);
/* Dump/restore. */ /* Dump/restore. */
void chemistry_struct_dump(const struct chemistry_data* chemistry, void chemistry_struct_dump(const struct chemistry_data* chemistry,
......
...@@ -5202,7 +5202,7 @@ void engine_init( ...@@ -5202,7 +5202,7 @@ void engine_init(
const struct hydro_props *hydro, struct gravity_props *gravity, const struct hydro_props *hydro, struct gravity_props *gravity,
const struct external_potential *potential, const struct external_potential *potential,
const struct cooling_function_data *cooling_func, const struct cooling_function_data *cooling_func,
const struct chemistry_data *chemistry, struct sourceterms *sourceterms) { const struct chemistry_global_data *chemistry, struct sourceterms *sourceterms) {
/* Clean-up everything */ /* Clean-up everything */
bzero(e, sizeof(struct engine)); bzero(e, sizeof(struct engine));
......
...@@ -287,7 +287,7 @@ struct engine { ...@@ -287,7 +287,7 @@ struct engine {
const struct cooling_function_data *cooling_func; const struct cooling_function_data *cooling_func;
/* Properties of the chemistry model */ /* Properties of the chemistry model */
const struct chemistry_data *chemistry; const struct chemistry_global_data *chemistry;
/* Properties of source terms */ /* Properties of source terms */
struct sourceterms *sourceterms; struct sourceterms *sourceterms;
...@@ -338,7 +338,7 @@ void engine_init( ...@@ -338,7 +338,7 @@ void engine_init(
const struct hydro_props *hydro, struct gravity_props *gravity, const struct hydro_props *hydro, struct gravity_props *gravity,
const struct external_potential *potential, const struct external_potential *potential,
const struct cooling_function_data *cooling_func, const struct cooling_function_data *cooling_func,
const struct chemistry_data *chemistry, struct sourceterms *sourceterms); const struct chemistry_global_data *chemistry, struct sourceterms *sourceterms);
void engine_config(int restart, struct engine *e, void engine_config(int restart, struct engine *e,
const struct swift_params *params, int nr_nodes, int nodeID, const struct swift_params *params, int nr_nodes, int nodeID,
int nr_threads, int with_aff, int verbose, int nr_threads, int with_aff, int verbose,
......
...@@ -2640,7 +2640,7 @@ void space_synchronize_particle_positions(struct space *s) { ...@@ -2640,7 +2640,7 @@ void space_synchronize_particle_positions(struct space *s) {
* Calls chemistry_first_init_part() on all the particles * Calls chemistry_first_init_part() on all the particles
*/ */
void space_first_init_parts(struct space *s, void space_first_init_parts(struct space *s,
const struct chemistry_data *chemistry, const struct chemistry_global_data *chemistry,
const struct cooling_function_data *cool_func) { const struct cooling_function_data *cool_func) {
const size_t nr_parts = s->nr_parts; const size_t nr_parts = s->nr_parts;
......
...@@ -226,7 +226,7 @@ void space_do_parts_sort(); ...@@ -226,7 +226,7 @@ void space_do_parts_sort();
void space_do_gparts_sort(); void space_do_gparts_sort();
void space_do_sparts_sort(); void space_do_sparts_sort();
void space_first_init_parts(struct space *s, void space_first_init_parts(struct space *s,
const struct chemistry_data *chemistry, const struct chemistry_global_data *chemistry,
const struct cooling_function_data *cool_func); const struct cooling_function_data *cool_func);
void space_first_init_gparts(struct space *s, void space_first_init_gparts(struct space *s,
const struct gravity_props *grav_props); const struct gravity_props *grav_props);
......
Markdown is supported
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