various small changes

hannorein · Jun 8, 2016 · 517491c · 517491c
1 parent fd5dc08
commit 517491c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/rebound/simulation.py b/rebound/simulation.py
@@ -1238,6 +1238,8 @@ def particles(self):
                 ("exit_max_distance", c_double),
                 ("exit_min_distance", c_double),
                 ("usleep", c_double),
+                ("track_energy_offset", c_int),
+                ("energy_offset", c_double),
                 ("boxsize", reb_vec3d),
                 ("boxsize_max", c_double),
                 ("root_size", c_double),
@@ -1252,8 +1254,6 @@ def particles(self):
                 ("collisions_allocatedN", c_int),
                 ("minimum_collision_celocity", c_double),
                 ("collisions_plog", c_double),
-                ("track_energy_offset", c_int),
-                ("energy_offset", c_double),
                 ("max_radius", c_double*2),
                 ("collisions_Nlog", c_long),
                 ("_calculate_megno", c_int),

diff --git a/src/rebound.h b/src/rebound.h
@@ -211,13 +211,13 @@ struct reb_simulation_integrator_ias15 {
  * @brief This structure contains variables and pointer used by the HERMES integrator.
  */
 struct reb_simulation_integrator_hermes {
-    struct reb_simulation* mini;
-    struct reb_simulation* global;
-    double hill_switch_factor;            //thresh. to move particle from global to mini (hill radii)
-    double radius_switch_factor;               //close encounter radius: if < this value add to mini (X*radius)
+    struct reb_simulation* mini;            ///< Mini simulation integrated using IAS15. See Silburt et al 2016.
+    struct reb_simulation* global;          ///< Global simulation integrated using WHFast. Only set in mini simulation. See Silburt et al 2016).
+    double hill_switch_factor;              ///< Criteria for switching between IAS15 and WHFast in terms of Hill radii.
+    double radius_switch_factor;            ///< Criteria for switching between IAS15 and WHfast in terms of the particles' physical radius.
 
-    int mini_active;
-    int collision_this_global_dt;
+    int mini_active;                        ///< Flag that is set to 1 by HERMES if the mini simulation is active in this timestep.
+    int collision_this_global_dt;           
 
     int* global_index_from_mini_index;
     int global_index_from_mini_index_N;