merged master
This commit is contained in:
parent
513529f0a4
commit
f20a7fbe55
|
@ -64,7 +64,7 @@ struct SimulationResultsReporter {
|
||||||
{
|
{
|
||||||
const auto simulationResultPath = std::filesystem::path(reportFolderPath).append(history.label);
|
const auto simulationResultPath = std::filesystem::path(reportFolderPath).append(history.label);
|
||||||
std::filesystem::create_directories(simulationResultPath);
|
std::filesystem::create_directories(simulationResultPath);
|
||||||
createPlots(history, simulationResultPath, graphSuffix);
|
createPlots(history, simulationResultPath.string(), graphSuffix);
|
||||||
}
|
}
|
||||||
|
|
||||||
void reportResults(const std::vector<SimulationResults> &results,
|
void reportResults(const std::vector<SimulationResults> &results,
|
||||||
|
@ -152,7 +152,8 @@ struct SimulationResultsReporter {
|
||||||
history.kineticEnergy,
|
history.kineticEnergy,
|
||||||
std::filesystem::path(graphsFolder)
|
std::filesystem::path(graphsFolder)
|
||||||
.append("KineticEnergyLog_" + graphSuffix + ".png")
|
.append("KineticEnergyLog_" + graphSuffix + ".png")
|
||||||
.string());
|
.string(),
|
||||||
|
history.redMarks);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!history.logResidualForces.empty()) {
|
if (!history.logResidualForces.empty()) {
|
||||||
|
@ -161,7 +162,8 @@ struct SimulationResultsReporter {
|
||||||
history.logResidualForces,
|
history.logResidualForces,
|
||||||
std::filesystem::path(graphsFolder)
|
std::filesystem::path(graphsFolder)
|
||||||
.append("ResidualForcesLog_" + graphSuffix + ".png")
|
.append("ResidualForcesLog_" + graphSuffix + ".png")
|
||||||
.string());
|
.string(),
|
||||||
|
history.redMarks);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!history.potentialEnergies.empty()) {
|
if (!history.potentialEnergies.empty()) {
|
||||||
|
@ -170,7 +172,8 @@ struct SimulationResultsReporter {
|
||||||
history.potentialEnergies,
|
history.potentialEnergies,
|
||||||
std::filesystem::path(graphsFolder)
|
std::filesystem::path(graphsFolder)
|
||||||
.append("PotentialEnergy_" + graphSuffix + ".png")
|
.append("PotentialEnergy_" + graphSuffix + ".png")
|
||||||
.string());
|
.string(),
|
||||||
|
history.redMarks);
|
||||||
}
|
}
|
||||||
if (!history.residualForcesMovingAverage.empty()) {
|
if (!history.residualForcesMovingAverage.empty()) {
|
||||||
createPlot("Number of Iterations",
|
createPlot("Number of Iterations",
|
||||||
|
@ -178,7 +181,8 @@ struct SimulationResultsReporter {
|
||||||
history.residualForcesMovingAverage,
|
history.residualForcesMovingAverage,
|
||||||
std::filesystem::path(graphsFolder)
|
std::filesystem::path(graphsFolder)
|
||||||
.append("ResidualForcesMovingAverage_" + graphSuffix + ".png")
|
.append("ResidualForcesMovingAverage_" + graphSuffix + ".png")
|
||||||
.string());
|
.string(),
|
||||||
|
history.redMarks);
|
||||||
}
|
}
|
||||||
// if (!history.residualForcesMovingAverageDerivativesLog.empty()) {
|
// if (!history.residualForcesMovingAverageDerivativesLog.empty()) {
|
||||||
// createPlot("Number of Iterations",
|
// createPlot("Number of Iterations",
|
||||||
|
@ -194,7 +198,8 @@ struct SimulationResultsReporter {
|
||||||
history.sumOfNormalizedDisplacementNorms,
|
history.sumOfNormalizedDisplacementNorms,
|
||||||
std::filesystem::path(graphsFolder)
|
std::filesystem::path(graphsFolder)
|
||||||
.append("SumOfNormalizedDisplacementNorms_" + graphSuffix + ".png")
|
.append("SumOfNormalizedDisplacementNorms_" + graphSuffix + ".png")
|
||||||
.string());
|
.string(),
|
||||||
|
history.redMarks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue