From ecef2c5f44803cb7ae02d2a71fc61b3710427101 Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Fri, 3 Mar 2023 08:29:44 +0100
Subject: [PATCH] add iteration count to job in sumfile
---
.../IterativeRunStrategies/OVCHevIterativeRunStrategy.cs | 1 +
VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs | 1 +
VectoCore/VectoCore/OutputData/SumDataFields.cs | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
index 6613749bc7..185d9f7a34 100644
--- a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
+++ b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs
@@ -18,6 +18,7 @@ namespace TUGraz.VectoCore.Models.Declaration.IterativeRunStrategies
public override void UpdateRunData(int iteration, IModalDataContainer modData, VectoRunData runData)
{
StoreResults(modData, runData, iteration);
+ runData.Iteration = (iteration + 1);
SetEquivalenceFactor(runData, iteration);
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index 489fcb01ac..bcb2043ca3 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -185,6 +185,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
// used to identify job and run in summary container
public int JobNumber { get; set; }
public int RunNumber { get; set; }
+ public int Iteration { get; set; }
public OvcHevMode OVCMode { get; internal set; }
diff --git a/VectoCore/VectoCore/OutputData/SumDataFields.cs b/VectoCore/VectoCore/OutputData/SumDataFields.cs
index 98c7a43383..8730f7916b 100644
--- a/VectoCore/VectoCore/OutputData/SumDataFields.cs
+++ b/VectoCore/VectoCore/OutputData/SumDataFields.cs
@@ -334,7 +334,7 @@ namespace TUGraz.VectoCore.OutputData
public static readonly Dictionary<string, Tuple<ModalResultField[], WriteSumEntry>> SumDataValue = new Dictionary<string, Tuple<ModalResultField[], WriteSumEntry>>() {
// common fields
{ SORT, SumFunc((r, m) => r.JobNumber * 1000 + r.RunNumber)},
- { JOB, SumFunc((r, m) => $"{r.JobNumber}-{r.RunNumber}")},
+ { JOB, SumFunc((r, m) => $"{r.JobNumber}-{r.RunNumber}-{(r.Iteration != 0 ? r.Iteration.ToString() : "")}")},
{ INPUTFILE, SumFunc((r,m) => SummaryDataContainer.ReplaceNotAllowedCharacters(r.JobName)) },
{ CYCLE, SumFunc((r, m) => SummaryDataContainer.ReplaceNotAllowedCharacters(r.Cycle.Name + Constants.FileExtensions.CycleFile))},
{ STATUS, SumFunc((r, m) => m.RunStatus)},
--
GitLab