From 91b4935783c9be9ea386f1d463d2685b0e4ac0a4 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Tue, 17 Sep 2024 18:46:33 +0200 Subject: [PATCH] Fix weird strings --- src/nrncvode/netcvode.cpp | 2 +- src/nrniv/multisplit.cpp | 10 +++++----- src/nrniv/netpar.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/nrncvode/netcvode.cpp b/src/nrncvode/netcvode.cpp index 3eb1843138..3093c24ea3 100644 --- a/src/nrncvode/netcvode.cpp +++ b/src/nrncvode/netcvode.cpp @@ -3521,7 +3521,7 @@ void NetCvode::retreat(double t, Cvode* cv) { TQueue* tq = p[cv->nth_ ? cv->nth_->id : 0].tq_; #if PRINT_EVENT if (print_event_) { - logger.print("microstep retreat from {} (cvode_{} is at {}) for event onset={}\n", + logger.print("microstep retreat from {:g} (cvode_{} is at {:g}) for event onset={}\n", tq ? cv->tqitem_->t_ : cv->t_, fmt::ptr(cv), cv->t_, diff --git a/src/nrniv/multisplit.cpp b/src/nrniv/multisplit.cpp index 7008385aea..abf427cbda 100644 --- a/src/nrniv/multisplit.cpp +++ b/src/nrniv/multisplit.cpp @@ -1809,7 +1809,7 @@ void MultiSplitControl::prstruct() { logger.print(" MultiSplit {}\n", multisplit_list_->size()); for (i = 0; i < multisplit_list_->size(); ++i) { MultiSplit* ms = (*multisplit_list_)[i]; - logger.print(" {:2d} bbs={} bi={:-2d} rthost={:-4d} {:-4d} {}{{}}", + logger.print(" {:2d} bbs={} bi={:-2d} rthost={:-4d} {:-4d} {}{{{}}}", i, ms->backbone_style, ms->back_index, @@ -1818,7 +1818,7 @@ void MultiSplitControl::prstruct() { secname(ms->nd[0]->sec), ms->nd[0]->sec_node_index_); if (ms->nd[1]) { - logger.print(" {:-4d} {}{{}}", + logger.print(" {:-4d} {}{{{}}}", ms->sid[1], secname(ms->nd[1]->sec), ms->nd[1]->sec_node_index_); @@ -1848,9 +1848,9 @@ void MultiSplitControl::prstruct() { t.backAindex_[i], t.backBindex_[i]); Node* nd = _nt->_v_node[t.backbone_begin + t.backAindex_[i]]; - logger.print(" {}{{}}", secname(nd->sec), nd->sec_node_index_); + logger.print(" {}{{{}}}", secname(nd->sec), nd->sec_node_index_); nd = _nt->_v_node[t.backbone_begin + t.backBindex_[i]]; - logger.print(" {}{{}}", secname(nd->sec), nd->sec_node_index_); + logger.print(" {}{{{}}}", secname(nd->sec), nd->sec_node_index_); logger.print("\n"); } } @@ -2679,7 +2679,7 @@ void ReducedTree::pr_map(int tsize, double* trbuf) { } if (rmap[i] >= nt->node_rhs_storage() && rmap[i] < (nt->node_rhs_storage() + nt->end)) { Node* nd = nt->_v_node[rmap[i] - nt->node_rhs_storage()]; - logger.print(" {:2d} rhs[{:2d}] rhs[{}] += rhs[{}] \t{}{{}}\n", + logger.print(" {:2d} rhs[{:2d}] rhs[{}] += rhs[{}] \t{}{{{}}}\n", i, irmap[i], irmap[i], diff --git a/src/nrniv/netpar.cpp b/src/nrniv/netpar.cpp index ba107c7384..daaf940099 100644 --- a/src/nrniv/netpar.cpp +++ b/src/nrniv/netpar.cpp @@ -280,7 +280,7 @@ void NetParEvent::pgvts_deliver(double tt, NetCvode* nc) { void NetParEvent::pr(const char* m, double tt, NetCvode* nc) { logger.print( - "{} NetParEvent {} t={:.15g} tt-t={}\n", m, ithread_, tt, tt - nrn_threads[ithread_]._t); + "{} NetParEvent {} t={:.15g} tt-t={:g}\n", m, ithread_, tt, tt - nrn_threads[ithread_]._t); } DiscreteEvent* NetParEvent::savestate_save() {