From 6b6defc1a075deadaacc14d0cf5e5a86b7705b64 Mon Sep 17 00:00:00 2001
From: Tom Theuns <tom.theuns@durham.ac.uk>
Date: Tue, 20 Sep 2016 12:22:28 +0100
Subject: [PATCH] merged with master
---
examples/main.c | 12 ++++++------
src/engine.c | 4 ++--
src/engine.h | 4 ++--
src/sourceterms.c | 4 ++--
src/sourceterms.h | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/examples/main.c b/examples/main.c
index 15d0fdb78f..a8abb93839 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -444,14 +444,14 @@ int main(int argc, char *argv[]) {
if (with_external_gravity && myrank == 0) potential_print(&potential);
/* Initialise the cooling function properties */
- struct cooling_data cooling;
- if (with_cooling) cooling_init(params, &us, &prog_const, &cooling);
- if (with_cooling && myrank == 0) cooling_print(&cooling);
+ struct cooling_function_data cooling_func;
+ if (with_cooling) cooling_init(params, &us, &prog_const, &cooling_func);
+ if (with_cooling && myrank == 0) cooling_print(&cooling_func);
/* Initialise the feedback properties */
struct sourceterms sourceterms;
- if (with_sourceterms) source_terms_init(params, &us, &sourceterms);
- if (with_sourceterms && myrank == 0) source_terms_print(&sourceterms);
+ if (with_sourceterms) sourceterms_init(params, &us, &sourceterms);
+ if (with_sourceterms && myrank == 0) sourceterms_print(&sourceterms);
/* Construct the engine policy */
int engine_policies = ENGINE_POLICY | engine_policy_steal;
@@ -468,7 +468,7 @@ int main(int argc, char *argv[]) {
struct engine e;
engine_init(&e, &s, params, nr_nodes, myrank, nr_threads, with_aff,
engine_policies, talking, &us, &prog_const, &hydro_properties,
- &potential, &cooling, &sourceterms);
+ &potential, &cooling_func, &sourceterms);
if (myrank == 0) {
clocks_gettime(&toc);
message("engine_init took %.3f %s.", clocks_diff(&tic, &toc),
diff --git a/src/engine.c b/src/engine.c
index 175eaec6de..f6ccd4a6b8 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -3188,7 +3188,7 @@ void engine_init(struct engine *e, struct space *s,
const struct phys_const *physical_constants,
const struct hydro_props *hydro,
const struct external_potential *potential,
- const struct cooling_data *cooling,
+ const struct cooling_function_data *cooling_func,
struct sourceterms *sourceterms) {
/* Clean-up everything */
@@ -3241,7 +3241,7 @@ void engine_init(struct engine *e, struct space *s,
e->physical_constants = physical_constants;
e->hydro_properties = hydro;
e->external_potential = potential;
- e->cooling_data = cooling;
+ e->cooling_func = cooling_func;
e->sourceterms = sourceterms;
e->parameter_file = params;
engine_rank = nodeID;
diff --git a/src/engine.h b/src/engine.h
index 914025c125..2f6c3f133f 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -207,7 +207,7 @@ struct engine {
const struct external_potential *external_potential;
/* Properties of the cooling scheme */
- const struct cooling_data *cooling_data;
+ const struct cooling_function_data *cooling_func;
/* Properties of source terms */
struct sourceterms *sourceterms;
@@ -228,7 +228,7 @@ void engine_init(struct engine *e, struct space *s,
const struct phys_const *physical_constants,
const struct hydro_props *hydro,
const struct external_potential *potential,
- const struct cooling_data *cooling,
+ const struct cooling_function_data *cooling,
struct sourceterms *sourceterms);
void engine_launch(struct engine *e, int nr_runners, unsigned int mask,
unsigned int submask);
diff --git a/src/sourceterms.c b/src/sourceterms.c
index eefd2c57de..6d424b8390 100644
--- a/src/sourceterms.c
+++ b/src/sourceterms.c
@@ -35,7 +35,7 @@
* @param us The current internal system of units
* @param source the structure that has all the source term properties
*/
-void source_terms_init(const struct swift_params* parameter_file,
+void sourceterms_init(const struct swift_params* parameter_file,
struct UnitSystem* us, struct sourceterms* source) {
#ifdef SN_FEEDBACK
@@ -54,7 +54,7 @@ void source_terms_init(const struct swift_params* parameter_file,
*
* @param source the structure that has all the source term properties
*/
-void source_terms_print(const struct sourceterms* source) {
+void sourceterms_print(struct sourceterms* source) {
#ifdef SN_FEEDBACK
message(
diff --git a/src/sourceterms.h b/src/sourceterms.h
index 463d8171a2..15e26cc708 100644
--- a/src/sourceterms.h
+++ b/src/sourceterms.h
@@ -30,9 +30,9 @@ struct sourceterms {
#endif
};
-void source_terms_init(const struct swift_params* parameter_file,
+void sourceterms_init(const struct swift_params* parameter_file,
struct UnitSystem* us, struct sourceterms* source);
-void source_terms_print(const struct sourceterms* source);
+void sourceterms_print(struct sourceterms* source);
#ifdef SN_FEEDBACK
#include "sourceterms/sn_feedback/sn_feedback.h"
#endif
--
GitLab