From 3ae99d218bf1331901efb7c93569f44b9c3c573a Mon Sep 17 00:00:00 2001 From: tobolar Date: Tue, 12 Sep 2023 08:58:00 +0200 Subject: [PATCH] Merge v1.6.0 (#199) Update release version, date, release notes and activate conversion script from v1.5.0 --- PlanarMechanics/UsersGuide/ReleaseNotes.mo | 23 +++++++++++++++---- .../Wheels/BaseClasses/WheelBase.mo | 6 ++--- .../Wheels/BaseClasses/WheelInterfaces.mo | 4 ++-- PlanarMechanics/libraryinfo.mos | 4 ++-- PlanarMechanics/package.mo | 14 ++++++----- PlanarMechanicsTest/package.mo | 10 ++++---- README.md | 2 +- 7 files changed, 40 insertions(+), 23 deletions(-) diff --git a/PlanarMechanics/UsersGuide/ReleaseNotes.mo b/PlanarMechanics/UsersGuide/ReleaseNotes.mo index 9fdf8eec..bcfc4189 100644 --- a/PlanarMechanics/UsersGuide/ReleaseNotes.mo +++ b/PlanarMechanics/UsersGuide/ReleaseNotes.mo @@ -5,7 +5,7 @@ class ReleaseNotes "Release notes" annotation ( Documentation( info=" -

Version 1.6.0, 2022-??-??

+

Version 1.6.0, 2023-09-12

This version requires the Modelica 4.0.0 Library. It is backwards compatible to previous library versions. @@ -14,7 +14,7 @@ It is backwards compatible to previous library versions.

New components:

@@ -22,8 +22,8 @@ It is backwards compatible to previous library versions.

Improvements in this version:

diff --git a/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelBase.mo b/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelBase.mo index 28c7b01f..ce55c76b 100644 --- a/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelBase.mo +++ b/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelBase.mo @@ -65,11 +65,11 @@ a proper model, see e.g. IdealWheelJoint model.

-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 

-WheelInterfaces model(lossPower = ...).
+WheelBase model(lossPower = ...).
")); end WheelBase; diff --git a/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelInterfaces.mo b/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelInterfaces.mo index 226c8723..2d7472d0 100644 --- a/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelInterfaces.mo +++ b/PlanarMechanics/VehicleComponents/Wheels/BaseClasses/WheelInterfaces.mo @@ -18,8 +18,8 @@ a proper model, see e.g. IdealWheelJoint model.

-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 

 WheelInterfaces model(lossPower = ...).
diff --git a/PlanarMechanics/libraryinfo.mos b/PlanarMechanics/libraryinfo.mos
index 7ad54fc1..19fa1bbd 100644
--- 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
index 8790971f..4fe7dc44 100644
--- 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="
 

@@ -43,7 +45,7 @@ In order to know how the library works, first have a look at:
 
 
Licensed by DLR under the 3-Clause BSD License

 

-Copyright © 2010-2020, Deutsches Zentrum für Luft- und Raumfahrt (DLR)
+Copyright © 2010-2023, Deutsches Zentrum für Luft- und Raumfahrt (DLR)
 

 

 This Modelica package is free software and the use is completely
diff --git a/PlanarMechanicsTest/package.mo b/PlanarMechanicsTest/package.mo
index 77d906fb..3417017a 100644
--- 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="
 

 This library provides models and functions to test components of
diff --git a/README.md b/README.md
index b74de94e..cc3e17ff 100644
--- 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