Commit 915c6fbd authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

No unwanted changes

parent b740f32d
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
* 2015 Peter W. Draper (p.w.draper@durham.ac.uk) * 2015 Peter W. Draper (p.w.draper@durham.ac.uk)
* 2016 John A. Regan (john.a.regan@durham.ac.uk) * 2016 John A. Regan (john.a.regan@durham.ac.uk)
* Tom Theuns (tom.theuns@durham.ac.uk) * Tom Theuns (tom.theuns@durham.ac.uk)
* Stefan Arridge (stefan.arridge@durham.ac.uk)
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published * it under the terms of the GNU Lesser General Public License as published
......
...@@ -1814,11 +1814,8 @@ void space_init(struct space *s, const struct swift_params *params, ...@@ -1814,11 +1814,8 @@ void space_init(struct space *s, const struct swift_params *params,
} else { } else {
for (size_t k = 0; k < Npart; k++) for (size_t k = 0; k < Npart; k++)
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
if (parts[k].x[j] < 0 || parts[k].x[j] >= dim[j]) { if (parts[k].x[j] < 0 || parts[k].x[j] >= dim[j])
printf("parts[%lld].x[%d] = %f , dim[%d] = %f\n", k, j,
parts[k].x[j], j, dim[j]);
error("Not all particles are within the specified domain."); error("Not all particles are within the specified domain.");
}
} }
/* Same for the gparts */ /* Same for the gparts */
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
/* This object's header. */ /* This object's header. */
#include "task.h" #include "task.h"
/* Local headers. */ /* Local headers. */
#include "atomic.h" #include "atomic.h"
#include "error.h" #include "error.h"
......
...@@ -53,7 +53,6 @@ enum task_types { ...@@ -53,7 +53,6 @@ enum task_types {
task_type_grav_fft, task_type_grav_fft,
task_type_grav_mm, task_type_grav_mm,
task_type_grav_up, task_type_grav_up,
task_type_grav_external,
task_type_cooling, task_type_cooling,
task_type_sourceterms, task_type_sourceterms,
task_type_count task_type_count
......
...@@ -320,6 +320,9 @@ void units_get_base_unit_exponants_array(float baseUnitsExp[5], ...@@ -320,6 +320,9 @@ void units_get_base_unit_exponants_array(float baseUnitsExp[5],
case UNIT_CONV_VOLUME: case UNIT_CONV_VOLUME:
baseUnitsExp[UNIT_LENGTH] = 3.f; baseUnitsExp[UNIT_LENGTH] = 3.f;
case UNIT_CONV_INV_VOLUME:
baseUnitsExp[UNIT_LENGTH] = -3.f;
} }
} }
......
...@@ -59,7 +59,6 @@ enum BaseUnits { ...@@ -59,7 +59,6 @@ enum BaseUnits {
UNIT_LENGTH = 1, UNIT_LENGTH = 1,
UNIT_TIME = 2, UNIT_TIME = 2,
UNIT_CURRENT = 3, UNIT_CURRENT = 3,
UNIT_TEMPERATURE = 4 UNIT_TEMPERATURE = 4
}; };
......
Supports Markdown
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