Flush reports when having gap junctions (#342)

jorblancoa · web-flow · commit 2e34f4252dd8 · 2020-07-20T21:54:17.000+02:00
- fix old reporting macros
diff --git a/coreneuron/io/reports/report_event.hpp b/coreneuron/io/reports/report_event.hpp
@@ -10,7 +10,7 @@
 
 namespace coreneuron {
 
-#if defined(ENABLE_REPORTINGLIB) || defined(ENABLE_SONATA_REPORTS)
+#if defined(ENABLE_BIN_REPORTS) || defined(ENABLE_SONATA_REPORTS)
 struct VarWithMapping {
     int id;
     double* var_value;
@@ -36,6 +36,6 @@ class ReportEvent : public DiscreteEvent {
     std::vector<int> gids_to_report;
     double tstart;
 };
-#endif  // defined(ENABLE_REPORTINGLIB) || defined(ENABLE_SONATA_REPORTS)
+#endif  // defined(ENABLE_BIN_REPORTS) || defined(ENABLE_SONATA_REPORTS)
 
 }  // Namespace coreneuron
diff --git a/coreneuron/sim/fadvance_core.cpp b/coreneuron/sim/fadvance_core.cpp
@@ -81,7 +81,7 @@ void nrn_fixed_step_minimal() { /* not so minimal anymore with gap junctions */
     }
 #endif
 
-#ifdef ENABLE_REPORTING
+#if defined(ENABLE_BIN_REPORTS) || defined(ENABLE_SONATA_REPORTS)
     nrn_flush_reports(nrn_threads[0]._t);
 #endif
     t = nrn_threads[0]._t;

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ void nrn_fixed_step_minimal() { /* not so minimal anymore with gap junctions */`
`81`	`81`	`}`
`82`	`82`	`#endif`
`83`	`83`
`84`		`-#ifdef ENABLE_REPORTING`
	`84`	`+#if defined(ENABLE_BIN_REPORTS) \|\| defined(ENABLE_SONATA_REPORTS)`
`85`	`85`	`nrn_flush_reports(nrn_threads[0]._t);`
`86`	`86`	`#endif`
`87`	`87`	`t = nrn_threads[0]._t;`