More asserts.

arbor/communication/communicator.cpp

@@ -78,7 +78,7 @@ void communicator::update_connections(const recipe& rec,
     // Also the count of presynaptic sources from each domain
     //   -> src_counts: array with one entry for each domain
 
-    // Record all the gid in a flat vector.
+    // Record all the gids in a flat vector.
 
     PE(init:communicator:update:collect_gids);
     std::vector<cell_gid_type> gids; gids.reserve(num_local_cells_);

arbor/simulation.cpp

@@ -21,6 +21,8 @@
 #include "util/span.hpp"
 #include "profile/profiler_macro.hpp"
 
+#include <iostream>
+
 namespace arb {
 
 template <typename Seq, typename Value, typename Less = std::less<>>
@@ -81,8 +83,10 @@ ARB_ARBOR_API void merge_cell_events(time_type t_from,
     // Merge (remaining) old and pending events.
     PE(communication:enqueue:merge);
     auto n = new_events.size();
-    new_events.resize(n+pending.size()+old_events.size());
-    std::merge(pending.begin(), pending.end(), old_events.begin(), old_events.end(), new_events.begin()+n);
+    new_events.resize(n + pending.size() + old_events.size());
+    std::merge(pending.begin(), pending.end(),
+               old_events.begin(), old_events.end(),
+               new_events.begin() + n);
     PL();
 }