From 65e0568da0ea265fa6feb8afbdf8ca27610cf617 Mon Sep 17 00:00:00 2001
From: lhausamm <loic_hausammann@hotmail.com>
Date: Mon, 19 Mar 2018 11:24:49 +0100
Subject: [PATCH] Change chemistry_data -> chemistry_global_data
---
src/chemistry.c | 6 +++---
src/chemistry.h | 4 ++--
src/engine.c | 2 +-
src/engine.h | 4 ++--
src/space.c | 2 +-
src/space.h | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/chemistry.c b/src/chemistry.c
index 091a0b363d..fb327a5ede 100644
--- a/src/chemistry.c
+++ b/src/chemistry.c
@@ -36,7 +36,7 @@
void chemistry_init(const struct swift_params* parameter_file,
const struct unit_system* us,
const struct phys_const* phys_const,
- struct chemistry_data* data) {
+ struct chemistry_global_data* data) {
chemistry_init_backend(parameter_file, us, phys_const, data);
}
@@ -46,9 +46,9 @@ void chemistry_init(const struct swift_params* parameter_file,
*
* 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);
}
diff --git a/src/chemistry.h b/src/chemistry.h
index a5cbd77efb..d54c0c4801 100644
--- a/src/chemistry.h
+++ b/src/chemistry.h
@@ -46,9 +46,9 @@
void chemistry_init(const struct swift_params* parameter_file,
const struct unit_system* us,
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. */
void chemistry_struct_dump(const struct chemistry_data* chemistry,
diff --git a/src/engine.c b/src/engine.c
index aacaa4a89c..b5c9c848db 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -5202,7 +5202,7 @@ void engine_init(
const struct hydro_props *hydro, struct gravity_props *gravity,
const struct external_potential *potential,
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 */
bzero(e, sizeof(struct engine));
diff --git a/src/engine.h b/src/engine.h
index 4c37aab593..cd1b47f23f 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -287,7 +287,7 @@ struct engine {
const struct cooling_function_data *cooling_func;
/* Properties of the chemistry model */
- const struct chemistry_data *chemistry;
+ const struct chemistry_global_data *chemistry;
/* Properties of source terms */
struct sourceterms *sourceterms;
@@ -338,7 +338,7 @@ void engine_init(
const struct hydro_props *hydro, struct gravity_props *gravity,
const struct external_potential *potential,
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,
const struct swift_params *params, int nr_nodes, int nodeID,
int nr_threads, int with_aff, int verbose,
diff --git a/src/space.c b/src/space.c
index 3da35b64a3..05a0719224 100644
--- a/src/space.c
+++ b/src/space.c
@@ -2640,7 +2640,7 @@ void space_synchronize_particle_positions(struct space *s) {
* Calls chemistry_first_init_part() on all the particles
*/
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 size_t nr_parts = s->nr_parts;
diff --git a/src/space.h b/src/space.h
index 76d9369db2..b3f7f83965 100644
--- a/src/space.h
+++ b/src/space.h
@@ -226,7 +226,7 @@ void space_do_parts_sort();
void space_do_gparts_sort();
void space_do_sparts_sort();
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);
void space_first_init_gparts(struct space *s,
const struct gravity_props *grav_props);
--
GitLab