Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 8615cf18 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

add flag to write aaux in mod file

parent 8cfbdf77
No related branches found
No related tags found
No related merge requests found
......@@ -123,7 +123,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
if (d.Report != null) {
d.Report.AddResult(d.Loading, d.Mission, writer);
}
}, _mode);
}, _mode) {
WriteAdvancedAux = data.AdvancedAux.AuxiliaryAssembly == AuxiliaryModel.Advanced
};
modContainer.WriteModalResults = WriteModalResults;
var current = i++;
var builder = new PowertrainBuilder(modContainer, (writer, mass, loading) =>
......
......@@ -56,6 +56,8 @@ namespace TUGraz.VectoCore.OutputData
public VectoRun.Status RunStatus { get; protected set; }
public bool WriteAdvancedAux { get; set; }
public ModalDataContainer(string runName, IModalDataWriter writer,
ExecutionMode mode = ExecutionMode.Engineering)
: this(runName, "", "", writer, _ => { }, mode) {}
......@@ -80,6 +82,7 @@ namespace TUGraz.VectoCore.OutputData
Data = new ModalResults();
Auxiliaries = new Dictionary<string, DataColumn>();
CurrentRow = Data.NewRow();
WriteAdvancedAux = false;
}
public bool HasTorqueConverter { get; set; }
......@@ -155,6 +158,29 @@ namespace TUGraz.VectoCore.OutputData
});
}
}
if (_mode != ExecutionMode.EngineOnly && WriteAdvancedAux) {
dataColumns.AddRange(new[] {
ModalResultField.AA_NonSmartAlternatorsEfficiency,
ModalResultField.AA_SmartIdleCurrent_Amps,
ModalResultField.AA_SmartIdleAlternatorsEfficiency,
ModalResultField.AA_SmartTractionCurrent_Amps,
ModalResultField.AA_SmartTractionAlternatorEfficiency,
ModalResultField.AA_SmartOverrunCurrent_Amps,
ModalResultField.AA_SmartOverrunAlternatorEfficiency,
ModalResultField.AA_CompressorFlowRate_LitrePerSec,
ModalResultField.AA_OverrunFlag,
ModalResultField.AA_EngineIdleFlag,
ModalResultField.AA_CompressorFlag,
ModalResultField.AA_TotalCycleFC_Grams,
ModalResultField.AA_TotalCycleFC_Litres,
ModalResultField.AA_AveragePowerDemandCrankHVACMechanicals,
ModalResultField.AA_AveragePowerDemandCrankHVACElectricals,
ModalResultField.AA_AveragePowerDemandCrankElectrics,
ModalResultField.AA_AveragePowerDemandCrankPneumatics,
ModalResultField.AA_TotalCycleFuelConsumptionCompressorOff,
ModalResultField.AA_TotalCycleFuelConsumptionCompressorOn,
});
}
var strCols = dataColumns.Select(x => x.GetName())
.Concat((Auxiliaries.Values.Select(c => c.ColumnName)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment