From f20a7fbe55e4bcc64af678a247a3d830ed660e78 Mon Sep 17 00:00:00 2001 From: iasonmanolas Date: Fri, 16 Jul 2021 14:33:06 +0300 Subject: [PATCH] merged master --- simulationhistoryplotter.hpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/simulationhistoryplotter.hpp b/simulationhistoryplotter.hpp index 371caec..61e5ad9 100755 --- a/simulationhistoryplotter.hpp +++ b/simulationhistoryplotter.hpp @@ -64,7 +64,7 @@ struct SimulationResultsReporter { { const auto simulationResultPath = std::filesystem::path(reportFolderPath).append(history.label); std::filesystem::create_directories(simulationResultPath); - createPlots(history, simulationResultPath, graphSuffix); + createPlots(history, simulationResultPath.string(), graphSuffix); } void reportResults(const std::vector &results, @@ -152,7 +152,8 @@ struct SimulationResultsReporter { history.kineticEnergy, std::filesystem::path(graphsFolder) .append("KineticEnergyLog_" + graphSuffix + ".png") - .string()); + .string(), + history.redMarks); } if (!history.logResidualForces.empty()) { @@ -161,7 +162,8 @@ struct SimulationResultsReporter { history.logResidualForces, std::filesystem::path(graphsFolder) .append("ResidualForcesLog_" + graphSuffix + ".png") - .string()); + .string(), + history.redMarks); } if (!history.potentialEnergies.empty()) { @@ -170,7 +172,8 @@ struct SimulationResultsReporter { history.potentialEnergies, std::filesystem::path(graphsFolder) .append("PotentialEnergy_" + graphSuffix + ".png") - .string()); + .string(), + history.redMarks); } if (!history.residualForcesMovingAverage.empty()) { createPlot("Number of Iterations", @@ -178,7 +181,8 @@ struct SimulationResultsReporter { history.residualForcesMovingAverage, std::filesystem::path(graphsFolder) .append("ResidualForcesMovingAverage_" + graphSuffix + ".png") - .string()); + .string(), + history.redMarks); } // if (!history.residualForcesMovingAverageDerivativesLog.empty()) { // createPlot("Number of Iterations", @@ -194,7 +198,8 @@ struct SimulationResultsReporter { history.sumOfNormalizedDisplacementNorms, std::filesystem::path(graphsFolder) .append("SumOfNormalizedDisplacementNorms_" + graphSuffix + ".png") - .string()); + .string(), + history.redMarks); } } };