From 12e478a52f89d529d37f4f3f84d6160b5da51fc4 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Mon, 29 Aug 2016 21:05:00 +0100
Subject: [PATCH] Post-merge fixes
---
src/cell.h | 2 +-
src/cooling.c | 2 +-
src/task.c | 2 +-
src/task.h | 2 --
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/cell.h b/src/cell.h
index 4abf5cfaa6..50da679524 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -159,7 +159,7 @@ struct cell {
struct task *grav_external;
/* Task for cooling */
- struct task *cooling_task;
+ struct task *cooling;
/* Number of tasks that are associated with this cell. */
int nr_tasks;
diff --git a/src/cooling.c b/src/cooling.c
index 1e9d02e44b..2bc717600a 100644
--- a/src/cooling.c
+++ b/src/cooling.c
@@ -98,7 +98,7 @@ void update_entropy(const struct phys_const* const phys_const, const struct Unit
float u_old;
float u_new;
float new_entropy;
- float old_entropy = p->entropy;
+ //float old_entropy = p->entropy;
float rho = p->rho;
// u_old = old_entropy/(GAMMA_MINUS1) * pow(rho,GAMMA_MINUS1);
diff --git a/src/task.c b/src/task.c
index de2fbe0160..0aa2d844d5 100644
--- a/src/task.c
+++ b/src/task.c
@@ -51,7 +51,7 @@ const char *taskID_names[task_type_count] = {
"none", "sort", "self", "pair", "sub_self",
"sub_pair", "init", "ghost", "extra_ghost", "kick",
"kick_fixdt", "send", "recv", "grav_gather_m", "grav_fft",
- "grav_mm", "grav_up", "grav_external"};
+ "grav_mm", "grav_up", "grav_external", "cooling"};
const char *subtaskID_names[task_subtype_count] = {
"none", "density", "gradient", "force", "grav", "tend"};
diff --git a/src/task.h b/src/task.h
index 0b5700430c..0b28dba5fd 100644
--- a/src/task.h
+++ b/src/task.h
@@ -100,8 +100,6 @@ struct task {
/*! Sub-type of the task (for the tasks that have one */
enum task_subtypes subtype;
- char skip, tight, implicit;
- int flags, wait, rank, weight;
/*! Flags used to carry additional information (e.g. sort directions) */
int flags;
--
GitLab