diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml index d7b1e1f99df7e0120ff7a94f09636abd838331f6..1764bb0f138b7c17d19842f09b2e276878656ff8 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/V24_DeclarationMode/HeavyLorry/PEV_heavyLorry_AMT_E2_realistic.xml @@ -55,15 +55,86 @@ <DcDcConverterIncluded>true</DcDcConverterIncluded> <IHPCType>None</IHPCType> <VoltageLevel> - <Voltage>400</Voltage> - <ContinuousTorque>23873.24</ContinuousTorque> - <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque> - <OverloadTorque>25873.24</OverloadTorque> + <Voltage>600</Voltage> + <ContinuousTorque>350.00</ContinuousTorque> + <TestSpeedContinuousTorque>2400.00</TestSpeedContinuousTorque> + <OverloadTorque>470.00</OverloadTorque> <TestSpeedOverloadTorque>2500.00</TestSpeedOverloadTorque> - <OverloadDuration>30.00</OverloadDuration> + <OverloadDuration>120.00</OverloadDuration> <MaxTorqueCurve> - <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> - <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/> +<Entry outShaftSpeed="0.00" maxTorque="485.00" minTorque="-485.00"/> +<Entry outShaftSpeed="2461.16" maxTorque="485.00" minTorque="-485.00"/> +<Entry outShaftSpeed="2452.14" maxTorque="485.00" minTorque="-485.00"/> +<Entry outShaftSpeed="2466.86" maxTorque="483.88" minTorque="-483.88"/> +<Entry outShaftSpeed="2481.59" maxTorque="481.01" minTorque="-481.01"/> +<Entry outShaftSpeed="2496.32" maxTorque="478.17" minTorque="-478.17"/> +<Entry outShaftSpeed="2503.68" maxTorque="476.77" minTorque="-476.77"/> +<Entry outShaftSpeed="2577.32" maxTorque="463.14" minTorque="-463.14"/> +<Entry outShaftSpeed="2650.96" maxTorque="450.27" minTorque="-450.27"/> +<Entry outShaftSpeed="2724.59" maxTorque="438.10" minTorque="-438.10"/> +<Entry outShaftSpeed="2798.23" maxTorque="426.58" minTorque="-426.58"/> +<Entry outShaftSpeed="2871.87" maxTorque="415.64" minTorque="-415.64"/> +<Entry outShaftSpeed="2945.51" maxTorque="405.25" minTorque="-405.25"/> +<Entry outShaftSpeed="3019.15" maxTorque="395.36" minTorque="-395.36"/> +<Entry outShaftSpeed="3092.78" maxTorque="385.95" minTorque="-385.95"/> +<Entry outShaftSpeed="3166.42" maxTorque="376.98" minTorque="-376.98"/> +<Entry outShaftSpeed="3240.06" maxTorque="368.41" minTorque="-368.41"/> +<Entry outShaftSpeed="3313.70" maxTorque="360.22" minTorque="-360.22"/> +<Entry outShaftSpeed="3387.33" maxTorque="352.39" minTorque="-352.39"/> +<Entry outShaftSpeed="3460.97" maxTorque="344.90" minTorque="-344.90"/> +<Entry outShaftSpeed="3534.61" maxTorque="337.71" minTorque="-337.71"/> +<Entry outShaftSpeed="3608.25" maxTorque="330.82" minTorque="-330.82"/> +<Entry outShaftSpeed="3681.89" maxTorque="324.20" minTorque="-324.20"/> +<Entry outShaftSpeed="3755.52" maxTorque="317.84" minTorque="-317.84"/> +<Entry outShaftSpeed="3829.16" maxTorque="311.73" minTorque="-311.73"/> +<Entry outShaftSpeed="3902.80" maxTorque="305.85" minTorque="-305.85"/> +<Entry outShaftSpeed="3976.44" maxTorque="300.18" minTorque="-300.18"/> +<Entry outShaftSpeed="4050.07" maxTorque="294.72" minTorque="-294.72"/> +<Entry outShaftSpeed="4123.71" maxTorque="289.46" minTorque="-289.46"/> +<Entry outShaftSpeed="4197.35" maxTorque="284.38" minTorque="-284.38"/> +<Entry outShaftSpeed="4270.99" maxTorque="279.48" minTorque="-279.48"/> +<Entry outShaftSpeed="4344.62" maxTorque="274.74" minTorque="-274.74"/> +<Entry outShaftSpeed="4418.26" maxTorque="270.17" minTorque="-270.17"/> +<Entry outShaftSpeed="4491.90" maxTorque="265.73" minTorque="-265.73"/> +<Entry outShaftSpeed="4565.54" maxTorque="261.45" minTorque="-261.45"/> +<Entry outShaftSpeed="4639.18" maxTorque="257.30" minTorque="-257.30"/> +<Entry outShaftSpeed="4712.81" maxTorque="253.28" minTorque="-253.28"/> +<Entry outShaftSpeed="4786.45" maxTorque="249.39" minTorque="-249.39"/> +<Entry outShaftSpeed="4860.09" maxTorque="245.60" minTorque="-245.60"/> +<Entry outShaftSpeed="4933.73" maxTorque="241.94" minTorque="-241.94"/> +<Entry outShaftSpeed="5007.36" maxTorque="238.38" minTorque="-238.38"/> +<Entry outShaftSpeed="5081.00" maxTorque="234.92" minTorque="-234.92"/> +<Entry outShaftSpeed="5154.64" maxTorque="231.58" minTorque="-231.58"/> +<Entry outShaftSpeed="5228.28" maxTorque="228.31" minTorque="-228.31"/> +<Entry outShaftSpeed="5301.91" maxTorque="225.14" minTorque="-225.14"/> +<Entry outShaftSpeed="5375.55" maxTorque="222.06" minTorque="-222.06"/> +<Entry outShaftSpeed="5449.19" maxTorque="219.05" minTorque="-219.05"/> +<Entry outShaftSpeed="5522.83" maxTorque="216.13" minTorque="-216.13"/> +<Entry outShaftSpeed="5596.47" maxTorque="213.29" minTorque="-213.29"/> +<Entry outShaftSpeed="5670.10" maxTorque="210.51" minTorque="-210.51"/> +<Entry outShaftSpeed="5743.74" maxTorque="207.82" minTorque="-207.82"/> +<Entry outShaftSpeed="5817.38" maxTorque="205.19" minTorque="-205.19"/> +<Entry outShaftSpeed="5891.02" maxTorque="202.62" minTorque="-202.62"/> +<Entry outShaftSpeed="5964.65" maxTorque="200.12" minTorque="-200.12"/> +<Entry outShaftSpeed="6038.29" maxTorque="197.69" minTorque="-197.69"/> +<Entry outShaftSpeed="6111.93" maxTorque="195.30" minTorque="-195.30"/> +<Entry outShaftSpeed="6185.57" maxTorque="192.97" minTorque="-192.97"/> +<Entry outShaftSpeed="6259.20" maxTorque="190.70" minTorque="-190.70"/> +<Entry outShaftSpeed="6332.84" maxTorque="188.48" minTorque="-188.48"/> +<Entry outShaftSpeed="6406.48" maxTorque="186.32" minTorque="-186.32"/> +<Entry outShaftSpeed="6480.12" maxTorque="184.20" minTorque="-184.20"/> +<Entry outShaftSpeed="6553.76" maxTorque="182.13" minTorque="-182.13"/> +<Entry outShaftSpeed="6627.39" maxTorque="180.10" minTorque="-180.10"/> +<Entry outShaftSpeed="6701.03" maxTorque="178.13" minTorque="-178.13"/> +<Entry outShaftSpeed="6774.67" maxTorque="176.20" minTorque="-176.20"/> +<Entry outShaftSpeed="6848.31" maxTorque="174.30" minTorque="-174.30"/> +<Entry outShaftSpeed="6921.94" maxTorque="172.44" minTorque="-172.44"/> +<Entry outShaftSpeed="6995.58" maxTorque="170.64" minTorque="-170.64"/> +<Entry outShaftSpeed="7069.22" maxTorque="168.85" minTorque="-168.85"/> +<Entry outShaftSpeed="7142.86" maxTorque="167.11" minTorque="-167.11"/> +<Entry outShaftSpeed="7216.49" maxTorque="165.41" minTorque="-165.41"/> +<Entry outShaftSpeed="7290.13" maxTorque="163.74" minTorque="-163.74"/> +<Entry outShaftSpeed="7363.77" maxTorque="162.10" minTorque="-162.10"/> </MaxTorqueCurve> <PowerMap> <Entry outShaftSpeed="0.00" torque="-485.00" electricPower="8.79"/> @@ -2085,15 +2156,86 @@ </VoltageLevel> <VoltageLevel> <Voltage>600</Voltage> - <ContinuousTorque>23873.24</ContinuousTorque> - <TestSpeedContinuousTorque>2000.00</TestSpeedContinuousTorque> - <OverloadTorque>25873.24</OverloadTorque> + <ContinuousTorque>350.00</ContinuousTorque> + <TestSpeedContinuousTorque>2400.00</TestSpeedContinuousTorque> + <OverloadTorque>470.00</OverloadTorque> <TestSpeedOverloadTorque>2500.00</TestSpeedOverloadTorque> - <OverloadDuration>30.00</OverloadDuration> + <OverloadDuration>120.00</OverloadDuration> <MaxTorqueCurve> - <Entry outShaftSpeed="0.00" maxTorque="450.00" minTorque="-450.00"/> - <Entry outShaftSpeed="4000.00" maxTorque="100.00" minTorque="-100.00"/> - </MaxTorqueCurve> + <Entry outShaftSpeed="0.00" maxTorque="485.00" minTorque="-485.00"/> + <Entry outShaftSpeed="2461.16" maxTorque="485.00" minTorque="-485.00"/> + <Entry outShaftSpeed="2452.14" maxTorque="485.00" minTorque="-485.00"/> + <Entry outShaftSpeed="2466.86" maxTorque="483.88" minTorque="-483.88"/> + <Entry outShaftSpeed="2481.59" maxTorque="481.01" minTorque="-481.01"/> + <Entry outShaftSpeed="2496.32" maxTorque="478.17" minTorque="-478.17"/> + <Entry outShaftSpeed="2503.68" maxTorque="476.77" minTorque="-476.77"/> + <Entry outShaftSpeed="2577.32" maxTorque="463.14" minTorque="-463.14"/> + <Entry outShaftSpeed="2650.96" maxTorque="450.27" minTorque="-450.27"/> + <Entry outShaftSpeed="2724.59" maxTorque="438.10" minTorque="-438.10"/> + <Entry outShaftSpeed="2798.23" maxTorque="426.58" minTorque="-426.58"/> + <Entry outShaftSpeed="2871.87" maxTorque="415.64" minTorque="-415.64"/> + <Entry outShaftSpeed="2945.51" maxTorque="405.25" minTorque="-405.25"/> + <Entry outShaftSpeed="3019.15" maxTorque="395.36" minTorque="-395.36"/> + <Entry outShaftSpeed="3092.78" maxTorque="385.95" minTorque="-385.95"/> + <Entry outShaftSpeed="3166.42" maxTorque="376.98" minTorque="-376.98"/> + <Entry outShaftSpeed="3240.06" maxTorque="368.41" minTorque="-368.41"/> + <Entry outShaftSpeed="3313.70" maxTorque="360.22" minTorque="-360.22"/> + <Entry outShaftSpeed="3387.33" maxTorque="352.39" minTorque="-352.39"/> + <Entry outShaftSpeed="3460.97" maxTorque="344.90" minTorque="-344.90"/> + <Entry outShaftSpeed="3534.61" maxTorque="337.71" minTorque="-337.71"/> + <Entry outShaftSpeed="3608.25" maxTorque="330.82" minTorque="-330.82"/> + <Entry outShaftSpeed="3681.89" maxTorque="324.20" minTorque="-324.20"/> + <Entry outShaftSpeed="3755.52" maxTorque="317.84" minTorque="-317.84"/> + <Entry outShaftSpeed="3829.16" maxTorque="311.73" minTorque="-311.73"/> + <Entry outShaftSpeed="3902.80" maxTorque="305.85" minTorque="-305.85"/> + <Entry outShaftSpeed="3976.44" maxTorque="300.18" minTorque="-300.18"/> + <Entry outShaftSpeed="4050.07" maxTorque="294.72" minTorque="-294.72"/> + <Entry outShaftSpeed="4123.71" maxTorque="289.46" minTorque="-289.46"/> + <Entry outShaftSpeed="4197.35" maxTorque="284.38" minTorque="-284.38"/> + <Entry outShaftSpeed="4270.99" maxTorque="279.48" minTorque="-279.48"/> + <Entry outShaftSpeed="4344.62" maxTorque="274.74" minTorque="-274.74"/> + <Entry outShaftSpeed="4418.26" maxTorque="270.17" minTorque="-270.17"/> + <Entry outShaftSpeed="4491.90" maxTorque="265.73" minTorque="-265.73"/> + <Entry outShaftSpeed="4565.54" maxTorque="261.45" minTorque="-261.45"/> + <Entry outShaftSpeed="4639.18" maxTorque="257.30" minTorque="-257.30"/> + <Entry outShaftSpeed="4712.81" maxTorque="253.28" minTorque="-253.28"/> + <Entry outShaftSpeed="4786.45" maxTorque="249.39" minTorque="-249.39"/> + <Entry outShaftSpeed="4860.09" maxTorque="245.60" minTorque="-245.60"/> + <Entry outShaftSpeed="4933.73" maxTorque="241.94" minTorque="-241.94"/> + <Entry outShaftSpeed="5007.36" maxTorque="238.38" minTorque="-238.38"/> + <Entry outShaftSpeed="5081.00" maxTorque="234.92" minTorque="-234.92"/> + <Entry outShaftSpeed="5154.64" maxTorque="231.58" minTorque="-231.58"/> + <Entry outShaftSpeed="5228.28" maxTorque="228.31" minTorque="-228.31"/> + <Entry outShaftSpeed="5301.91" maxTorque="225.14" minTorque="-225.14"/> + <Entry outShaftSpeed="5375.55" maxTorque="222.06" minTorque="-222.06"/> + <Entry outShaftSpeed="5449.19" maxTorque="219.05" minTorque="-219.05"/> + <Entry outShaftSpeed="5522.83" maxTorque="216.13" minTorque="-216.13"/> + <Entry outShaftSpeed="5596.47" maxTorque="213.29" minTorque="-213.29"/> + <Entry outShaftSpeed="5670.10" maxTorque="210.51" minTorque="-210.51"/> + <Entry outShaftSpeed="5743.74" maxTorque="207.82" minTorque="-207.82"/> + <Entry outShaftSpeed="5817.38" maxTorque="205.19" minTorque="-205.19"/> + <Entry outShaftSpeed="5891.02" maxTorque="202.62" minTorque="-202.62"/> + <Entry outShaftSpeed="5964.65" maxTorque="200.12" minTorque="-200.12"/> + <Entry outShaftSpeed="6038.29" maxTorque="197.69" minTorque="-197.69"/> + <Entry outShaftSpeed="6111.93" maxTorque="195.30" minTorque="-195.30"/> + <Entry outShaftSpeed="6185.57" maxTorque="192.97" minTorque="-192.97"/> + <Entry outShaftSpeed="6259.20" maxTorque="190.70" minTorque="-190.70"/> + <Entry outShaftSpeed="6332.84" maxTorque="188.48" minTorque="-188.48"/> + <Entry outShaftSpeed="6406.48" maxTorque="186.32" minTorque="-186.32"/> + <Entry outShaftSpeed="6480.12" maxTorque="184.20" minTorque="-184.20"/> + <Entry outShaftSpeed="6553.76" maxTorque="182.13" minTorque="-182.13"/> + <Entry outShaftSpeed="6627.39" maxTorque="180.10" minTorque="-180.10"/> + <Entry outShaftSpeed="6701.03" maxTorque="178.13" minTorque="-178.13"/> + <Entry outShaftSpeed="6774.67" maxTorque="176.20" minTorque="-176.20"/> + <Entry outShaftSpeed="6848.31" maxTorque="174.30" minTorque="-174.30"/> + <Entry outShaftSpeed="6921.94" maxTorque="172.44" minTorque="-172.44"/> + <Entry outShaftSpeed="6995.58" maxTorque="170.64" minTorque="-170.64"/> + <Entry outShaftSpeed="7069.22" maxTorque="168.85" minTorque="-168.85"/> + <Entry outShaftSpeed="7142.86" maxTorque="167.11" minTorque="-167.11"/> + <Entry outShaftSpeed="7216.49" maxTorque="165.41" minTorque="-165.41"/> + <Entry outShaftSpeed="7290.13" maxTorque="163.74" minTorque="-163.74"/> + <Entry outShaftSpeed="7363.77" maxTorque="162.10" minTorque="-162.10"/> + </MaxTorqueCurve> <PowerMap> <Entry outShaftSpeed="0.00" torque="-485.00" electricPower="8.79"/> <Entry outShaftSpeed="0.00" torque="-469.84" electricPower="8.28"/> @@ -4127,11 +4269,6 @@ </di:Reference> </v2.3:Signature> </ElectricMachineSystem> - <P2.5GearRatios> - <!-- only for P2.5 HEV --> - <Ratio gear="1">1.000</Ratio> - <Ratio gear="2">2.000</Ratio> - </P2.5GearRatios> </ElectricMachine> <ElectricEnergyStorage> <Battery> @@ -4145,32 +4282,34 @@ <AppVersion>aaaaa</AppVersion> <CertificationMethod>Measured</CertificationMethod> <BatteryType>HPBS</BatteryType> - <RatedCapacity>72.00</RatedCapacity> + <RatedCapacity>324.00</RatedCapacity> <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded> <JunctionboxIncluded>true</JunctionboxIncluded> <TestingTemperature>20</TestingTemperature> <OCV> - <Entry SoC="0" OCV="620.00"/> - <Entry SoC="100" OCV="640.00"/> + <Entry SoC="0" OCV="673.50"/> + <Entry SoC="100" OCV="750.20"/> </OCV> <InternalResistance> <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/> <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/> </InternalResistance> <CurrentLimits> - <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/> - <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/> + <Entry SoC="0" maxChargingCurrent="500.00" maxDischargingCurrent="500.00"/> + <Entry SoC="100" maxChargingCurrent="500.00" maxDischargingCurrent="500.00"/> </CurrentLimits> </v2.4:Data> <Signature> - <di:Reference> - <di:DigestMethod Algorithm=""/> - <di:DigestValue/> + <di:Reference URI="#BAT-asdf"> + <di:Transforms> + <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </di:Transforms> + <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue> </di:Reference> </Signature> </REESS> - <SOCmin>20</SOCmin> - <SOCmax>80</SOCmax> </Battery> <Battery> <StringID>1</StringID> @@ -4183,27 +4322,31 @@ <AppVersion>aaaaa</AppVersion> <CertificationMethod>Measured</CertificationMethod> <BatteryType>HPBS</BatteryType> - <RatedCapacity>72.00</RatedCapacity> + <RatedCapacity>324.00</RatedCapacity> <ConnectorsSubsystemsIncluded>true</ConnectorsSubsystemsIncluded> <JunctionboxIncluded>true</JunctionboxIncluded> <TestingTemperature>20</TestingTemperature> <OCV> - <Entry SoC="0" OCV="620.00"/> - <Entry SoC="100" OCV="640.00"/> + <Entry SoC="0" OCV="673.50"/> + <Entry SoC="100" OCV="750.20"/> </OCV> <InternalResistance> <Entry SoC="0" R_2="10.00" R_10="11.00" R_20="12.00"/> <Entry SoC="100" R_2="12.00" R_10="14.00" R_20="16.00"/> </InternalResistance> <CurrentLimits> - <Entry SoC="0" maxChargingCurrent="50.00" maxDischargingCurrent="0.00"/> - <Entry SoC="100" maxChargingCurrent="0.00" maxDischargingCurrent="50.00"/> + <Entry SoC="0" maxChargingCurrent="500.00" maxDischargingCurrent="500.00"/> + <Entry SoC="100" maxChargingCurrent="500.00" maxDischargingCurrent="500.00"/> </CurrentLimits> </v2.4:Data> <Signature> - <di:Reference> - <di:DigestMethod Algorithm=""/> - <di:DigestValue/> + <di:Reference URI="#BAT-asdf"> + <di:Transforms> + <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/> + <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/> + </di:Transforms> + <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> + <di:DigestValue>22QLOYTZK+bUIolzdEzc3Ut0wPIOXEBdWv72ST0Zbyw=</di:DigestValue> </di:Reference> </Signature> </REESS>