diff --git a/src/amr/level_initializer/hybrid_level_initializer.hpp b/src/amr/level_initializer/hybrid_level_initializer.hpp index ec00aa58c..e0ef8386a 100644 --- a/src/amr/level_initializer/hybrid_level_initializer.hpp +++ b/src/amr/level_initializer/hybrid_level_initializer.hpp @@ -57,7 +57,7 @@ namespace solver if (isRegridding) { - std::cout << "regriding level " << levelNumber << "\n"; + PHARE_LOG_LINE_STR("regriding level " + std::to_string(levelNumber)); PHARE_LOG_START(3, "hybridLevelInitializer::initialize : regriding block"); messenger.regrid(hierarchy, levelNumber, oldLevel, model, initDataTime); PHARE_LOG_STOP(3, "hybridLevelInitializer::initialize : regriding block"); diff --git a/src/amr/messengers/hybrid_hybrid_messenger_strategy.hpp b/src/amr/messengers/hybrid_hybrid_messenger_strategy.hpp index eaf5b115f..3b6a90393 100644 --- a/src/amr/messengers/hybrid_hybrid_messenger_strategy.hpp +++ b/src/amr/messengers/hybrid_hybrid_messenger_strategy.hpp @@ -585,7 +585,7 @@ namespace amr PHARE_LOG_SCOPE(3, "HybridHybridMessengerStrategy::synchronize"); auto levelNumber = level.getLevelNumber(); - std::cout << "synchronizing level " << levelNumber << "\n"; + PHARE_LOG_LINE_STR("synchronizing level " + std::to_string(levelNumber)); // call coarsning schedules... magnetoSynchronizers_.sync(levelNumber); @@ -607,7 +607,7 @@ namespace amr auto levelNumber = level.getLevelNumber(); auto& hybridModel = static_cast(model); - std::cout << "postSynchronize level " << levelNumber << "\n"; + PHARE_LOG_LINE_STR("postSynchronize level " + std::to_string(levelNumber)) magSharedNodesRefiners_.fill(hybridModel.state.electromag.B, levelNumber, time); elecSharedNodesRefiners_.fill(hybridModel.state.electromag.E, levelNumber, time); diff --git a/src/amr/multiphysics_integrator.hpp b/src/amr/multiphysics_integrator.hpp index 78beef907..e6f71d85e 100644 --- a/src/amr/multiphysics_integrator.hpp +++ b/src/amr/multiphysics_integrator.hpp @@ -313,8 +313,9 @@ namespace solver bool const isRegridding = oldLevel != nullptr; auto level = hierarchy->getPatchLevel(levelNumber); - std::cout << "init level " << levelNumber << " with regriding = " << isRegridding - << "\n"; + + PHARE_LOG_LINE_SS("init level " << levelNumber << " with regriding = " << isRegridding); + PHARE_LOG_START(3, "initializeLevelData::allocate block"); if (allocateData) { @@ -414,7 +415,7 @@ namespace solver int const tag_index, bool const /*initialTime*/, bool const /*usesRichardsonExtrapolationToo*/) override { - std::cout << "apply gradient detector on level " << levelNumber << "\n"; + PHARE_LOG_LINE_STR("apply gradient detector on level " + std::to_string(levelNumber)); auto level = hierarchy->getPatchLevel(levelNumber); for (auto& patch : *level) @@ -508,9 +509,9 @@ namespace solver auto iLevel = level->getLevelNumber(); - PHARE_LOG_LINE_STR("advanceLevel " << iLevel << " with dt = " << newTime - currentTime - << " from t = " << currentTime - << " to t = " << newTime); + PHARE_LOG_LINE_SS("advanceLevel " << iLevel << " with dt = " << newTime - currentTime + << " from t = " << currentTime + << " to t = " << newTime); auto& solver = getSolver_(iLevel); auto& model = getModel_(iLevel); diff --git a/src/core/logger.hpp b/src/core/logger.hpp index 5e8cb0990..679a6e757 100644 --- a/src/core/logger.hpp +++ b/src/core/logger.hpp @@ -15,8 +15,10 @@ constexpr static std::uint8_t LOG_LEVEL = PHARE_LOG_LEVEL; #if !defined(NDEBUG) || defined(PHARE_FORCE_DEBUG_DO) #define PHARE_LOG_LINE_STR(str) \ std::cout << __FILE__ << ":" << __LINE__ << " - " << str << std::endl; +#define PHARE_LOG_LINE_SS(s) PHARE_LOG_LINE_STR((std::stringstream{} << s).str()); #else #define PHARE_LOG_LINE_STR(str) +#define PHARE_LOG_LINE_SS(str) #endif #define PHARE_LOG_LINE PHARE_LOG_LINE_STR("")