diff --git a/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs b/VectoCore/VectoCore/Models/Declaration/IterativeRunStrategies/OVCHevIterativeRunStrategy.cs index 6613749bc7dfe0b0272904a22a58174581fae35f..185d9f7a345710a42fca29818410d0604877248c 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 489fcb01ac94bde05c2fba91b48755faa79b8380..bcb2043ca36590e8c9a74b35c4284f5139d6f70f 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 98c7a433833820eb1140bd82f464b84a9916fbd1..8730f7916bd6098ea6539b2e045aa91f7a935cf7 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)},