Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 948d28ed authored by Michael KRISPER's avatar Michael KRISPER
Browse files

added some missing files in visual studio project

parent 0f519113
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCore/Models/SimulationComponent/Impl/Clutch.cs
+ 12
− 12
View file @ 948d28ed
......@@ -33,8 +33,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
private ClutchState _clutchState = ClutchState.ClutchSlipping;
protected ICombustionEngineIdleController IdleController;
private Watt _RequiredPower;
private NewtonMeter _RequiredTorque;
private Watt _requiredPower;
private NewtonMeter _requiredTorque;
public Clutch(IVehicleContainer cockpit, CombustionEngineData engineData,
......@@ -53,14 +53,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected override void DoWriteModalResults(IModalDataContainer container)
{
container[ModalResultField.Pe_clutch] = _RequiredPower;
container[ModalResultField.Tq_clutch] = _RequiredTorque;
container[ModalResultField.Pe_clutch] = _requiredPower;
container[ModalResultField.Tq_clutch] = _requiredTorque;
}
protected override void DoCommitSimulationStep()
{
_RequiredPower = 0.SI<Watt>();
_RequiredTorque = 0.SI<NewtonMeter>();
_requiredPower = 0.SI<Watt>();
_requiredTorque = 0.SI<NewtonMeter>();
}
public ITnInPort InPort()
......@@ -84,10 +84,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (angularVelocity == null) {
Log.Debug("Invoking IdleController...");
_RequiredPower = 0.SI<Watt>();
_RequiredTorque = 0.SI<NewtonMeter>();
_requiredPower = 0.SI<Watt>();
_requiredTorque = 0.SI<NewtonMeter>();
var retval = IdleController.Request(absTime, dt, torque, null, dryRun);
retval.ClutchPowerRequest = _RequiredPower;
retval.ClutchPowerRequest = _requiredPower;
return retval;
}
if (IdleController != null) {
......@@ -96,8 +96,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
NewtonMeter torqueIn;
PerSecond angularVelocityIn;
AddClutchLoss(torque, angularVelocity, out torqueIn, out angularVelocityIn);
_RequiredPower = torqueIn * angularVelocityIn;
_RequiredTorque = torqueIn;
_requiredPower = torqueIn * angularVelocityIn;
_requiredTorque = torqueIn;
var retVal = NextComponent.Request(absTime, dt, torqueIn, angularVelocityIn, dryRun);
retVal.ClutchPowerRequest = torque * angularVelocity;
......@@ -145,7 +145,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
((clutchSpeedNorm * engineSpeed0 / _ratedSpeed) * (_ratedSpeed - _idleSpeed) + _idleSpeed).Radian
.Cast<PerSecond>();
torqueIn = ((torque * angularVelocity) / ClutchEff / engineSpeedIn);
torqueIn = (torque * angularVelocity) / ClutchEff / engineSpeedIn;
} else {
_clutchState = ClutchState.ClutchClosed;
}
......
VectoCore/Models/SimulationComponent/Impl/PowertrainDrivingCycle.cs
+ 1
− 1
View file @ 948d28ed
......@@ -229,7 +229,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
/// </summary>
public bool VehicleStopped
{
get { return LeftSample.Current.PWheel.Abs().IsEqual(0); }
get { return false; }
}
/// <summary>
......
VectoCoreTest/Models/Simulation/PwheelModeTests.cs
+ 1
− 2
View file @ 948d28ed
......@@ -7,7 +7,6 @@ using System.Linq;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.Tests.Utils;
using TUGraz.VectoCore.InputData.Reader;
using TUGraz.VectoCore.Models.Simulation;
using TUGraz.VectoCore.OutputData.FileIO;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.Models.Simulation.Impl;
......@@ -94,7 +93,7 @@ namespace TUGraz.VectoCore.Tests.Models.Simulation
var fullLoadCurve = EngineFullLoadCurve.Create(fullLoad);
var data = new VectoRunData {
Cycle = drivingCycle,
AxleGearData = new AxleGearData { Ratio = 2.3 },
AxleGearData = new AxleGearData { AxleGear = new GearData { Ratio = 2.3 } },
EngineData = new CombustionEngineData { IdleSpeed = 560.RPMtoRad(), FullLoadCurve = fullLoadCurve },
GearboxData = new GearboxData { Gears = new Dictionary<uint, GearData> { { 2, new GearData { Ratio = 3.5 } } } },
Retarder = new RetarderData()
......
VectoCoreTest/VectoCoreTest.csproj
+ 76
− 0
View file @ 948d28ed
......@@ -81,6 +81,7 @@
<Compile Include="Models\SimulationComponentData\ValidationTest.cs" />
<Compile Include="Models\Simulation\FactoryTest.cs" />
<Compile Include="Models\Simulation\LossMapRangeValidationTest.cs" />
<Compile Include="Models\Simulation\PwheelModeTests.cs" />
<Compile Include="Reports\SumWriterTest.cs" />
<Compile Include="Utils\GraphWriter.cs" />
<Compile Include="Integration\EngineOnlyCycle\EngineOnlyCycleTest.cs" />
......@@ -227,6 +228,57 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Indirect Gear.vtlm" />
<None Include="TestData\Components\Pwheel\Atego.vveh">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\Atego_ges.v2.vsig">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\axle_losses_r390_80_serie_1306.vtlm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\Gear2_pt1_rep1_actual.vdri">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\G_85-6_6_7-0_17.vgbx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\losses_g85_6_6696_0728_1401_loss_1.vtlm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\losses_g85_6_6696_0728_1401_loss_2.vtlm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\losses_g85_6_6696_0728_1401_loss_3.vtlm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\losses_g85_6_6696_0728_1401_loss_4.vtlm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\losses_g85_6_6696_0728_1401_loss_5.vtlm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\losses_g85_6_6696_0728_1401_loss_6.vtlm">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\o9061750850E4.vfld">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\OM906.veng">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\om9062101120_e4e5_b7c_sl2499_20110727.vmap">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\RD_#1_Pwheel_AuxStd.vdri">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\ShiftPolygons_o9061750850E4.vgbs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Pwheel\Truck.vacc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Components\Retarder.vrlm">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
......@@ -743,6 +795,12 @@
<None Include="TestData\Jobs\EngineOnlyJob.vecto">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Jobs\Pwheel.vecto">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Jobs\Pwheel_ultimate.vecto">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Engineering\24t Coach.vsum">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
......@@ -806,12 +864,30 @@
<None Include="TestData\Results\EngineOnlyCycles\24tCoach_EngineOnlyPaux.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Integration\Coach_DriverStrategy_Drive_50_slope_dec-inc.vmod">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Integration\job.vsum">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Integration\job_1-Gear-Test-dist.vmod">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_ges.v2.vsig">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_ges.v2.vsum">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_ges.v2.vsum.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_ges_Gear2_pt1_rep1_actual.vmod">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="TestData\Results\Pwheel\Atego_HDVCO2_RD_#1_AuxStd.vmod">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="TestData\Cycles\EngineOnly_FullLoad.vdri">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about