Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

Merge pull request #175 in VECTO/vecto-sim from ~EMKRISPMI/vecto-sim:develop to develop

* commit '0b774576':
  reverted distance check
  logfile limited to 10MB (+10MB archive), corrected callsite (skipFrames), SimulatorFactory always writes Version Info
  [VECTO-263] Version gets logged as Info (instead of Fatal)
  moved distance check from vehicle to driving cycle (due to changed commit order)
parents c663dfb8 0b774576
No related branches found
No related tags found
No related merge requests found
...@@ -16,10 +16,17 @@ ...@@ -16,10 +16,17 @@
<parameter layout="${level}" /> <parameter layout="${level}" />
<parameter layout="${message}" /> <parameter layout="${message}" />
</target> </target>
<target xsi:type="File" name="LogFile" fileName="${basedir}/logs/log.txt" <target xsi:type="File"
layout="${longdate} [${processid}:${threadid}@${machinename}] ${callsite} ${level:uppercase=true}: ${message} ${exception:format=tostring}" /> name="LogFile"
fileName="${basedir}/logs/log.txt"
layout="${longdate} [${processid}:${threadid}@${machinename}] ${callsite:skipFrames=1} ${level:uppercase=true}: ${message} ${exception:format=tostring}"
keepFileOpen="false"
archiveFileName="${basedir}/logs/archive{#}.txt"
maxArchiveFiles="1"
archiveAboveSize="10000000" />
</targets> </targets>
<rules> <rules>
<logger name="TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory" minlevel="Info" writeTo="LogFile" />
<logger name="*" minlevel="Warn" writeTo="LogFile" /> <logger name="*" minlevel="Warn" writeTo="LogFile" />
<logger name="*" minlevel="Error" writeTo="WarningLogger" /> <logger name="*" minlevel="Error" writeTo="WarningLogger" />
</rules> </rules>
......
...@@ -12,13 +12,23 @@ ...@@ -12,13 +12,23 @@
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd" xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="false" autoReload="false"
throwExceptions="false" throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log"> internalLogLevel="Off"
internalLogFile="c:\temp\nlog-internal.log">
<targets async="true"> <targets async="true">
<target xsi:type="Console" name="ConsoleLogger" error="true" /> <target xsi:type="Console"
<target xsi:type="File" name="LogFile" fileName="${basedir}/logs/log_${threadid}.txt" name="ConsoleLogger"
layout="${longdate} [${processid}:${threadid}@${machinename}] ${callsite} ${level:uppercase=true}: ${message} ${exception:format=tostring}" /> error="true" />
<target xsi:type="File"
name="LogFile"
fileName="${basedir}/logs/log.txt"
layout="${longdate} [${processid}:${threadid}@${machinename}] ${callsite:skipFrames=1} ${level:uppercase=true}: ${message} ${exception:format=tostring}"
keepFileOpen="false"
archiveFileName="${basedir}/logs/archive{#}.txt"
maxArchiveFiles="1"
archiveAboveSize="10000000" />
</targets> </targets>
<rules> <rules>
<logger name="TUGraz.VectoCore.Models.Simulation.Impl.SimulatorFactory" minlevel="Info" writeTo="LogFile" />
<logger name="*" minlevel="Warn" writeTo="LogFile" /> <logger name="*" minlevel="Warn" writeTo="LogFile" />
</rules> </rules>
</nlog> </nlog>
......
...@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public SimulatorFactory(ExecutionMode mode, IInputDataProvider dataProvider, IOutputDataWriter writer, public SimulatorFactory(ExecutionMode mode, IInputDataProvider dataProvider, IOutputDataWriter writer,
DeclarationReport report = null) DeclarationReport report = null)
{ {
Log.Fatal("########## VectoCore Version {0} ##########", Assembly.GetExecutingAssembly().GetName().Version); Log.Info("########## VectoCore Version {0} ##########", Assembly.GetExecutingAssembly().GetName().Version);
JobNumber = Interlocked.Increment(ref _jobNumberCounter); JobNumber = Interlocked.Increment(ref _jobNumberCounter);
_mode = mode; _mode = mode;
ModWriter = writer; ModWriter = writer;
...@@ -99,7 +99,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -99,7 +99,6 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
public IOutputDataWriter ModWriter { get; private set; } public IOutputDataWriter ModWriter { get; private set; }
public int JobNumber { get; set; } public int JobNumber { get; set; }
public bool WriteModalResults { get; set; } public bool WriteModalResults { get; set; }
...@@ -146,10 +145,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl ...@@ -146,10 +145,10 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var validationErrors = run.Validate(); var validationErrors = run.Validate();
if (validationErrors.Any()) { if (validationErrors.Any()) {
throw new VectoException("Validation of Run-Data Failed: " + "\n".Join(validationErrors.Select(r => r.ErrorMessage))); throw new VectoException("Validation of Run-Data Failed: " +
"\n".Join(validationErrors.Select(r => r.ErrorMessage)));
} }
yield return run; yield return run;
} }
} }
......
...@@ -173,6 +173,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl ...@@ -173,6 +173,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_air] = CurrentState.AirDragResistance * averageVelocity; container[ModalResultField.P_air] = CurrentState.AirDragResistance * averageVelocity;
container[ModalResultField.P_slope] = CurrentState.SlopeResistance * averageVelocity; container[ModalResultField.P_slope] = CurrentState.SlopeResistance * averageVelocity;
container[ModalResultField.P_trac] = CurrentState.VehicleTractionForce * averageVelocity; container[ModalResultField.P_trac] = CurrentState.VehicleTractionForce * averageVelocity;
// sanity check: is the vehicle in step with the cycle? // sanity check: is the vehicle in step with the cycle?
if (container[ModalResultField.dist] == DBNull.Value) { if (container[ModalResultField.dist] == DBNull.Value) {
Log.Warn("Distance field is not set!"); Log.Warn("Distance field is not set!");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment