diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IdealizedContact 0.2.0-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/IdealizedContact 0.2.0-master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IdealizedContact 0.2.0-master/openmodelica.metadata.json" 2022-03-10 09:57:36.948143993 +0000 +++ "converted-libraries/.openmodelica/libraries/IdealizedContact 0.2.0-master/openmodelica.metadata.json" 2022-03-10 09:58:28.632150542 +0000 @@ -1 +1 @@ -{"path":"IdealizedContact", "sha":"ae8b0397ea8207bc4327bea1e81ac09c6d4bcea9", "support":"noSupport", "uses":{"Modelica":"3.2.1"}, "version":"0.2.0-master", "zipfile":"https://github.com/tbeu/IdealizedContact/archive/ae8b0397ea8207bc4327bea1e81ac09c6d4bcea9.zip"} +{"path": "IdealizedContact", "sha": "ae8b0397ea8207bc4327bea1e81ac09c6d4bcea9", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "0.2.0-master", "zipfile": "https://github.com/tbeu/IdealizedContact/archive/ae8b0397ea8207bc4327bea1e81ac09c6d4bcea9.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.2.0-master/package.mo" "converted-libraries/.openmodelica/libraries/IdealizedContact 0.2.0-master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/IdealizedContact 0.2.0-master/package.mo" 2022-03-10 09:57:36.948143993 +0000 +++ "converted-libraries/.openmodelica/libraries/IdealizedContact 0.2.0-master/package.mo" 2022-03-10 09:58:28.628150540 +0000 @@ -1201,7 +1201,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; @@ -2333,7 +2333,7 @@ model SphericalContactSurface "Model to define a spherical contact surface" extends IdealizedContact.Components.PartialContactSurface(final contactShape="spherical", fixedFrame(length=3*radius)); - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Radius radius=0.015 "radius of the spherical contact surface"; @@ -2410,7 +2410,7 @@ "Model to define a cylindrical contact surface" extends IdealizedContact.Components.PartialContactSurface(final contactShape="cylindrical", fixedFrame(length=2*diameter)); - 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} @@ -2515,7 +2515,7 @@ "Model to define a rectangular and plane contact surface" extends IdealizedContact.Components.PartialContactSurface(final contactShape="rectangular", fixedFrame(length=2*length)); - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Length length=0.04; parameter SI.Length width=0.02; @@ -2601,7 +2601,7 @@ "Model to define a circular and plane contact surface" extends IdealizedContact.Components.PartialContactSurface(final contactShape="circular", fixedFrame(length=1.3*diameter)); - 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"; @@ -2700,9 +2700,9 @@ extends IdealizedContact.Components.PartialContactSurface(final contactShape="ellipsoid", fixedFrame(length=2*max({a,b,c}))); - parameter Modelica.SIunits.Length a "radius of the 1st semiaxis"; - parameter Modelica.SIunits.Length b "radius of the 2nd semiaxis"; - parameter Modelica.SIunits.Length c "radius of the 3rd semiaxis"; + parameter Modelica.Units.SI.Length a "radius of the 1st semiaxis"; + parameter Modelica.Units.SI.Length b "radius of the 2nd semiaxis"; + parameter Modelica.Units.SI.Length c "radius of the 3rd semiaxis"; ParametricSurfaceDefinition.Visualizers.ConvexVisualizer ellipsoid( h={a,b,c}, @@ -3244,11 +3244,11 @@ parameter Boolean animation=true "= true, if animation shall be enabled"; - parameter Modelica.SIunits.Angle opening=0 + parameter Modelica.Units.SI.Angle opening=0 "Opening angle of ellipsoid" annotation(Dialog(enable=animation)); - parameter Modelica.SIunits.Angle alphaStartAngle=-Modelica.Constants.pi + parameter Modelica.Units.SI.Angle alphaStartAngle=-Modelica.Constants.pi "Start angle of ellipsoid slice" annotation(Dialog(enable=animation)); - parameter Modelica.SIunits.Angle alphaStopAngle=Modelica.Constants.pi + parameter Modelica.Units.SI.Angle alphaStopAngle=Modelica.Constants.pi "End angle of ellipsoid slice" annotation(Dialog(enable=animation)); // parameter Modelica.SIunits.Angle betaStartAngle=-Modelica.Constants.pi // "Start angle of ellipsoid slice" annotation(Dialog(enable=animation)); @@ -3316,12 +3316,12 @@ input IdealizedContact.ContactSurfaces.Types.ContactShapeType shape; input Real h[3] "parameters of convex surface"; - input Modelica.SIunits.Angle opening=0 "Opening angle of ellipsoid" + input Modelica.Units.SI.Angle opening=0 "Opening angle of ellipsoid" annotation(Dialog); - input Modelica.SIunits.Angle alphaStartAngle= -Modelica.Constants.pi + input Modelica.Units.SI.Angle alphaStartAngle= -Modelica.Constants.pi "Start angle of ellipsoid slice" annotation(Dialog); - input Modelica.SIunits.Angle alphaStopAngle= Modelica.Constants.pi + input Modelica.Units.SI.Angle alphaStopAngle= Modelica.Constants.pi "End angle of ellipsoid slice" annotation(Dialog); // input Modelica.SIunits.Angle betaStartAngle= -Modelica.Constants.pi @@ -3331,10 +3331,10 @@ // "End angle of ellipsoid slice" // annotation(Dialog); protected - Modelica.SIunits.Angle alpha; - Modelica.SIunits.Angle beta; - Modelica.SIunits.Angle phi_start; - Modelica.SIunits.Angle phi_stop; + Modelica.Units.SI.Angle alpha; + Modelica.Units.SI.Angle beta; + Modelica.Units.SI.Angle phi_start; + Modelica.Units.SI.Angle phi_stop; Real temp[3,1]; algorithm phi_start :=-Modelica.Constants.pi + opening; @@ -3422,7 +3422,7 @@ extends Modelica.Icons.Package; model SphericalContactBody "Predefined spherical 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"; @@ -3512,7 +3512,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 @@ -3709,7 +3709,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)); @@ -4040,12 +4040,12 @@ model EllipsoidContactBody "Predefined ellipsoid body with contact surfaces" - parameter Modelica.SIunits.Length a=1 "radius of the 1st semiaxis"; - parameter Modelica.SIunits.Length b=1 "radius of the 2nd semiaxis"; - parameter Modelica.SIunits.Length c=1 "radius of the 3rd semiaxis"; - parameter Modelica.SIunits.Density rho=7850 "density"; + parameter Modelica.Units.SI.Length a=1 "radius of the 1st semiaxis"; + parameter Modelica.Units.SI.Length b=1 "radius of the 2nd semiaxis"; + parameter Modelica.Units.SI.Length c=1 "radius of the 3rd semiaxis"; + parameter Modelica.Units.SI.Density rho=7850 "density"; final parameter Real pi=Modelica.Constants.pi; - final parameter Modelica.SIunits.Mass m=(4/3)*pi*a*b*c*rho + final parameter Modelica.Units.SI.Mass m=(4/3)*pi*a*b*c*rho "mass of ellipsoid"; parameter Boolean animation=true "= true, if animation of the body shall be enabled" annotation(Dialog(group="animation")); @@ -4116,7 +4116,7 @@ model ConvexContactBody "Predefined convex body with contact surfaces" - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter IdealizedContact.ContactSurfaces.Types.ConvexContactShapeType convexContactShape = "ellipsoid" "shape of the contact surface"; parameter Real h[3] "parameters of convex surface"; @@ -4222,8 +4222,9 @@ package ContactBlock "Contact block and its parts" extends Modelica.Icons.Package; + model Contact "Contact block" - 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 @@ -4259,7 +4260,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")); @@ -4409,7 +4410,7 @@ function plotFrictionCurve "Visualize approximation of Stribeck friction curve" - 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" @@ -5076,7 +5077,7 @@ model MovePointSphereToSphere // parameter Modelica.SIunits.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 @@ -5323,7 +5324,7 @@ model ForceSphereToSphere - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.TranslationalSpringConstant c=1000000; parameter SI.TranslationalDampingConstant d=1000; @@ -5535,7 +5536,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 @@ -5856,7 +5857,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; @@ -6085,9 +6086,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 @@ -6378,7 +6379,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"; @@ -6604,7 +6605,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 @@ -6879,7 +6880,7 @@ model ForceSphereToCircle - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.TranslationalSpringConstant c=1000000; parameter SI.TranslationalDampingConstant d=1000; @@ -7079,9 +7080,9 @@ model MovePointConvexToConvex - 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 colorContactPoint1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -7337,7 +7338,7 @@ model ForceConvexToConvex - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.TranslationalSpringConstant c; parameter SI.TranslationalDampingConstant d; @@ -7455,7 +7456,7 @@ model MovePointConvexToPlane 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 colorContactPoint1 = {0,180,0}; parameter Modelica.Mechanics.MultiBody.Types.Color @@ -7722,7 +7723,7 @@ model ForceConvexToPlane //This model calculates the force between an ellipsoid and a plane. //The force vector is resolved in the body frame of the plane. - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.TranslationalSpringConstant c; parameter SI.TranslationalDampingConstant d; @@ -10297,12 +10298,12 @@ 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.Mechanics.MultiBody.Types.Color Color_contact_point_cylinder = {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}; @@ -10354,8 +10355,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}}, @@ -10777,7 +10777,7 @@ end MovePointCylinderToRectangle; model ForceCylinderToRectangle - import SI = Modelica.SIunits; + import Modelica.Units.SI; // parameter Boolean exact=true; parameter SI.Frequency f=10000000; @@ -11032,7 +11032,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"; @@ -11059,8 +11059,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}}, @@ -11421,7 +11420,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; @@ -11446,7 +11445,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 @@ -11766,7 +11765,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"; @@ -11775,7 +11774,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 @@ -11884,16 +11883,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( @@ -12141,7 +12138,7 @@ end MovePointCylinderToCylinderLine; model ForceCylinderToCylinderLine - import SI = Modelica.SIunits; + import Modelica.Units.SI; parameter SI.Frequency f=10000000; parameter SI.TranslationalSpringConstant c=100000; @@ -12479,7 +12476,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"; @@ -12488,7 +12485,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 @@ -12507,7 +12504,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" @@ -12515,7 +12512,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" @@ -13037,7 +13034,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; @@ -13756,7 +13753,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; @@ -13831,8 +13828,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, @@ -13934,7 +13930,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; @@ -13960,7 +13956,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 @@ -14342,7 +14338,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} @@ -14400,8 +14396,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}}, @@ -14590,7 +14585,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; @@ -14617,7 +14612,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 @@ -14863,7 +14858,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 @@ -15052,7 +15047,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; @@ -15191,7 +15186,6 @@ annotation(preferredView="info"); end PlanarContact; - annotation (Icon(graphics={ Rectangle( extent={{-78,24},{12,-70}}, lineColor={255,128,0}, @@ -15359,7 +15353,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.

")); @@ -15392,7 +15386,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}}))); @@ -15455,7 +15449,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, @@ -15542,7 +15536,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, @@ -15893,10 +15887,11 @@ package Utilities "Utility package" extends Modelica.Icons.BasesPackage; + 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; @@ -16005,7 +16000,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" @@ -16126,7 +16121,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" @@ -16269,7 +16264,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" @@ -16475,7 +16470,6 @@

This joint is a modification of the Modelica.Mechanics.MultiBody.Joints.Revolute joint. The axis of rotation can be now be set via the input n.

")); end variableRevol2; - annotation(preferredView="info"); end Utilities; @@ -16483,7 +16477,7 @@ extends Modelica.Icons.BasesPackage; 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; @@ -16592,7 +16586,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" @@ -16716,7 +16710,7 @@ end SpecialVisualizers; partial model PartialContactBlock "Partial model for the contact blocks" - import SI = Modelica.SIunits; + import Modelica.Units.SI; outer parameter SI.TranslationalSpringConstant springCoefficient; outer parameter SI.TranslationalDampingConstant dampingCoefficient; outer parameter Real n1; @@ -16732,7 +16726,7 @@ outer parameter SI.Frequency f; outer parameter Boolean exact; outer parameter Boolean animation=true; - outer parameter Modelica.SIunits.Radius radiusContactPoint; + outer parameter Modelica.Units.SI.Radius radiusContactPoint; outer parameter Modelica.Mechanics.MultiBody.Types.Color colorContactPoints1; outer parameter Modelica.Mechanics.MultiBody.Types.Color @@ -16964,7 +16958,7 @@ width=0.44, height=0.65, library=1, - autolayout=1),version="0.2.0", uses(Modelica(version="3.2.1")), preferredView="info", + autolayout=1),version="0.2.0", uses(Modelica(version= "4.0.0")), preferredView="info", Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={ Rectangle(