diff --git a/Modelica/Electrical/Analog/Examples/ParallelResonance.mo b/Modelica/Electrical/Analog/Examples/ParallelResonance.mo index a08d815f05..ebb87ac7ba 100644 --- a/Modelica/Electrical/Analog/Examples/ParallelResonance.mo +++ b/Modelica/Electrical/Analog/Examples/ParallelResonance.mo @@ -14,12 +14,12 @@ model ParallelResonance "Parallel resonance circuit" extent={{-10,-10},{10,10}}, rotation=270, origin={-10,70}))); - Basic.Inductor inductor1(i(fixed=true), L=0.1/(2*pi)) annotation (Placement( + Basic.Inductor inductor1(i(fixed=true), L=0.1'H'/(2*pi)) annotation (Placement( transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-10,40}))); - Basic.Capacitor capacitor1(v(fixed=true), C=0.001/(2*pi)) annotation ( + Basic.Capacitor capacitor1(v(fixed=true), C=0.001'F'/(2*pi)) annotation ( Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, @@ -46,12 +46,12 @@ model ParallelResonance "Parallel resonance circuit" extent={{-10,-10},{10,10}}, rotation=270, origin={-10,-30}))); - Basic.Inductor inductor2(i(fixed=true), L=0.1/(2*pi)) annotation (Placement( + Basic.Inductor inductor2(i(fixed=true), L=0.1'H'/(2*pi)) annotation (Placement( transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={-10,-60}))); - Basic.Capacitor capacitor2(v(fixed=true), C=0.001/(2*pi)) annotation ( + Basic.Capacitor capacitor2(v(fixed=true), C=0.001'F'/(2*pi)) annotation ( Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, diff --git a/Modelica/Electrical/Analog/Examples/SeriesResonance.mo b/Modelica/Electrical/Analog/Examples/SeriesResonance.mo index ff0f3a164e..dd6d3f53f0 100644 --- a/Modelica/Electrical/Analog/Examples/SeriesResonance.mo +++ b/Modelica/Electrical/Analog/Examples/SeriesResonance.mo @@ -14,9 +14,9 @@ model SeriesResonance "Series resonance circuit" extent={{-10,-10},{10,10}}, rotation=270, origin={40,50}))); - Basic.Inductor inductor1(i(fixed=true), L=0.1/(2*pi)) + Basic.Inductor inductor1(i(fixed=true), L=0.1'H'/(2*pi)) annotation (Placement(transformation(extent={{-30,60},{-10,80}}))); - Basic.Capacitor capacitor1(v(fixed=true), C=0.001/(2*pi)) + Basic.Capacitor capacitor1(v(fixed=true), C=0.001'F'/(2*pi)) annotation (Placement(transformation(extent={{10,60},{30,80}}))); Sensors.CurrentSensor currentSensor1 annotation (Placement(transformation(extent={{10,20},{-10,40}}))); @@ -38,9 +38,9 @@ model SeriesResonance "Series resonance circuit" extent={{-10,-10},{10,10}}, rotation=270, origin={40,-50}))); - Basic.Inductor inductor2(i(fixed=true), L=0.1/(2*pi)) + Basic.Inductor inductor2(i(fixed=true), L=0.1'H'/(2*pi)) annotation (Placement(transformation(extent={{-30,-40},{-10,-20}}))); - Basic.Capacitor capacitor2(v(fixed=true), C=0.001/(2*pi)) + Basic.Capacitor capacitor2(v(fixed=true), C=0.001'F'/(2*pi)) annotation (Placement(transformation(extent={{10,-40},{30,-20}}))); Sensors.CurrentSensor currentSensor2 annotation (Placement(transformation(extent={{10,-80},{-10,-60}}))); diff --git a/Modelica/Electrical/Analog/Examples/ShowSaturatingInductor.mo b/Modelica/Electrical/Analog/Examples/ShowSaturatingInductor.mo index 9bb180db56..5dc9cbb1e4 100644 --- a/Modelica/Electrical/Analog/Examples/ShowSaturatingInductor.mo +++ b/Modelica/Electrical/Analog/Examples/ShowSaturatingInductor.mo @@ -8,7 +8,7 @@ model ShowSaturatingInductor parameter SI.Current Inom=1 "Nominal current"; parameter SI.Inductance Linf=0.5 "Inductance at large currents"; parameter SI.Voltage U=1.25 "Source voltage (peak)"; - parameter SI.Frequency f=1/(2*Modelica.Constants.pi) + parameter SI.Frequency f=1'Hz'/(2*Modelica.Constants.pi) "Source frequency"; parameter SI.Angle phase=Modelica.Constants.pi/2 "Source voltage phase shift"; diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/ParallelResonance.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/ParallelResonance.mo index 31adfe67d1..86e21ad654 100644 --- a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/ParallelResonance.mo +++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/ParallelResonance.mo @@ -32,12 +32,12 @@ model ParallelResonance "Parallel resonance circuit" origin={-10,20}, extent={{-10,-10},{10,10}}, rotation=270))); - QuasiStatic.SinglePhase.Basic.Inductor inductor(L=1/(2*Modelica.Constants.pi)) + QuasiStatic.SinglePhase.Basic.Inductor inductor(L=1'H'/(2*Modelica.Constants.pi)) annotation (Placement(transformation( origin={10,20}, extent={{-10,-10},{10,10}}, rotation=270))); - QuasiStatic.SinglePhase.Basic.Capacitor capacitor(C=1/(2*Modelica.Constants.pi)) + QuasiStatic.SinglePhase.Basic.Capacitor capacitor(C=1'F'/(2*Modelica.Constants.pi)) annotation (Placement(transformation( origin={30,20}, extent={{-10,-10},{10,10}}, diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/SeriesBode.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/SeriesBode.mo index 0a3c0b1ba6..a5416daa8b 100644 --- a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/SeriesBode.mo +++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/SeriesBode.mo @@ -18,7 +18,7 @@ model SeriesBode "Series circuit with Bode analysis" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); QuasiStatic.SinglePhase.Basic.Resistor resistor(R_ref=1) annotation (Placement(transformation(extent={{20,-10},{40,10}}))); - QuasiStatic.SinglePhase.Basic.Inductor inductor(L=1/(2*Modelica.Constants.pi)) + QuasiStatic.SinglePhase.Basic.Inductor inductor(L=1'H'/(2*Modelica.Constants.pi)) annotation (Placement(transformation(extent={{50,-10},{70,10}}))); Modelica.ComplexBlocks.Sources.ComplexConstant complexConst(k=Complex(1, 0)) annotation (Placement(transformation(extent={{-80,-10},{-60,10}}))); diff --git a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/SeriesResonance.mo b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/SeriesResonance.mo index 8402152041..b2e1af5b80 100644 --- a/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/SeriesResonance.mo +++ b/Modelica/Electrical/QuasiStatic/SinglePhase/Examples/SeriesResonance.mo @@ -29,9 +29,9 @@ model SeriesResonance "Series resonance circuit" annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); QuasiStatic.SinglePhase.Basic.Resistor resistor(R_ref=0.1) annotation (Placement(transformation(extent={{10,-10},{30,10}}))); - QuasiStatic.SinglePhase.Basic.Inductor inductor(L=1/(2*Modelica.Constants.pi)) + QuasiStatic.SinglePhase.Basic.Inductor inductor(L=1'H'/(2*Modelica.Constants.pi)) annotation (Placement(transformation(extent={{40,-10},{60,10}}))); - QuasiStatic.SinglePhase.Basic.Capacitor capacitor(C=1/(2*Modelica.Constants.pi)) + QuasiStatic.SinglePhase.Basic.Capacitor capacitor(C=1'F'/(2*Modelica.Constants.pi)) annotation (Placement(transformation(extent={{70,-10},{90,10}}))); QuasiStatic.SinglePhase.Sensors.CurrentSensor currentSensor annotation (Placement(transformation(extent={{-20,10},{0,-10}}))); diff --git a/Modelica/Fluid/Dissipation.mo b/Modelica/Fluid/Dissipation.mo index 92b0841499..74e0bc55ad 100644 --- a/Modelica/Fluid/Dissipation.mo +++ b/Modelica/Fluid/Dissipation.mo @@ -4484,7 +4484,7 @@ Generally this function is numerically best used for the compressible ca extends Modelica.Icons.Record; //generic variables - SI.Area A_cross=Modelica.Constants.pi*0.1^2/4 "Cross sectional area" + SI.Area A_cross=Modelica.Constants.pi*(0.1'm')^2/4 "Cross sectional area" annotation (Dialog(group="Generic variables")); //linearisation @@ -10049,9 +10049,9 @@ documentation available in this package. annotation (Dialog(group="Choices")); //geometry - input SI.Area A_cross(min=Modelica.Constants.eps) = PI*0.1^2/4 + input SI.Area A_cross(min=Modelica.Constants.eps) = PI*(0.1'm')^2/4 "Cross sectional area" annotation (Dialog(group="Geometry")); - input SI.Length perimeter(min=Modelica.Constants.eps) = PI*0.1 + input SI.Length perimeter(min=Modelica.Constants.eps) = PI*0.1'm' "Perimeter" annotation (Dialog(group="Geometry")); @@ -12511,7 +12511,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol SI.Area A_cross=A_cross_nom "Cross sectional area" annotation (Dialog(group="Generic variables")); - SI.Area A_cross_nom=Modelica.Constants.pi*0.1^2/4 + SI.Area A_cross_nom=Modelica.Constants.pi*(0.1'm')^2/4 "Nominal cross sectional area" annotation (Dialog(group="Generic variables")); @@ -12564,9 +12564,9 @@ In the picture below the input x is increased from 0 to 1. The range of interpol record TwoPhaseFlow_con "Base record for two phase Flow" extends Modelica.Icons.Record; - SI.Area A_cross=PI*0.1^2/4 "Cross sectional area" + SI.Area A_cross=PI*(0.1'm')^2/4 "Cross sectional area" annotation (Dialog(group="Geometry")); - SI.Length perimeter=PI*0.1 "Wetted perimeter" + SI.Length perimeter=PI*0.1'm' "Wetted perimeter" annotation (Dialog(group="Geometry")); SI.Length length=1 "Length in fluid flow direction" annotation (Dialog(group="Geometry")); @@ -12628,7 +12628,7 @@ In the picture below the input x is increased from 0 to 1. The range of interpol parameter SI.Area A_cross=A_cross_nom "Cross sectional area" annotation (Dialog(group="Generic variables")); - parameter SI.Area A_cross_nom=Modelica.Constants.pi*0.1^2/4 + parameter SI.Area A_cross_nom=Modelica.Constants.pi*(0.1'm')^2/4 "Nominal cross sectional area" annotation (Dialog(group="Generic variables")); @@ -12704,9 +12704,9 @@ In the picture below the input x is increased from 0 to 1. The range of interpol "Target correlation" annotation (Dialog(group="Generic variables")); //geometry - SI.Area A_cross=Modelica.Constants.pi*0.1^2/4 "Cross sectional area" + SI.Area A_cross=Modelica.Constants.pi*(0.1'm')^2/4 "Cross sectional area" annotation (Dialog(group="Generic variables")); - SI.Length perimeter=Modelica.Constants.pi*0.1 "Wetted perimeter" + SI.Length perimeter=Modelica.Constants.pi*0.1'm' "Wetted perimeter" annotation (Dialog(group="Generic variables")); end General; @@ -12749,9 +12749,9 @@ In the picture below the input x is increased from 0 to 1. The range of interpol "Choice of (horizontal/vertical) boiling or (horizontal) condensation in pipe" annotation (Dialog(group="Choices")); - SI.Area A_cross=Modelica.Constants.pi*0.1^2/4 "Cross sectional area" + SI.Area A_cross=Modelica.Constants.pi*(0.1'm')^2/4 "Cross sectional area" annotation (Dialog(group="Geometry")); - SI.Length perimeter=Modelica.Constants.pi*0.1 "Wetted perimeter" + SI.Length perimeter=Modelica.Constants.pi*0.1'm' "Wetted perimeter" annotation (Dialog(group="Geometry")); Modelica.Fluid.Dissipation.Utilities.Types.MolarMass_gpmol MM=18.02 @@ -12884,9 +12884,9 @@ In the picture below the input x is increased from 0 to 1. The range of interpol annotation (Dialog(group="Orifice")); SI.Length C_0=0.1*C_1 "Perimeter of vena contraction" annotation (Dialog(group="Orifice")); - SI.Area A_1=PI*0.01^2/4 "Large cross sectional area of orifice" + SI.Area A_1=PI*(0.01'm')^2/4 "Large cross sectional area of orifice" annotation (Dialog(group="Orifice")); - SI.Length C_1=PI*0.01 "Large perimeter of orifice" + SI.Length C_1=PI*0.01'm' "Large perimeter of orifice" annotation (Dialog(group="Orifice")); SI.Length L=1e-3 "Length of vena contraction" annotation (Dialog(group="Orifice")); @@ -12949,13 +12949,13 @@ In the picture below the input x is increased from 0 to 1. The range of interpol SI.Angle alpha=PI*45/180 "Diffuser diverging angle" annotation (Dialog(group="Diffuser")); - SI.Area A_1=PI*0.01^2/4 + SI.Area A_1=PI*(0.01'm')^2/4 "Small constant cross sectional area before diffuser section" annotation (Dialog(group="Diffuser")); SI.Area A_2=2*A_1 "Large constant cross sectional area after diffuser section" annotation (Dialog(group="Diffuser")); - SI.Length C_1=PI*0.01 "Small perimeter before diffuser section" + SI.Length C_1=PI*0.01'm' "Small perimeter before diffuser section" annotation (Dialog(group="Diffuser")); SI.Length C_2=2*C_1 "Large perimeter after diffuser section" annotation (Dialog(group="Diffuser")); @@ -12995,11 +12995,11 @@ In the picture below the input x is increased from 0 to 1. The range of interpol extends Modelica.Icons.Record; - SI.Area A_1=PI*0.01^2/4 "Small cross sectional area of orifice" + SI.Area A_1=PI*(0.01'm')^2/4 "Small cross sectional area of orifice" annotation (Dialog(group="Orifice")); SI.Area A_2=A_1 "Large cross sectional area of orifice" annotation (Dialog(group="Orifice")); - SI.Length C_1=PI*0.01 "Small perimeter of orifice" + SI.Length C_1=PI*0.01'm' "Small perimeter of orifice" annotation (Dialog(group="Orifice")); SI.Length C_2=C_1 "Large perimeter of orifice" annotation (Dialog(group="Orifice")); diff --git a/Modelica/Fluid/Examples/IncompressibleFluidNetwork.mo b/Modelica/Fluid/Examples/IncompressibleFluidNetwork.mo index dfe042337b..4a4329a0fd 100644 --- a/Modelica/Fluid/Examples/IncompressibleFluidNetwork.mo +++ b/Modelica/Fluid/Examples/IncompressibleFluidNetwork.mo @@ -79,7 +79,7 @@ model IncompressibleFluidNetwork m_flow_nominal=1, rho_nominal=1000, CvData=Modelica.Fluid.Types.CvTypes.Av, - Av=2.5e-2^2/4*Modelica.Constants.pi, + Av=(2.5e-2'm')^2/4*Modelica.Constants.pi, dp_nominal=30000) annotation (Placement(transformation(extent={{-46,30},{-26,50}}))); Valves.ValveIncompressible valve2( @@ -87,7 +87,7 @@ model IncompressibleFluidNetwork m_flow_nominal=1, rho_nominal=1000, CvData=Modelica.Fluid.Types.CvTypes.Av, - Av=2.5e-2^2/4*Modelica.Constants.pi, + Av=(2.5e-2'm')^2/4*Modelica.Constants.pi, dp_nominal=30000) annotation (Placement(transformation(extent={{-46,-30},{-26,-50}}))); Pipes.DynamicPipe pipe7( @@ -106,7 +106,7 @@ model IncompressibleFluidNetwork m_flow_nominal=1, rho_nominal=1000, CvData=Modelica.Fluid.Types.CvTypes.Av, - Av=2.5e-2^2/4*Modelica.Constants.pi, + Av=(2.5e-2'm')^2/4*Modelica.Constants.pi, dp_nominal=30000) annotation (Placement(transformation(extent={{80,0},{100,20}}))); Sources.Boundary_pT sink(nPorts=1, diff --git a/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/Leakage/CylinderLeakage.mo b/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/Leakage/CylinderLeakage.mo index 5639d31dfd..122fa78dc2 100644 --- a/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/Leakage/CylinderLeakage.mo +++ b/Modelica/Magnetic/QuasiStatic/FluxTubes/Examples/Leakage/CylinderLeakage.mo @@ -4,7 +4,7 @@ model CylinderLeakage "Testing cylinder leakage models" import Modelica.Constants.pi; parameter SI.RelativePermeability mu_rConst = 100 "Relative permeability"; - Shapes.Leakage.QuarterCylinder quarterCylinder1(l=2*pi*0.1) + Shapes.Leakage.QuarterCylinder quarterCylinder1(l=2*pi*0.1'm') annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); Shapes.FixedShape.HollowCylinderAxialFlux hollowCylinderAxialFlux1( r_i=0, @@ -18,7 +18,7 @@ model CylinderLeakage "Testing cylinder leakage models" r_o=0.05, mu_rConst=mu_rConst) annotation (Placement(transformation(extent={{20,-10},{40,10}}))); - Shapes.Leakage.QuarterCylinder quarterCylinder2(l=2*pi*0.1) + Shapes.Leakage.QuarterCylinder quarterCylinder2(l=2*pi*0.1'm') annotation (Placement(transformation(extent={{50,-10},{70,10}}))); Sources.ConstantMagneticFlux constantSource( gamma(fixed=true, start=0), f=50, Phi=Complex(re=5E-3, im=0)) diff --git a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_MTPA.mo b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_MTPA.mo index c96039fa9c..22b44db8e5 100644 --- a/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_MTPA.mo +++ b/Modelica/Magnetic/QuasiStatic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMPM_MTPA.mo @@ -116,7 +116,7 @@ model SMPM_MTPA "Test example: PermanentMagnetSynchronousMachine, investigating extent={{-10,10},{10,-10}}, rotation=270, origin={-40,40}))); - Modelica.ComplexBlocks.Sources.ComplexRotatingPhasor rotSource(magnitude=100, w=2*pi) annotation (Placement(transformation( + Modelica.ComplexBlocks.Sources.ComplexRotatingPhasor rotSource(magnitude=100, w=2*pi*1'Hz') annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=90, origin={-70,30}))); diff --git a/Modelica/Mechanics/Rotational/Examples/Friction.mo b/Modelica/Mechanics/Rotational/Examples/Friction.mo index 6ce060fa90..558845a4aa 100644 --- a/Modelica/Mechanics/Rotational/Examples/Friction.mo +++ b/Modelica/Mechanics/Rotational/Examples/Friction.mo @@ -51,7 +51,7 @@ model Friction "Drive train with clutch and brake" offset=1, startTime=startTime) annotation (Placement(transformation(extent={{-160, -30},{-140,-10}}))); - Modelica.Blocks.Sources.Sine sine(amplitude=200, f=50/pi) + Modelica.Blocks.Sources.Sine sine(amplitude=200, f=50'Hz'/pi) annotation (Placement(transformation(extent={{-160,10},{-140,30}}))); Modelica.Blocks.Math.Product product annotation (Placement(transformation( extent={{-120,-10},{-100,10}}))); diff --git a/ModelicaTest/Electrical/QuasiStatic/SinglePhase.mo b/ModelicaTest/Electrical/QuasiStatic/SinglePhase.mo index bf6ac1cbeb..a3b821ef7a 100644 --- a/ModelicaTest/Electrical/QuasiStatic/SinglePhase.mo +++ b/ModelicaTest/Electrical/QuasiStatic/SinglePhase.mo @@ -29,8 +29,8 @@ package SinglePhase "Single-phase quasi-static package" origin={40,-40}))); Modelica.Blocks.Sources.Constant const(k=1) annotation (Placement(transformation(extent={{-50,50},{-30,70}}))); Modelica.Blocks.Sources.Constant const1(k=1) annotation (Placement(transformation(extent={{-20,70},{0,90}}))); - Modelica.Blocks.Sources.Constant const2(k=1/100/Modelica.Constants.pi) annotation (Placement(transformation(extent={{70,70},{50,90}}))); - Modelica.Blocks.Sources.Constant const3(k=1/100/Modelica.Constants.pi) annotation (Placement(transformation(extent={{100,50},{80,70}}))); + Modelica.Blocks.Sources.Constant const2(k=1'F'/100/Modelica.Constants.pi) annotation (Placement(transformation(extent={{70,70},{50,90}}))); + Modelica.Blocks.Sources.Constant const3(k=1'H'/100/Modelica.Constants.pi) annotation (Placement(transformation(extent={{100,50},{80,70}}))); Modelica.ComplexBlocks.Sources.ComplexConstant const4(k(re=0.5, im=0.5)) annotation (Placement(transformation(extent={{0,-70},{20,-50}}))); Modelica.ComplexBlocks.Sources.ComplexConstant const5(k(re=1, im=1)) annotation (Placement(transformation(extent={{-30,-90},{-10,-70}}))); Modelica.Electrical.QuasiStatic.SinglePhase.Sensors.VoltageSensor voltageSensor annotation (Placement(transformation( diff --git a/ModelicaTest/Fluid/Dissipation.mo b/ModelicaTest/Fluid/Dissipation.mo index 1288152bf9..f7273da740 100644 --- a/ModelicaTest/Fluid/Dissipation.mo +++ b/ModelicaTest/Fluid/Dissipation.mo @@ -1015,9 +1015,9 @@ extends Modelica.Icons.ExamplesPackage; parameter Integer n=size(cp, 1); //generic variables - parameter SI.Area A_cross=Modelica.Constants.pi*0.1^2/4 + parameter SI.Area A_cross=Modelica.Constants.pi*(0.1'm')^2/4 "Cross sectional area"; - parameter SI.Length perimeter=Modelica.Constants.pi*0.1 + parameter SI.Length perimeter=Modelica.Constants.pi*0.1'm' "Wetted perimeter"; //parameter SI.Diameter d_hyd=4*A_cross/perimeter "Hydraulic diameter"; @@ -1164,9 +1164,9 @@ extends Modelica.Icons.ExamplesPackage; parameter Integer n=size(cp, 1); //generic variables - parameter SI.Area A_cross=Modelica.Constants.pi*0.1^2/4 + parameter SI.Area A_cross=Modelica.Constants.pi*(0.1'm')^2/4 "Cross sectional area"; - parameter SI.Length perimeter=Modelica.Constants.pi*0.1 + parameter SI.Length perimeter=Modelica.Constants.pi*0.1'm' "Wetted perimeter"; //parameter SI.Diameter d_hyd=4*A_cross/perimeter "Hydraulic diameter"; @@ -5228,7 +5228,7 @@ extends Modelica.Icons.ExamplesPackage; //general variables SI.Area A_cross=A_cross_nom "Cross sectional area" annotation (Dialog(group="Generic variables")); - SI.Area A_cross_nom=Modelica.Constants.pi*0.1^2/4 + SI.Area A_cross_nom=Modelica.Constants.pi*(0.1'm')^2/4 "Nominal cross sectional area" annotation (Dialog(group="Generic variables")); SI.Pressure dp_nom=50 @@ -5368,7 +5368,7 @@ extends Modelica.Icons.ExamplesPackage; //general variables parameter Integer n=3 "Number of grid points"; - parameter SI.Area A_cross=Modelica.Constants.pi*0.1^2/4 + parameter SI.Area A_cross=Modelica.Constants.pi*(0.1'm')^2/4 "Circular cross sectional area"; parameter Modelica.Fluid.Dissipation.Utilities.Types.PressureLossCoefficient diff --git a/ModelicaTest/MultiBody.mo b/ModelicaTest/MultiBody.mo index 405579669d..1fc6b89d56 100644 --- a/ModelicaTest/MultiBody.mo +++ b/ModelicaTest/MultiBody.mo @@ -5943,7 +5943,7 @@ and plot gasForce.press over gasForce.s_rel. MultiBody.Joints.Revolute revolute2( n={1,0,0}, phi(fixed=true, start=0), - w(fixed=true, start=2*Modelica.Constants.pi)) + w(fixed=true, start=2*Modelica.Constants.pi*1'Hz')) annotation (Placement(transformation(extent={{-122,40},{-102,60}}))); MultiBody.Parts.FixedRotation fixedRotation(n={0,1,0}, angle=90)