Post-merge fixes

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;

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);

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"};

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;