diff --git a/Modelica/Fluid/Dissipation.mo b/Modelica/Fluid/Dissipation.mo index 7ad7f9062e..2c5c6157e4 100644 --- a/Modelica/Fluid/Dissipation.mo +++ b/Modelica/Fluid/Dissipation.mo @@ -5701,8 +5701,7 @@ This record is used as input record for the pressure loss funct output SI.Pressure DP "Two phase pressure loss"; protected - type TYP = - Modelica.Fluid.Dissipation.Utilities.Types.TwoPhaseFrictionalPressureLoss; + type TYP = Modelica.Fluid.Dissipation.Utilities.Types.TwoPhaseFrictionalPressureLoss; Real MIN=Modelica.Constants.eps; @@ -10785,8 +10784,8 @@ The heterogeneous approaches are analytically derived by minimising the momentum input Real Delta "Relative roughness"; input Real lambda2 "Modified friction coefficient (= independent variable)"; output SI.ReynoldsNumber Re "Interpolated Reynolds number in transition region"; - // Point x1=lg(lambda2(Re1)) with derivative yd1=1 at y1=lg(Re1) protected + // Point x1=lg(lambda2(Re1)) with derivative yd1=1 at y1=lg(Re1) Real x1=Math.log10(64*Re1) "Lower abscissa value"; Real y1=Math.log10(Re1) "Lower ordinate value"; Real yd1=1 "Left boundary slope"; @@ -10842,8 +10841,8 @@ for a detailed explanation. input SI.ReynoldsNumber Re2 "Boundary Reynolds number for turbulent regime"; input Real Delta "Relative roughness"; output Real lambda2 "Interpolated modified friction coefficient in transition regime"; - // Point x1=lg(Re1) with derivative yd1=1 at y1=lg(lambda2(Re1)) protected + // Point x1=lg(Re1) with derivative yd1=1 at y1=lg(lambda2(Re1)) Real x1=Math.log10(Re1) "Lower abscissa value"; Real y1=Math.log10(64*Re1) "Lower ordinate value"; Real yd1=1 "Left boundary slope"; diff --git a/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo b/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo index e5c9ac971d..2902863e21 100644 --- a/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo +++ b/Modelica/Mechanics/MultiBody/Visualizers/Rectangle.mo @@ -38,8 +38,7 @@ protected final r_0=frame_a.r_0, final nu=nu, final nv=nv, - redeclare function surfaceCharacteristic = - Advanced.SurfaceCharacteristics.rectangle ( + redeclare function surfaceCharacteristic = Advanced.SurfaceCharacteristics.rectangle ( lu=length_u, lv=length_v)) if world.enableAnimation and animation annotation (Placement(transformation(extent={{-20,-10},{0,10}}))); Modelica.Mechanics.MultiBody.Forces.Internal.ZeroForceAndTorque zeroForceAndTorque annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));