Merge v1.6.0 (dzimmer#199)

Update release version, date, release notes and activate conversion script from v1.5.0
modelica-3rdparty · Sep 12, 2023 · 3ae99d2 · 3ae99d2
1 parent d1b369a
commit 3ae99d2
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 23 deletions.
diff --git a/PlanarMechanics/UsersGuide/ReleaseNotes.mo b/PlanarMechanics/UsersGuide/ReleaseNotes.mo
@@ -5,7 +5,7 @@ class ReleaseNotes "Release notes"
   annotation (
     Documentation(
       info="<html>
-<h4>Version 1.6.0, 2022-??-??</h4>
+<h4>Version 1.6.0, 2023-09-12</h4>
 <p>
 This version requires the <strong>Modelica&nbsp;4.0.0</strong> Library.
 It is backwards compatible to previous library versions.
@@ -14,16 +14,16 @@ It is backwards compatible to previous library versions.
 <p>New components:</p>
 <ul>
   <li>
-    <a href=\"modelica://PlanarMechanics.VehicleComponents.AirResistanceLongitudinal\">Air drag model</a>
+    VehicleComponents: <a href=\"modelica://PlanarMechanics.VehicleComponents.AirResistanceLongitudinal\">Air drag model</a>
     for vehicles.
   </li>
 </ul>
 
 <p>Improvements in this version:</p>
 <ul>
   <li>
-    <a href=\"modelica://PlanarMechanics.Sources.QuadraticSpeedDependentForce\">QuadraticSpeedDependentForce</a>
-    Fix redundant equations when <code>resolveInFrame&nbsp;= frame_resolve</code>.
+    <a href=\"modelica://PlanarMechanics.Sources.QuadraticSpeedDependentForce\">QuadraticSpeedDependentForce</a>:
+    delete redundant equations when <code>resolveInFrame&nbsp;= frame_resolve</code>.
   </li>
   <li>
     Types <a href=\"modelica://PlanarMechanics.Types.Color\">Color</a>
@@ -33,6 +33,21 @@ It is backwards compatible to previous library versions.
     <a href=\"modelica://Modelica.Mechanics.MultiBody.Types\">Modelica.Mechanics.MultiBody.Types</a>
     are used instead.
   </li>
+  <li>
+    <a href=\"modelica://PlanarMechanics.Sensors\">Sensors</a> and
+    <a href=\"modelica://PlanarMechanics.Sources\">Sources</a>:
+    use <a href=\"modelica://Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector\">Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector</a>
+    for visualization of vector quantities (force, torque, etc.).
+  </li>
+  <li>
+    <a href=\"modelica://PlanarMechanics.Examples.WheelBasedCraneCrab\">Examples.WheelBasedCraneCrab</a>:
+    fix typo in the example name (previously WheelBasedCranCrab).
+  </li>
+  <li>
+    VehicleComponents: add
+    <a href=\"modelica://PlanarMechanics.VehicleComponents.Wheels.BaseClasses\">Wheels.BaseClasses</a>
+    to collect common wheel&apos;s elements.
+  </li>
 </ul>
 
 

diff --git a/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelBase.mo b/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelBase.mo
@@ -65,11 +65,11 @@ a&nbsp;proper model, see e.g.
 <a href=\"modelica://PlanarMechanics.VehicleComponents.Wheels.IdealWheelJoint\">IdealWheelJoint</a> model.
 </p>
 <p>
-Note: If this model is used, the loss power has to be provided by an equation
-in the model which inherits from the
+Note: the loss power has to be provided by an equation in the model which
+inherits from this partial model, such as
 </p>
 <blockquote><pre>
-WheelInterfaces model(<strong>lossPower = ...</strong>).
+WheelBase model(<strong>lossPower = ...</strong>).
 </pre></blockquote>
 </html>"));
 end WheelBase;
diff --git a/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelInterfaces.mo b/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelInterfaces.mo
@@ -18,8 +18,8 @@ a&nbsp;proper model, see e.g.
 <a href=\"modelica://PlanarMechanics.VehicleComponents.Wheels.IdealWheelJoint\">IdealWheelJoint</a> model.
 </p>
 <p>
-Note: If this model is used, the loss power has to be provided by an equation
-in the model which inherits from the
+Note: the loss power has to be provided by an equation in the model which
+inherits from this partial model, such as
 </p>
 <blockquote><pre>
 WheelInterfaces model(<strong>lossPower = ...</strong>).

diff --git a/PlanarMechanics/libraryinfo.mos b/PlanarMechanics/libraryinfo.mos
@@ -6,9 +6,9 @@ LibraryInfoMenuCommand(
   category="libraries",
   text="PlanarMechanics",
   reference="PlanarMechanics",
-  version="1.5.1",
+  version="1.6.0",
   isModel=true,
-  description="Planar Mechanics Library 1.5.1",
+  description="Planar Mechanics Library 1.6.0",
   ModelicaVersion="4.0.0",
   pos=1130)
 

diff --git a/PlanarMechanics/package.mo b/PlanarMechanics/package.mo
@@ -7,9 +7,9 @@ package PlanarMechanics "Library to model 2-dimensional, planar mechanical syste
 
   annotation (
     preferredView="info",
-    version="1.5.1",
-    versionDate="2021-11-30",
-    dateModified = "2021-11-30 12:00:00Z",
+    version="1.6.0",
+    versionDate="2023-09-12",
+    dateModified = "2023-09-12 12:00:00Z",
     uses(
       Modelica(version="4.0.0")),
     conversion(
@@ -18,9 +18,11 @@ package PlanarMechanics "Library to model 2-dimensional, planar mechanical syste
         script="modelica://PlanarMechanics/Resources/Scripts/Conversion/ConvertFromPlanarMechanics_1_3_0.mos"),
       from(
         version={"1.4.1","1.4.0"},
+        to="1.5.0",
         script="modelica://PlanarMechanics/Resources/Scripts/Conversion/ConvertFromPlanarMechanics_1_4_1.mos"),
-      noneFromVersion="1.5.0",
-      noneFromVersion="1.5.1"),
+      from(
+        version={"1.5.1","1.5.0"},
+        script="modelica://PlanarMechanics/Resources/Scripts/Conversion/ConvertFromPlanarMechanics_1_5_0.mos")),
     Documentation(
       info="<html>
 <p>
@@ -43,7 +45,7 @@ In order to know how the library works, first have a look at:
 
 <h4>Licensed by DLR under the 3-Clause BSD License</h4>
 <p>
-Copyright &copy; 2010-2020, Deutsches Zentrum f&uuml;r Luft- und Raumfahrt (DLR)
+Copyright &copy; 2010-2023, Deutsches Zentrum f&uuml;r Luft- und Raumfahrt (DLR)
 </p>
 <p>
 <em>This Modelica package is <u>free</u> software and the use is completely

diff --git a/PlanarMechanicsTest/package.mo b/PlanarMechanicsTest/package.mo
@@ -1,14 +1,14 @@
 within ;
-package PlanarMechanicsTest "Library to test components of package PlanarMechanics - Version 1.5.1"
+package PlanarMechanicsTest "Library to test components of package PlanarMechanics - Version 1.6.0"
   extends Modelica.Icons.Package;
 
   annotation (
-    version="1.5.1",
-    versionDate="2021-11-30",
-    dateModified = "2021-11-30 12:00:00Z",
+    version="1.6.0",
+    versionDate="2023-09-12",
+    dateModified = "2023-09-12 12:00:00Z",
     uses(
       Modelica(version="4.0.0"),
-      PlanarMechanics(version="1.5.1")),
+      PlanarMechanics(version="1.6.0")),
     Documentation(info="<html>
 <p>
 This library provides models and functions to test components of

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ The PlanarMechanics library is an open-source Modelica library for the modelling
 
 ## Current release
 
-[PlanarMechanics Library 1.5.1 (2021-11-30)](../../releases/tag/v1.5.1)
+[PlanarMechanics Library 1.6.0 (2023-09-12)](../../releases/tag/v1.6.0)
 
 ## License