diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux index 06d4e48f74445b9e593c12093f24b6ab5e76e01e..30f6f363d0f1a89a91aba0ebd3545756b2202e8b 100644 --- a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux +++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/AdvAuxTest.aaux @@ -1,20 +1,18 @@ { "Header": "AAUX", "Body": { - "VectoInputs": { - "Cycle": "Urban", - "VehicleWeightKG": 16500.0, - "PowerNetVoltage": 28.3, - "FuelMap": "testFuelGoodMap.vmap", - "FuelDensity": 0.832 + "Actuations": { + "Brakes": 27, + "CycleTime": 15000, + "Kneeling": 0, + "Park brake + 2 doors": 6 }, - "ActuationsMap": "testPneumaticActuationsMap.APAC", "ElectricalUserInputsConfig": { "PowerNetVoltage": 28.3, "AlternatorMap": "testCombAlternatorMap_1Alt.AALT", "AlternatorGearEfficiency": 0.92, "ElectricalConsumers": { - "AverageCurrentDemandInclBaseLoad": 60.631777385159026, + "AverageCurrentDemandInclBaseLoad": 59.782177, "AverageCurrentDemandWithoutBaseLoad": 35.631777385159026 }, "DoorActuationTimeSecond": 4, diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM index 3dc80990a248e8632399aabf5325e4d897c0e799..71e03631803178a742649f53fd80d7012998e707 100644 --- a/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM +++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/Integration/testHVACssm.AHSM @@ -7,17 +7,15 @@ "BC_PassengerBoundaryTemperature": 12.0, "BC_HeatingBoundaryTemperature": 18.0, "BC_CoolingBoundaryTemperature": 23.0, - "BC_VentilationRate": 25.0, - "BC_VentilationRateHeating": 25.0, + "BC_VentilationRate": 20.0, + "BC_VentilationRateHeating": 20.0, "BC_FloorType": "HighFloor", "BC_BusSurfaceArea": 114.42, "BC_BusWindowSurfaceArea": 20.9825, - "BC_BusVolume": 0, + "BC_BusVolume": 61.81231875, "BC_PassengerCount": 34, "BC_UValue": 3, - "BC_COP": 4.0, - "BC_HighVentilation": 20.0, - "BC_lowVentilation": 7.0, + "BC_COP": 3.5, "BC_SpecificVentilationPower": 0.56, "BC_AuxHeaterEfficiency": 0.84, "BC_GCVDieselOrHeatingOil": 11.8, diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm b/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm index b6297135b82bd081cde49fbc9264acdb136b3eeb..8b2d0c775b5e4f6dc86d256e33653e62237c8034 100644 --- a/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm +++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/ssm.Ahsm @@ -11,7 +11,6 @@ "BC_PassengerDensitySemiLowFloor": 2.0, "BC_PassengerDensityRaisedFloor": 1.4, "BC_CalculatedPassengerNumber": 33.754349999999995, - "BC_UValues": 3.0, "BC_HeatingBoundaryTemperature": 20.0, "BC_CoolingBoundaryTemperature": 24.0, "BC_VentilationRate": 25.0, @@ -19,8 +18,9 @@ "BC_SpecificVentilationPower": 0.6, "BC_FloorType": "HighFloor", "BC_BusSurfaceArea": 54.3405, - "BC_BusWindowSurfaceArea": 20.9825, - "BC_BusVolume": 0, + "BC_BusWindowSurfaceArea": 20.9825, + "BC_BusVolume": 0, + "BC_PassengerCount": 34, "BC_UValue": 3, "BC_COP": 4.0, "BC_AuxHeaterEfficiency": 1.0, diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/BusAuxiliaryInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/BusAuxiliaryInputData.cs index fb66e9b47b5d473f41f853538bad01ed74155c66..d1f9a541c63b7da7011d029dcbfb9dfc79d057a5 100644 --- a/VectoCore/VectoCore/InputData/FileIO/JSON/BusAuxiliaryInputData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/JSON/BusAuxiliaryInputData.cs @@ -38,7 +38,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON Braking = data["Actuations"]?.GetEx<int>("Brakes") ?? 0, ParkBrakeAndDoors = data["Actuations"]?.GetEx<int>("Park brake + 2 doors") ?? 0, Kneeling = data["Actuations"]?.GetEx<int>("Kneeling") ?? 0, - CycleTime = (data["Actiations"]?.GetEx<int>("CycleTime") ?? 3600).SI<Second>() + CycleTime = (data["Actuations"]?.GetEx<int>("CycleTime") ?? 3600).SI<Second>() }; //ActuationsMapReader.Read(Path.Combine(baseDir, data.GetEx<string>("ActuationsMap"))); var ssm = string.IsNullOrWhiteSpace(data["SSMFilePath"]?.ToString()) ?