merged master

This commit is contained in:
iasonmanolas 2021-07-16 14:33:06 +03:00
parent 513529f0a4
commit f20a7fbe55
1 changed files with 11 additions and 6 deletions

View File

@ -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<SimulationResults> &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);
}
}
};