Make sure all tests pass.

Author: Isaac-Ito-MW

ChangeLog.md

@@ -1,11 +1,30 @@
 # Change Log
 
-## Version 1.6 ... work-in-progress
-
+## Version 1.6
+
+- Signal Source Block Library (`Utility` > `SignalDesigner` folder)
+  is newly introduced to replace Input Signal Builder
+  for streamlined workflow to design and use input signals.
+  In this update, it is used in the harness model for
+  Power Split Drive Unit component.
+  It will be deployed to other models in future updates.
 - Motor Drive Unit (MDU) component is revamped with
   a new harness model and tests.
 - Motor Generator 1 (MG1) and Motor Generator 2 (MG2) components
   are updated to use the new MDU component.
+- Engine component is revamped using Generic Engine block in
+  Simscape Driveline which now supports torque command
+  in addition to throttle.
+  Tests are updated too.
+- Power Split Drive Unit is revamped with the updated motor drive unit
+  and engine components as well as the new Signal Source Block Library.
+- All test cases of Power-Split HEV system model with direct torque input
+  (`HEV` > `PowerSplitHEV_DirectInput`)
+  now work without any warnings during simulation.
+  Previously some of the test cases had many warnings during simulation,
+  but they are all removed properly in this update.
+  The root cause was a wrong block configuration in From Workspace block
+  where interpolation had to be on, but it was off.
 
 ## Version 1.5
 

Components/BatteryHighVoltage/images/image_BatteryHV_harness_model.png

@@ -0,0 +1,91 @@
+component EngineCustom
+% Abstract Engine Model
+% This block represents an abstract internal combustion engine.
+% The model is based on a thrid-order polynomial model.
+% Engine speed at peak power is automatically determined
+% from peak torque, peak torque speed, and peak power
+% according to the polynomial model.
+% <br/>
+% <br/>
+% View <a href="matlab:EngineUtility.plotCustomEngineCurves(gcb);">engine torque and power curves</a>.
+
+% Copyright 2022 The MathWorks, Inc.
+
+parameters
+  PeakTorque = { 230  'N*m' }  % Peak torque
+  PeakTorqueSpeed = { 4000  'rpm' }  % Engine speed at peak torque
+  PeakPower = { 130 'kW' }  % Peak power
+  MaxSpeed = { 7000 'rpm' }  % Maximum engine speed
+  StallSpeed = { 500 'rpm' }  % Engine stall speed
+  SmoothingWidth = { 100 'rpm' }  % Stall smoothing width
+end
+equations
+  assert( PeakTorque > 0 )
+  assert( PeakTorqueSpeed > 0 )
+  assert( PeakTorque*PeakTorqueSpeed < PeakPower )
+  assert( StallSpeed < PeakTorqueSpeed )
+  assert( SmoothingWidth > 0 )
+end
+
+parameters (Access = private)
+  PeakPowerSpeed = (3*PeakPower + sqrt(PeakPower*(9*PeakPower - 8*PeakTorque*PeakTorqueSpeed))) ...
+                   / (4*PeakTorque)
+  % Normalized engine speed at peak torque
+  w_NPT = PeakTorqueSpeed / PeakPowerSpeed
+  s_1 = (3 - 4*w_NPT) / (2*(1 - w_NPT));
+  s_2 = w_NPT / (1 - w_NPT);
+  s_3 = 1 / (2*(w_NPT - 1));
+  p_1 = s_1 * 2*PeakTorque/(3 - w_NPT);
+  p_2 = s_2 * 2*PeakTorque/(3 - w_NPT) / PeakPowerSpeed;
+  p_3 = s_3 * 2*PeakTorque/(3 - w_NPT) / PeakPowerSpeed^2;
+end
+equations
+  assert( PeakPowerSpeed > PeakTorqueSpeed )
+end
+
+inputs
+  TrqCmdIn = { 0 'N*m' }  % TrqCmd:left
+end
+
+nodes
+  B = foundation.mechanical.rotational.rotational  % B:left
+end
+
+nodes
+  F = foundation.mechanical.rotational.rotational  % F:right
+end
+
+variables
+  w = { 0 'rad/s' }  % Engine speed
+  trq = { 0 'N*m' }  % Engine torque
+end
+
+branches
+  trq : B.t -> F.t
+end
+
+intermediates (ExternalAccess = observe)
+  thr_Norm = max( 0 , min( TrqCmdIn/PeakTorque , 1 ))
+
+  w_Norm = w / PeakPowerSpeed
+
+  trq_Norm = 2*(s_1 + s_2*w_Norm + s_3*w_Norm^2)/(3 - w_NPT)
+
+  trq_WOT = PeakTorque*trq_Norm
+
+  % Smoothing factor near stall speed
+  smoothing_factor = if w > StallSpeed
+                       tanh(4 * (w - StallSpeed)/SmoothingWidth)
+                     else
+                       { 0 '1' }
+                     end
+end
+
+equations
+  w == F.w - B.w
+  assert( w < MaxSpeed )
+
+  trq == smoothing_factor*thr_Norm*trq_WOT
+end
+
+end  % component

Components/BatteryHighVoltage/images/image_BatteryHV_refsub_Basic.png

@@ -42,8 +42,8 @@ __MWOPC_PART_BEGIN__ /metadata/coreProperties.xml
   <dcterms:created xsi:type="dcterms:W3CDTF">2020-10-12T08:00:32Z</dcterms:created>
   <dc:creator>isaacito</dc:creator>
   <cp:lastModifiedBy>isaacito</cp:lastModifiedBy>
-  <dcterms:modified xsi:type="dcterms:W3CDTF">2022-12-22T16:31:34Z</dcterms:modified>
-  <cp:revision>5.13</cp:revision>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">2023-01-11T16:23:18Z</dcterms:modified>
+  <cp:revision>5.14</cp:revision>
   <cp:version>R2022b</cp:version>
 </cp:coreProperties>
 
@@ -65,11 +65,11 @@ __MWOPC_PART_BEGIN__ /metadata/mwcorePropertiesReleaseInfo.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version information for MathWorks R2022b Release -->
 <MathWorks_version_info>
-  <version>9.13.0.2143701</version>
+  <version>9.13.0.2158767</version>
   <release>R2022b</release>
-  <description>Update 3</description>
-  <date>Dec 08 2022</date>
-  <checksum>3517180572</checksum>
+  <description>Update 4</description>
+  <date>Dec 31 2022</date>
+  <checksum>433223369</checksum>
 </MathWorks_version_info>
 
 __MWOPC_PART_BEGIN__ /simulink/_rels/blockdiagram.xml.rels
@@ -114,7 +114,7 @@ __MWOPC_PART_BEGIN__ /simulink/blockdiagram.xml
     <ConfigManagerSettings>
       <P Name="ModifiedByFormat">%&lt;Auto&gt;</P>
       <P Name="ModifiedDateFormat">%&lt;Auto&gt;</P>
-      <P Name="ModelVersionFormat">%&lt;AutoIncrement:5.13&gt;</P>
+      <P Name="ModelVersionFormat">%&lt;AutoIncrement:5.14&gt;</P>
     </ConfigManagerSettings>
     <EditorSettings>
       <P Name="ScheduleConnectors">off</P>
@@ -135,7 +135,7 @@ __MWOPC_PART_BEGIN__ /simulink/blockdiagram.xml
       <Object PropName="InstrumentedSignals" ObjectID="2" ClassName="Simulink.HMI.InstrumentedSignals">
         <Array PropName="Persistence" Type="Struct" Dimension="5*1">
           <MATStruct>
-            <Field Name="UUID" Class="char">f025e85e-da49-41a9-9b1c-c4e2d8f5a63d</Field>
+            <Field Name="UUID" Class="char">cb5d9070-5527-4d13-8350-35ccef74cb33</Field>
             <Field Name="BlockPath_" Class="char">Measurement/From12</Field>
             <Field Name="SID_" Class="char">3300</Field>
             <Field Name="SubPath_" Class="char"/>
@@ -155,7 +155,7 @@ __MWOPC_PART_BEGIN__ /simulink/blockdiagram.xml
             <Field Name="VisualType_" Class="char"/>
           </MATStruct>
           <MATStruct>
-            <Field Name="UUID" Class="char">0d664bfd-a7ec-4f24-8e19-a04ee2be9f08</Field>
+            <Field Name="UUID" Class="char">8f8440c9-1aa6-4e7a-90c8-c5ef1f33cdb7</Field>
             <Field Name="BlockPath_" Class="char">Measurement/From14</Field>
             <Field Name="SID_" Class="char">3302</Field>
             <Field Name="SubPath_" Class="char"/>
@@ -175,7 +175,7 @@ __MWOPC_PART_BEGIN__ /simulink/blockdiagram.xml
             <Field Name="VisualType_" Class="char"/>
           </MATStruct>
           <MATStruct>
-            <Field Name="UUID" Class="char">c9609fd6-68be-4e86-b1f7-1d01026f6dab</Field>
+            <Field Name="UUID" Class="char">5afd763f-9d42-4a45-b7ae-6e37ab50f8af</Field>
             <Field Name="BlockPath_" Class="char">Measurement/From16</Field>
             <Field Name="SID_" Class="char">3304</Field>
             <Field Name="SubPath_" Class="char"/>
@@ -195,7 +195,7 @@ __MWOPC_PART_BEGIN__ /simulink/blockdiagram.xml
             <Field Name="VisualType_" Class="char"/>
           </MATStruct>
           <MATStruct>
-            <Field Name="UUID" Class="char">c9d168b4-05f9-4198-a118-3920707f443d</Field>
+            <Field Name="UUID" Class="char">00c0da20-8321-4f7d-9a91-9ee366b905c5</Field>
             <Field Name="BlockPath_" Class="char">Measurement/From25</Field>
             <Field Name="SID_" Class="char">3308</Field>
             <Field Name="SubPath_" Class="char"/>
@@ -215,7 +215,7 @@ __MWOPC_PART_BEGIN__ /simulink/blockdiagram.xml
             <Field Name="VisualType_" Class="char"/>
           </MATStruct>
           <MATStruct>
-            <Field Name="UUID" Class="char">0366a61f-87bb-4cb6-bc58-4531e153be4c</Field>
+            <Field Name="UUID" Class="char">5031be83-52f0-4151-97c7-5fb72250552e</Field>
             <Field Name="BlockPath_" Class="char">Measurement/From26</Field>
             <Field Name="SID_" Class="char">3309</Field>
             <Field Name="SubPath_" Class="char"/>
@@ -1170,8 +1170,8 @@ __MWOPC_PART_BEGIN__ /simulink/graphicalInterface.xml
 __MWOPC_PART_BEGIN__ /simulink/modelDictionary.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <MF0 version="1.1" defaultPackage="slid" packageUris="http://schema.mathworks.com/mf0/slid/R2022b_20220222">
-  <System type="System" uuid="bd1932c0-869a-4cab-9588-e7808dda2f5f">
-    <Interface type="Interface" uuid="e659c6ef-f1fe-4a48-8903-01ea84b25ecc"/>
+  <System type="System" uuid="43741dc8-dec1-46b8-a542-d0a3ec3f7eae">
+    <Interface type="Interface" uuid="c52e6056-bd6c-42c2-a4d7-b5a484fe3efe"/>
   </System>
 </MF0>
 __MWOPC_PART_BEGIN__ /simulink/plugins/SimscapeModelParametersPlugin.xml
@@ -2611,7 +2611,7 @@ __MWOPC_PART_BEGIN__ /simulink/systems/system_root.xml
 <System>
   <P Name="Location">[121, 67, 1190, 821]</P>
   <P Name="ReportName">simulink-default.rpt</P>
-  <P Name="SIDHighWatermark">18453</P>
+  <P Name="SIDHighWatermark">20960</P>
   <Block BlockType="Inport" Name="Inputs" SID="308">
     <P Name="Position">[-320, -292, -290, -278]</P>
     <P Name="ZOrder">187</P>
@@ -2747,106 +2747,106 @@ __MWOPC_PART_BEGIN__ /simulink/systems/system_root.xml
     <P Name="ZOrder">221</P>
   </Block>
   <Line LineType="Connection">
-    <P Name="ZOrder">9642</P>
-    <P Name="Src">3748#lconn:1</P>
-    <P Name="Points">[-48, 0; 0, -130]</P>
+    <P Name="ZOrder">464</P>
+    <P Name="Src">47#rconn:1</P>
+    <P Name="Points">[27, 0]</P>
+    <Branch ConnectType="DEST_DEST">
+      <P Name="Src">3748#lconn:1</P>
+      <P Name="Points">[-48, 0; 0, -130]</P>
+    </Branch>
     <Branch ConnectType="DEST_SRC">
       <P Name="Dst">3747#lconn:1</P>
     </Branch>
-    <Branch ConnectType="DEST_DEST">
-      <P Name="Src">47#rconn:1</P>
-      <P Name="Points">[27, 0]</P>
-    </Branch>
   </Line>
   <Line>
-    <P Name="ZOrder">17704</P>
+    <P Name="ZOrder">17724</P>
     <P Name="Src">3747#out:1</P>
     <P Name="Dst">3282#in:1</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17705</P>
+    <P Name="ZOrder">17725</P>
     <P Name="Src">3288#out:1</P>
     <P Name="Dst">3279#in:2</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17706</P>
+    <P Name="ZOrder">17726</P>
     <P Name="Src">3289#out:1</P>
     <P Name="Dst">3279#in:1</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17707</P>
+    <P Name="ZOrder">17727</P>
     <P Name="Src">3290#out:1</P>
     <P Name="Dst">3279#in:3</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17708</P>
+    <P Name="ZOrder">17728</P>
     <P Name="Src">3333#out:1</P>
     <P Name="Dst">3279#in:4</P>
   </Line>
   <Line LineType="Connection">
-    <P Name="ZOrder">17709</P>
+    <P Name="ZOrder">17729</P>
     <P Name="Src">3749#lconn:1</P>
     <P Name="Dst">3750#lconn:4</P>
   </Line>
   <Line LineType="Connection">
-    <P Name="ZOrder">17710</P>
+    <P Name="ZOrder">17730</P>
     <P Name="Src">48#rconn:1</P>
     <P Name="Dst">3750#lconn:1</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17711</P>
+    <P Name="ZOrder">17731</P>
     <P Name="Src">3279#out:1</P>
     <P Name="Dst">3751#in:1</P>
   </Line>
   <Line LineType="Connection">
-    <P Name="ZOrder">17712</P>
+    <P Name="ZOrder">17732</P>
     <P Name="Src">3747#lconn:2</P>
     <P Name="Points">[23, 0; 0, 55]</P>
     <P Name="Dst">3750#lconn:3</P>
   </Line>
   <Line LineType="Connection">
-    <P Name="ZOrder">17713</P>
+    <P Name="ZOrder">17733</P>
     <P Name="Src">3748#lconn:2</P>
     <P Name="Dst">3750#lconn:2</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17714</P>
+    <P Name="ZOrder">17734</P>
     <P Name="Src">3748#out:1</P>
     <P Name="Dst">3283#in:1</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17715</P>
+    <P Name="ZOrder">17735</P>
     <P Name="Src">3749#out:1</P>
     <P Name="Dst">3284#in:1</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17718</P>
+    <P Name="ZOrder">17738</P>
     <P Name="Src">308#out:1</P>
     <P Name="Points">[15, 0]</P>
     <Branch>
-      <P Name="ZOrder">17717</P>
+      <P Name="ZOrder">17737</P>
       <P Name="Dst">3753#in:1</P>
     </Branch>
     <Branch>
-      <P Name="ZOrder">17716</P>
+      <P Name="ZOrder">17736</P>
       <P Name="Points">[0, -55]</P>
       <P Name="Dst">3331#in:1</P>
     </Branch>
   </Line>
   <Line>
-    <P Name="ZOrder">17719</P>
+    <P Name="ZOrder">17739</P>
     <P Name="Src">3753#out:2</P>
     <P Name="Points">[33, 0; 0, 40]</P>
     <P Name="Dst">3747#in:1</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17720</P>
+    <P Name="ZOrder">17740</P>
     <P Name="Src">3753#out:3</P>
     <P Name="Points">[17, 0; 0, 150]</P>
     <P Name="Dst">3748#in:1</P>
   </Line>
   <Line>
-    <P Name="ZOrder">17721</P>
+    <P Name="ZOrder">17741</P>
     <P Name="Src">3753#out:1</P>
     <P Name="Points">[515, 0; 0, 205]</P>
     <P Name="Dst">3749#in:1</P>
@@ -2858,7 +2858,7 @@ __MWOPC_PART_BEGIN__ /simulink/systems/system_root.xml
     <P Name="FixedHeight">on</P>
     <P Name="FixedWidth">on</P>
     <P Name="AnnotationType">image_annotation</P>
-    <P Name="ZOrder">-682</P>
+    <P Name="ZOrder">-31</P>
   </Annotation>
   <Annotation SID="2441">
     <P Name="Name">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@@ -2869,7 +2869,7 @@ p, li { white-space: pre-wrap; }
     <P Name="Position">[41, 9, 268, 25]</P>
     <P Name="InternalMargins">[0, 0, 0, 0]</P>
     <P Name="Interpreter">rich</P>
-    <P Name="ZOrder">-683</P>
+    <P Name="ZOrder">-32</P>
   </Annotation>
 </System>
 
@@ -2994,7 +2994,7 @@ __MWOPC_PART_BEGIN__ /simulink/windowsInfo.xml
       <Array PropName="PersistedApps" Type="Cell" Dimension="0*1"/>
       <P Name="WindowUuid" Class="char">236b416f-95e3-4ef2-b5c6-afc262f79381</P>
     </Object>
-    <P Name="BDUuid" Class="char">13322a30-55ae-4611-a957-50096eaed619</P>
+    <P Name="BDUuid" Class="char">65f3075f-2f4f-4c24-9617-e42386598e7f</P>
   </Object>
 </WindowsInfo>