diff --git a/src/cell.h b/src/cell.h index 7a5353bcae8cbb7ab4d50a546665a1a774a46aea..8ab3035f279e21db53c6f5939c839f3455abc05e 100644 --- a/src/cell.h +++ b/src/cell.h @@ -38,7 +38,7 @@ extern int cell_next_tag; struct pcell { /* Stats on this cell's particles. */ - double h_max, dt_min, dt_max; + double h_max, t_end_min, t_end_max; /* Number of particles in this cell. */ int count; @@ -62,8 +62,8 @@ struct cell { /* Max radii in this cell. */ double h_max; - /* Minimum and maximum dt in this cell. */ - double dt_min, dt_max; + /* Minimum and maximum end of time step in this cell. */ + double t_end_min, t_end_max; /* Minimum dimension, i.e. smallest edge of this cell. */ float dmin; diff --git a/src/part.h b/src/part.h index 380c2dedb2d7847c0d0efe937d0b24feb0a736f0..ee62a0a82a03e1b20167e7ba643795d716cd5f0b 100644 --- a/src/part.h +++ b/src/part.h @@ -1,6 +1,7 @@ /******************************************************************************* * This file is part of SWIFT. * Coypright (c) 2012 Pedro Gonnet (pedro.gonnet@durham.ac.uk) + * Matthieu Schaller (matthieu.schaller@durhm.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 @@ -60,8 +61,11 @@ struct gpart { /* Particle mass. */ float mass; - /* Particle time step. */ - float dt; + /* Particle time of beginning of time-step. */ + float t_begin; + + /* Particle time of end of time-step. */ + float t_end; /* Anonymous union for id/part. */ union { @@ -81,7 +85,7 @@ struct part { /* Particle position. */ double x[3]; - /* Particle velocity. */ + /* Particle predicted velocity. */ float v[3]; /* Particle acceleration. */ @@ -90,8 +94,11 @@ struct part { /* Particle cutoff radius. */ float h; - /* Particle time-step. */ - float dt; + /* Particle time of beginning of time-step. */ + float t_begin; + + /* Particle time of end of time-step. */ + float t_end; /* Particle internal energy. */ float u;