diff --git a/src/cell.h b/src/cell.h index dfe0261f628799980111f4bedb8fcfdad90ef043..ae22de0cb268bb5240c480b2eed9435ec218adf8 100644 --- a/src/cell.h +++ b/src/cell.h @@ -5,7 +5,6 @@ * 2015 Peter W. Draper (p.w.draper@durham.ac.uk) * 2016 John A. Regan (john.a.regan@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 * it under the terms of the GNU Lesser General Public License as published diff --git a/src/space.c b/src/space.c index a907f880cd13cb7a4dfacacd029589f61e406009..86c8cc36eacd58c89181831b3c5472026281043c 100644 --- a/src/space.c +++ b/src/space.c @@ -1814,11 +1814,8 @@ void space_init(struct space *s, const struct swift_params *params, } else { for (size_t k = 0; k < Npart; k++) for (int j = 0; j < 3; 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]); + if (parts[k].x[j] < 0 || parts[k].x[j] >= dim[j]) error("Not all particles are within the specified domain."); - } } /* Same for the gparts */ diff --git a/src/task.c b/src/task.c index 277739c2b60b3b6600cf360cb8a565e93b98bdd4..54b9363b7ac3d5c372b591c00b0b03cc274f66b5 100644 --- a/src/task.c +++ b/src/task.c @@ -39,6 +39,7 @@ /* This object's header. */ #include "task.h" + /* Local headers. */ #include "atomic.h" #include "error.h" diff --git a/src/task.h b/src/task.h index 3861f89ea4ba3a903f78d08d27c42b0cd2b11d1b..f840c0b4b8e807dce28f6f13479dbdf4995ab66d 100644 --- a/src/task.h +++ b/src/task.h @@ -53,7 +53,6 @@ enum task_types { task_type_grav_fft, task_type_grav_mm, task_type_grav_up, - task_type_grav_external, task_type_cooling, task_type_sourceterms, task_type_count diff --git a/src/units.c b/src/units.c index c6262ced329528eb99538bfb8d99e2da189f78a6..2241d441ec9af9b6d5083191e8f61010ebaccb20 100644 --- a/src/units.c +++ b/src/units.c @@ -320,6 +320,9 @@ void units_get_base_unit_exponants_array(float baseUnitsExp[5], case UNIT_CONV_VOLUME: baseUnitsExp[UNIT_LENGTH] = 3.f; + + case UNIT_CONV_INV_VOLUME: + baseUnitsExp[UNIT_LENGTH] = -3.f; } } diff --git a/src/units.h b/src/units.h index 8761f12d6976125537545e14ad12e88db0f36a6f..78fdf1c23c3c276607d5353ee3437d8eb1e96537 100644 --- a/src/units.h +++ b/src/units.h @@ -59,7 +59,6 @@ enum BaseUnits { UNIT_LENGTH = 1, UNIT_TIME = 2, UNIT_CURRENT = 3, - UNIT_TEMPERATURE = 4 };