diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IdealizedContact 0.1.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/IdealizedContact 0.1.0/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IdealizedContact 0.1.0/openmodelica.metadata.json" 2022-03-10 09:57:42.228144662 +0000 +++ "converted-libraries/.openmodelica/libraries/IdealizedContact 0.1.0/openmodelica.metadata.json" 2022-03-10 09:58:06.476147734 +0000 @@ -1 +1 @@ -{"path":"IdealizedContact 0.1.0", "sha":"7ff774f281d6ae88237167fe216880079ba41295", "support":"obsolete", "uses":{"Modelica":"3.2.0"}, "version":"0.1.0", "zipfile":"https://github.com/tbeu/IdealizedContact/archive/7ff774f281d6ae88237167fe216880079ba41295.zip"} +{"path": "IdealizedContact 0.1.0", "sha": "7ff774f281d6ae88237167fe216880079ba41295", "support": "obsolete", "uses": {"Modelica": "4.0.0"}, "version": "0.1.0", "zipfile": "https://github.com/tbeu/IdealizedContact/archive/7ff774f281d6ae88237167fe216880079ba41295.zip", "extraInfo": "Conversion script /home/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"} \ No newline at end of file diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IdealizedContact 0.1.0/package.mo" "converted-libraries/.openmodelica/libraries/IdealizedContact 0.1.0/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IdealizedContact 0.1.0/package.mo" 2022-03-10 09:57:42.228144662 +0000 +++ "converted-libraries/.openmodelica/libraries/IdealizedContact 0.1.0/package.mo" 2022-03-10 09:58:06.476147734 +0000 @@ -1177,7 +1177,7 @@ model Example7 "Rectangle to rectangle" extends Modelica.Icons.Example; - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Density density=7850; parameter SI.Length length=0.07; parameter SI.Length width=0.1; @@ -1797,7 +1797,7 @@ model SphericalContactSurface "Model to define a spherical contact surface" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Radius radius=0.015 "radius of the spherical contact surface"; parameter Boolean animation=true "= true, if animation shall be enabled"; parameter Boolean animation_BCS = true @@ -1925,7 +1925,7 @@ model CylindricalContactSurface "Model to define a cylindrical contact surface" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Diameter diameter=0.015 "diameter of cylindrical surface"; parameter SI.Length length=0.05 "length of cylindrical surface"; parameter Modelica.Mechanics.MultiBody.Types.Axis diameterDirection={0,0,1} @@ -2094,7 +2094,7 @@ model RectangularPlaneContactSurface "Model to define a rectangular and plane contact surface" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Length length=0.04; parameter SI.Length width=0.02; @@ -2239,7 +2239,7 @@ model CircularPlaneContactSurface "Model to define a circular and plane contact surface" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Diameter diameter=0.015; parameter Modelica.Mechanics.MultiBody.Types.Axis lengthDirection={0,1,0} "Length Direction"; @@ -2392,7 +2392,7 @@ extends Modelica.Icons.Package; model SphericalContactBody "Predefined sperical body with contact surface" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Density density=7850 "density of the material"; parameter SI.Radius radius=0.015 "radius of the spherical contact surface"; parameter Boolean animation=true "= true, if animation shall be enabled"; @@ -2485,7 +2485,7 @@ model CylindricalContactBody "Predefined cylindrical body with contact surfaces" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Boolean enableLateralSurface = true "= true, if lateral contact surface shall be enabled" annotation (choices(__Dymola_checkBox=true)); parameter Boolean enableFrontSurface1 = true @@ -2682,7 +2682,7 @@ end CylindricalContactBody; model CuboidContactBody "Predefined cuboid body with contact surfaces" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Boolean enableSurface1 = true "= true, if contact surface 1 shall be enabled" annotation (choices(__Dymola_checkBox=true)); @@ -3013,8 +3013,9 @@ package ContactBlock extends Modelica.Icons.Package; + model Contact - import SI = Modelica.SIunits; + import Modelica.Units.SI; inner parameter SI.TranslationalSpringConstant springCoefficient=1000000 "spring coefficient to calculate normal force" annotation(Dialog(group="Normal force")); inner parameter SI.TranslationalDampingConstant dampingCoefficient=100000 @@ -3051,7 +3052,7 @@ inner parameter Boolean animation=true "= true to animate contact points" annotation(Dialog(tab="Animation")); - inner parameter Modelica.SIunits.Radius radiusContactPoint=0.0025 + inner parameter Modelica.Units.SI.Radius radiusContactPoint=0.0025 "radius of contact point animation" annotation(Dialog(tab="Animation")); inner parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0} "color of contact points of body 1" annotation(Dialog(tab="Animation")); @@ -3171,7 +3172,7 @@ end Contact; function plotFrictionCurve - import SI = Modelica.SIunits; + import Modelica.Units.SI; input SI.CoefficientOfFriction mue_k=0.03 "coefficient of kinetic friction" annotation(Dialog(group="Stribeck curve")); input SI.CoefficientOfFriction mue_s=0.04 "coefficient of static friction" @@ -3232,7 +3233,7 @@ package PunctiformContact model SphereToSphere extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; outer parameter Real n1 = 1.5; @@ -3247,7 +3248,7 @@ outer parameter SI.Distance p_max=0.001; outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -3355,9 +3356,10 @@ textString="Ball-Ball")}), Diagram(graphics)); end SphereToSphere; extends Modelica.Icons.Package; + model SphereToCylinder extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; outer parameter Real n1 = 1.5; @@ -3372,7 +3374,7 @@ outer parameter SI.Distance p_max=0.001; outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -3480,7 +3482,7 @@ model SphereToRectangle extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; @@ -3496,7 +3498,7 @@ outer parameter SI.Distance p_max=0.001; outer parameter SI.Frequency f=10000000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint = 0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint = 0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; @@ -3607,7 +3609,7 @@ model SphereToCircle extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; outer parameter Real n1 = 1.5; @@ -3622,7 +3624,7 @@ outer parameter SI.Distance p_max=0.001; outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -3734,9 +3736,9 @@ package Components extends Modelica.Icons.BasesPackage; model MovePointSphereToSphere - parameter Modelica.SIunits.Frequency f=100000; + parameter Modelica.Units.SI.Frequency f=100000; parameter Boolean Animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoint_Ball1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -3983,7 +3985,7 @@ model ForceSphereToSphere - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.TranslationalSpringConstant c=1000000; parameter SI.TranslationalDampingConstant d=1000; @@ -4194,7 +4196,7 @@ model MovePointSphereToCylinder parameter Real f=100000; parameter Boolean Animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -4515,7 +4517,7 @@ end MovePointSphereToCylinder; model ForceSphereToCylinder - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.TranslationalSpringConstant c=1000000; parameter SI.TranslationalDampingConstant d=1000; parameter Real n1 = 1.5; @@ -4743,9 +4745,9 @@ end ForceSphereToCylinder; model MovePointSphereToRectangle - parameter Modelica.SIunits.Frequency f=100000; + parameter Modelica.Units.SI.Frequency f=100000; parameter Boolean Animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -5036,7 +5038,7 @@ model ForceSphereToRectangle - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.TranslationalSpringConstant c=1000000 "spring constant"; parameter SI.TranslationalDampingConstant d=1000 "damping constant"; @@ -5265,7 +5267,7 @@ parameter Real f=100000; parameter Boolean Animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -5540,7 +5542,7 @@ model ForceSphereToCircle - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.TranslationalSpringConstant c=1000000; parameter SI.TranslationalDampingConstant d=1000; @@ -5742,7 +5744,6 @@ end ForceSphereToCircle; annotation(preferredView="info"); end Components; - annotation(preferredView="info"); end PunctiformContact; @@ -5750,7 +5751,7 @@ extends Modelica.Icons.Package; model CylinderToRectangle extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; outer parameter Real n1 = 1.5; @@ -5766,7 +5767,7 @@ outer parameter Boolean exact=false; outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -5943,7 +5944,7 @@ model CylinderToCircle extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; outer parameter Real n1 = 1.5; @@ -5959,7 +5960,7 @@ outer parameter Boolean exact=false; outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -6103,7 +6104,7 @@ model CylinderToCylinderPoint extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; outer parameter Real n1 = 1.5; @@ -6119,7 +6120,7 @@ outer parameter Boolean exact=false; outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -6230,7 +6231,7 @@ model CylinderToCylinderLine extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; outer parameter Real n1 = 1.5; @@ -6246,7 +6247,7 @@ outer parameter Boolean exact=false; outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -6407,7 +6408,7 @@ model CylinderToCylinderCombined extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=1000000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=1000000; outer parameter Real n1 = 1.5; @@ -6423,7 +6424,7 @@ outer parameter Boolean exact=false; outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -6687,11 +6688,11 @@ model MovePointCylinderToRectangle parameter Boolean exact=true; - parameter Modelica.SIunits.Frequency f=10000000; + parameter Modelica.Units.SI.Frequency f=10000000; parameter Real q=1 "1=left -1=right"; parameter Modelica.Mechanics.MultiBody.Types.Color Color_contact_point_rectangle = {255,0,255}; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; final parameter Modelica.Mechanics.MultiBody.Types.Axis y_direction={0,1,0} "cartesian coordinate system in y direction -- direction of gravity"; final parameter Modelica.Mechanics.MultiBody.Types.Axis x_direction={1,0,0}; @@ -6749,8 +6750,7 @@ rotation=0, origin={-108,20}), iconTransformation(extent={{-116,12},{-100,28}}))); - Modelica.Mechanics.MultiBody.Sensors.TansformRelativeVector - tansformRelativeVector(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_b, + Modelica.Mechanics.MultiBody.Sensors.TransformRelativeVector tansformRelativeVector(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_b, frame_r_out=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_a) "Transformation cylinder Length-Vektor from BCS-cylinder to BCS-rectangle" annotation (Placement(transformation(extent={{-6,-6},{6,6}}, @@ -7094,7 +7094,7 @@ end MovePointCylinderToRectangle; model ForceCylinderToRectangle - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Boolean exact=true; parameter SI.Frequency f=10000000; @@ -7120,7 +7120,7 @@ final parameter Modelica.Mechanics.MultiBody.Types.Axis z_direction=cross(x_direction, y_direction); parameter Boolean Animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color Color_contact_point_cylinder = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -7459,7 +7459,7 @@ model MovePointCylinderToCircle parameter Boolean exact=true; - parameter Modelica.SIunits.Frequency f=100000; + parameter Modelica.Units.SI.Frequency f=100000; parameter Real q=1 "1=left -1=right"; final parameter Modelica.Mechanics.MultiBody.Types.Axis y_direction={0,1,0} "cartesian coordinate system in y direction -- direction of gravity"; @@ -7486,8 +7486,7 @@ extent={{-6,-6},{6,6}}, rotation=270, origin={50,0}))); - Modelica.Mechanics.MultiBody.Sensors.TansformRelativeVector - tansformRelativeVector(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_b, + Modelica.Mechanics.MultiBody.Sensors.TransformRelativeVector tansformRelativeVector(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_b, frame_r_out=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_a) "Transformation cylinder Length-Vektor from BCS-cylinder to BCS-rectangle" annotation (Placement(transformation(extent={{-6,-6},{6,6}}, @@ -7848,7 +7847,7 @@ end MovePointCylinderToCircle; model ForceCylinderToCircle - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Boolean exact=true; parameter SI.Frequency f=10000000; parameter SI.TranslationalSpringConstant c=100000; @@ -7873,7 +7872,7 @@ final parameter Modelica.Mechanics.MultiBody.Types.Axis z_direction=cross(x_direction, y_direction); parameter Boolean Animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color Color_contact_point_cylinder = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -8193,7 +8192,7 @@ import VC = IdealizedContact.Components.VectorCalculations; - parameter Modelica.SIunits.Frequency f=100000; + parameter Modelica.Units.SI.Frequency f=100000; parameter Real q=1 "1=left -1=right"; final parameter Modelica.Mechanics.MultiBody.Types.Axis y_direction={0,1,0} "cartesian coordinate system in y direction -- direction of gravity"; @@ -8202,7 +8201,7 @@ constant Real pi=Modelica.Constants.pi; parameter Boolean animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color Color_contact_point_cylinder1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -8311,16 +8310,14 @@ n2=3, n3=3, n4=3) annotation (Placement(transformation(extent={{-92,-26},{-80,-14}}))); - Modelica.Mechanics.MultiBody.Sensors.TansformAbsoluteVector - tansformVectorCylinder1(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_a, + Modelica.Mechanics.MultiBody.Sensors.TransformAbsoluteVector tansformVectorCylinder1(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_a, frame_r_out=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.world) "Transformation length-direction cylinder1 from BCS1 to ICS" annotation (Placement(transformation( extent={{-6,-6},{6,6}}, rotation=90, origin={-86,76}))); - Modelica.Mechanics.MultiBody.Sensors.TansformAbsoluteVector - tansformVectorCylinder2(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_a, + Modelica.Mechanics.MultiBody.Sensors.TransformAbsoluteVector tansformVectorCylinder2(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_a, frame_r_out=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.world) "Transformation length-direction cylinder2 from BCS2 to ICS" annotation (Placement(transformation( @@ -8571,7 +8568,7 @@ end MovePointCylinderToCylinderLine; model ForceCylinderToCylinderLine - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Frequency f=10000000; parameter SI.TranslationalSpringConstant c=100000; @@ -8908,7 +8905,7 @@ import VC = IdealizedContact.Components.VectorCalculations; - parameter Modelica.SIunits.Frequency f=100000; + parameter Modelica.Units.SI.Frequency f=100000; parameter Real q=1 "1=left -1=right"; final parameter Modelica.Mechanics.MultiBody.Types.Axis y_direction={0,1,0} "cartesian coordinate system in y direction -- direction of gravity"; @@ -8917,7 +8914,7 @@ constant Real pi=Modelica.Constants.pi; parameter Boolean animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color Color_contact_point_cylinder1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -8936,7 +8933,7 @@ n2=3, n3=3, n4=3) annotation (Placement(transformation(extent={{-344,-32},{-332,-20}}))); - Modelica.Mechanics.MultiBody.Sensors.TansformAbsoluteVector tansformVectorCy1( + Modelica.Mechanics.MultiBody.Sensors.TransformAbsoluteVector tansformVectorCy1( frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_a, frame_r_out=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.world) "Transformation length-direction cylinder1 from BCS1 to ICS" @@ -8944,7 +8941,7 @@ extent={{-8,-8},{8,8}}, rotation=0, origin={-80,60}))); - Modelica.Mechanics.MultiBody.Sensors.TansformAbsoluteVector tansformVectorCy2( + Modelica.Mechanics.MultiBody.Sensors.TransformAbsoluteVector tansformVectorCy2( frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.frame_a, frame_r_out=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.world) "Transformation length-direction cylinder2 from BCS2 to ICS" @@ -9470,7 +9467,7 @@ model ForceCylinderToCylinderPoint "Force Calculation between contact points for Block MovePointCylinderToCylinderP " - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Frequency f=10000000; parameter SI.TranslationalSpringConstant c=100000; @@ -9809,9 +9806,10 @@ package PlanarContact extends Modelica.Icons.Package; + model RectangleToRectangle extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=10000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=10000; outer parameter Real n1 = 1.5; @@ -9828,7 +9826,7 @@ outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -10045,7 +10043,7 @@ model CircleToRectangle extends IdealizedContact.Components.PartialContactBlock; - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient=10000; outer parameter SI.TranslationalDampingConstant dampingCoefficient=10000; outer parameter Real n1 = 1.5; @@ -10062,7 +10060,7 @@ outer parameter SI.Frequency f=100000; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + outer parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1 = {0,180,0}; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -10225,7 +10223,7 @@ model MovePointRectangleToRectangle parameter Boolean exact=true; - parameter Modelica.SIunits.Frequency f=10000000; + parameter Modelica.Units.SI.Frequency f=10000000; parameter Real q_L=1; parameter Real q_W=1; //parameter Real q_H=1; @@ -10300,8 +10298,7 @@ otprojektion annotation (Placement(transformation(extent={{80,80},{100,100}}))); public - Modelica.Mechanics.MultiBody.Sensors.TansformRelativeVector - tansformRelativeVector(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_a, + Modelica.Mechanics.MultiBody.Sensors.TransformRelativeVector tansformRelativeVector(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_a, frame_r_out=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_b) annotation (Placement(transformation(extent={{-6,-6},{6,6}}, rotation=90, @@ -10403,7 +10400,7 @@ model ForceRectangleToRectangle - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Boolean exact=true; parameter SI.Frequency f=10000000; parameter SI.TranslationalSpringConstant c=600000000; @@ -10429,7 +10426,7 @@ final parameter Modelica.Mechanics.MultiBody.Types.Axis z_direction=cross(x_direction, y_direction); parameter Boolean Animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color Color_contact_point_rectangle1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -10808,7 +10805,7 @@ model MovePointCircleToRectangle parameter Boolean exact=true; - parameter Modelica.SIunits.Frequency f=10000000; + parameter Modelica.Units.SI.Frequency f=10000000; final parameter Modelica.Mechanics.MultiBody.Types.Axis y_direction={0,1,0} "cartesian coordinate system in y direction -- direction of gravity"; final parameter Modelica.Mechanics.MultiBody.Types.Axis x_direction={1,0,0} @@ -10866,8 +10863,7 @@ angleWDw(t=0) "angle between Vector_Dw_otlwr and Width direction Rectangle" annotation (Placement(transformation(extent={{-20,80},{0,100}}))); - Modelica.Mechanics.MultiBody.Sensors.TansformRelativeVector - tansformRelativeVector1(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_b, + Modelica.Mechanics.MultiBody.Sensors.TransformRelativeVector tansformRelativeVector1(frame_r_in=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_b, frame_r_out=Modelica.Mechanics.MultiBody.Types.ResolveInFrameAB.frame_a) "Vektor Transformation from BCS-rectangle to BCS-circle" annotation (Placement(transformation(extent={{-6,-6},{6,6}}, @@ -11056,7 +11052,7 @@ model ForceCircleToRectangle - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter Boolean exact=true; parameter SI.Frequency f=10000000; parameter SI.TranslationalSpringConstant c=10000; @@ -11083,7 +11079,7 @@ final parameter Modelica.Mechanics.MultiBody.Types.Axis z_direction=cross(x_direction, y_direction); parameter Boolean Animation=true; - parameter Modelica.SIunits.Radius radiusContactPoint=0.005; + parameter Modelica.Units.SI.Radius radiusContactPoint=0.005; parameter Modelica.Mechanics.MultiBody.Types.Color Color_contact_point_rectangle = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -11327,7 +11323,7 @@ f_n_cr = sign(rP_cr.r_rel*V_direction_C)*(-c*abs(rP_cr.r_rel*V_direction_C)^n1) - d*abs(rP_cr.r_rel*V_direction_C)^n2*der(rP_cr.r_rel*V_direction_C); f_n_bl = sign(rP_l.r_rel*H_direction_R)*(-c*abs(rP_l.r_rel*H_direction_R)^n1) - d*abs(rP_l.r_rel*H_direction_R)^n2*der(rP_l.r_rel*H_direction_R); - f_n_bw = sign(rP_w.r_rel*H_direction_R)*(-c*abs(rP_w.r_rel*H_direction_R)^n1) - d*abs(rP_w.r_rel*H_direction_R)^n2*der(rP_w.r_rel*H_direction_R); //ich würde hier auch gerne das vorzeichen umdrehen + f_n_bw = sign(rP_w.r_rel*H_direction_R)*(-c*abs(rP_w.r_rel*H_direction_R)^n1) - d*abs(rP_w.r_rel*H_direction_R)^n2*der(rP_w.r_rel*H_direction_R); //ich würde hier auch gerne das vorzeichen umdrehen //-------------------------------------------------------------- //friction @@ -11516,7 +11512,7 @@ model SubsystemMovePointCircleToRectangle parameter Boolean exact=true; - parameter Modelica.SIunits.Frequency f=10000000; + parameter Modelica.Units.SI.Frequency f=10000000; parameter Real q_L=1; parameter Real q_W=1; parameter Real p_L=1; @@ -11652,10 +11648,8 @@ end SubsystemMovePointCircleToRectangle; annotation(preferredView="info"); end Components; - annotation(preferredView="info"); end PlanarContact; - annotation (Icon(graphics={ Rectangle( extent={{-78,24},{12,-70}}, lineColor={255,128,0}, @@ -11806,7 +11800,7 @@ equation c =smooth(2, abs(a*abs(cos(beta*sign(beta-pi/2))) - 0.5*sqrt(abs((2*a*abs(cos(beta*sign(beta-pi/2))))^2 - 4*(a^2 - b^2))))); //c =smooth(2, abs(a*abs(cos(beta*sign(beta-pi/2))) - 0.5*sqrt(abs((2*a*abs(cos(beta*sign(beta-pi/2))))^2 - 4*(a^2 - b^2))))); - //beta*sign(beta-pi/2) singularitätspunkt bei beta=pi/2 vermeiden + //beta*sign(beta-pi/2) singularitätspunkt bei beta=pi/2 vermeiden annotation (Diagram(graphics), Documentation(info="

According to the cosine rules, the length c of the side of a triangle is calculated. The two sides a and b and the angle beta between them are given.

")); @@ -11839,7 +11833,7 @@ block intersectionOfTwoLinesBlock parameter Real eps = 1000*Modelica.Constants.eps; parameter Real inf = Modelica.Constants.inf; - parameter Modelica.SIunits.Frequency f=100000; + parameter Modelica.Units.SI.Frequency f=100000; Modelica.Blocks.Interfaces.RealInput c[3] "start point line 1" annotation (Placement(transformation(extent={{-120,70}, {-80,110}}))); @@ -11902,7 +11896,7 @@ block LimiterBlockReferenceIn "Limit the range of a signal with bessel filter and input signal as reference" extends Modelica.Blocks.Interfaces.SISO; - parameter Modelica.SIunits.Frequency f=100000; + parameter Modelica.Units.SI.Frequency f=100000; Modelica.Blocks.Continuous.Filter filter( filterType=Modelica.Blocks.Types.FilterType.LowPass, @@ -11989,7 +11983,7 @@ parameter Real uMax= 1 "Upper limits of input signals"; parameter Real uMin= Modelica.Constants.eps "Lower limits of input signals"; - parameter Modelica.SIunits.Frequency f=100000; + parameter Modelica.Units.SI.Frequency f=100000; Modelica.Blocks.Continuous.Filter filter( filterType=Modelica.Blocks.Types.FilterType.LowPass, @@ -12075,7 +12069,7 @@ model variablePrism1 "Prismatic joint (1 translational degree-of-freedom, 2 potential states, optional axis flange)" - import SI = Modelica.SIunits; + import Modelica.Units.SI; extends Modelica.Mechanics.MultiBody.Interfaces.PartialElementaryJoint; Real e[3] "Unit vector in direction of prismatic axis n"; Real eps = 100*Modelica.Constants.eps; @@ -12184,7 +12178,7 @@ model variableRevol1 "Revolute joint (1 rotational degree-of-freedom, 2 potential states, optional axis flange)" - import SI = Modelica.SIunits; + import Modelica.Units.SI; Modelica.Mechanics.MultiBody.Interfaces.Frame_a frame_a "Coordinate system fixed to the joint with one cut-force and cut-torque" @@ -12305,7 +12299,7 @@ model variablePrism2 "Prismatic joint (1 translational degree-of-freedom, 2 potential states, optional axis flange)" - import SI = Modelica.SIunits; + import Modelica.Units.SI; extends Modelica.Mechanics.MultiBody.Interfaces.PartialElementaryJoint; Modelica.Mechanics.Translational.Interfaces.Flange_a axis "1-dim. translational flange that drives the joint" @@ -12448,7 +12442,7 @@ model variableRevol2 "Revolute joint (1 rotational degree-of-freedom, 2 potential states, optional axis flange)" - import SI = Modelica.SIunits; + import Modelica.Units.SI; Modelica.Mechanics.Rotational.Interfaces.Flange_a axis "1-dim. rotational flange that drives the joint" @@ -12657,7 +12651,7 @@ model FixedShapeVarAnimation "Visualizing an elementary shape with dynamically varying shape attributes (has one frame connector)" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import Modelica.Mechanics.MultiBody.Types; extends Modelica.Mechanics.MultiBody.Interfaces.PartialVisualizer; @@ -12766,7 +12760,7 @@ model PointMassVarAnimation "Rigid body where body rotation and inertia tensor is neglected (6 potential states)" - import SI = Modelica.SIunits; + import Modelica.Units.SI; import Modelica.Mechanics.MultiBody.Types; Modelica.Mechanics.MultiBody.Interfaces.Frame_a frame_a "Coordinate system fixed at center of mass point" @@ -12959,5 +12953,5 @@ width=0.44, height=0.65, library=1, - autolayout=1),version="0.1.0", uses(Modelica(version="3.2")), preferredView="info"); + autolayout=1),version="0.1.0", uses(Modelica(version= "4.0.0")), preferredView="info"); end IdealizedContact;