From a352c29bdc13a839cebd985b0de3ac1f13f09b91 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 2 May 2016 15:02:46 +0200
Subject: [PATCH] combustionEngine: removed check for 'above full-load and
 below drag-load'

---
 .../Pneumatics/ICompressorMap.vb              | 24 +++++++++----------
 .../Impl/CombustionEngine.cs                  |  6 +++--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/VECTOAux/VectoAuxiliaries/Pneumatics/ICompressorMap.vb b/VECTOAux/VectoAuxiliaries/Pneumatics/ICompressorMap.vb
index 42cebc7666..914a00a2a6 100644
--- a/VECTOAux/VectoAuxiliaries/Pneumatics/ICompressorMap.vb
+++ b/VECTOAux/VectoAuxiliaries/Pneumatics/ICompressorMap.vb
@@ -28,20 +28,20 @@ Namespace Pneumatics
         ''' <remarks>Single</remarks>
 		Function GetFlowRate(ByVal rpm As Double) As Single
 
-        ''' <summary>
-        ''' Returns mechanical power at rpm when compressor is on
-        ''' </summary>
-        ''' <param name="rpm">compressor rotation speed</param>
-        ''' <returns></returns>
-        ''' <remarks>Single</remarks>
+		''' <summary>
+		''' Returns mechanical power at rpm when compressor is on
+		''' </summary>
+		''' <param name="rpm">compressor rotation speed</param>
+		''' <returns></returns>
+		''' <remarks>Single</remarks>
 		Function GetPowerCompressorOn(ByVal rpm As Double) As Single
 
-        ''' <summary>
-        ''' Returns mechanical power at rpm when compressor is off
-        ''' </summary>
-        ''' <param name="rpm">compressor rotation speed</param>
-        ''' <returns></returns>
-        ''' <remarks>Single</remarks>
+		''' <summary>
+		''' Returns mechanical power at rpm when compressor is off
+		''' </summary>
+		''' <param name="rpm">compressor rotation speed</param>
+		''' <returns></returns>
+		''' <remarks>Single</remarks>
 		Function GetPowerCompressorOff(ByVal rpm As Double) As Single
 
         'Returns Average Power Demand Per Compressor Unit FlowRate
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index 2a265f4044..390323360e 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -174,7 +174,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 			var auxTorqueDemand = EngineAux == null
 				? 0.SI<NewtonMeter>()
-				: EngineAux.PowerDemand(absTime, dt, CurrentState.EngineTorqueOut, CurrentState.EngineTorqueOut + CurrentState.InertiaTorqueLoss, angularVelocity, dryRun);
+				: EngineAux.PowerDemand(absTime, dt, CurrentState.EngineTorqueOut,
+					CurrentState.EngineTorqueOut + CurrentState.InertiaTorqueLoss, angularVelocity, dryRun);
 			// compute the torque the engine has to provide. powertrain + aux + its own inertia
 			var totalTorqueDemand = torqueOut + auxTorqueDemand + CurrentState.InertiaTorqueLoss;
 
@@ -212,7 +213,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			if (
 				(deltaFull * avgEngineSpeed).IsGreater(0.SI<Watt>(), Constants.SimulationSettings.LineSearchTolerance) &&
 				(deltaDrag * avgEngineSpeed).IsSmaller(0.SI<Watt>(), Constants.SimulationSettings.LineSearchTolerance)) {
-				throw new VectoSimulationException(
+				//throw new VectoSimulationException(
+				Log.Error(
 					"Unexpected condition: requested torque_out is above gearbox full-load and engine is below drag load! deltaFull: {0}, deltaDrag: {1}",
 					deltaFull, deltaDrag);
 			}
-- 
GitLab