-This block calculates the rectified mean of the input signal u over the given period 1/f, using the -mean block. +This block calculates the mean of the input signal u over the period dtermined by the edges of the trigger:
++ 1 T +---- ∫ u(t) dt +T-t0 t0 +
-Note: The output is updated after each period defined by 1/f. +Note: The output is updated at each trigger instance. +
+ ++If parameter yGreaterOrEqualZero in the Advanced tab is true (default = false), +then the modeller provides the information that the mean of the input signal is guaranteed +to be ≥ 0 for the exact solution. However, due to inaccuracies in the numerical integration scheme, +the output might be slightly negative. If this parameter is set to true, then the output is +explicitly set to 0.0, if the mean value results in a negative value.
"), Icon(graphics={Text( extent={{-80,60},{80,20}}, - textString="RM"), Text( - extent={{-80,-20},{80,-60}}, - textString="f=%f")})); - end RectifiedMean; + textString="mean")})); + end TriggeredMean; block ContinuousMean "Calculates the empirical expectation (mean) value of its input signal" @@ -2416,6 +2443,78 @@ This block is demonstrated in the examples points={{-76,-24},{70,-24}})})); end ContinuousMean; + block RectifiedMean "Calculate rectified mean over period 1/f" + extends Modelica.Blocks.Interfaces.SISO; + parameter SI.Frequency f(start=50) "Base frequency"; + parameter Real x0=0 "Start value of integrator state"; + parameter Real y0(final min=0)=0 "Start value of output"; + Mean mean(final f=f, final x0=x0, + final y0=y0) + annotation (Placement(transformation(extent={{0,-10},{20,10}}))); + Blocks.Math.Abs abs1 + annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); + equation + connect(u, abs1.u) annotation (Line( + points={{-120,0},{-62,0}}, color={0,0,127})); + connect(abs1.y, mean.u) annotation (Line( + points={{-39,0},{-2,0}}, color={0,0,127})); + connect(mean.y, y) annotation (Line( + points={{21,0},{110,0}}, color={0,0,127})); + annotation (Documentation(info=" ++This block calculates the rectified mean of the input signal u over the given period 1/f, using the +mean block. +
++Note: The output is updated after each period defined by 1/f. +
+"), Icon(graphics={Text( + extent={{-80,60},{80,20}}, + textString="RM"), Text( + extent={{-80,-20},{80,-60}}, + textString="f=%f")})); + end RectifiedMean; + + block TriggeredRectifiedMean + "Calculate rectified mean over period determined by trigger" + extends Modelica.Blocks.Interfaces.SISO; + parameter Real x0=0 "Start value of integrator state"; + parameter Real y0=0 "Start value of output"; + Modelica.Blocks.Interfaces.BooleanInput trigger "Trigger input signal" + annotation (Placement( + transformation( + extent={{-20,-20},{20,20}}, + rotation=90, + origin={0,-120}))); + Modelica.Blocks.Math.TriggeredMean triggeredMean( + final yGreaterOrEqualZero=true, + final x0=x0, + final y0=y0) + annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); + Modelica.Blocks.Math.Abs abs1 + annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); + equation + connect(u, abs1.u) annotation (Line( + points={{-120,0},{-62,0}}, color={0,0,127})); + connect(abs1.y, triggeredMean.u) + annotation (Line(points={{-39,0},{-12,0}}, color={0,0,127})); + connect(triggeredMean.y, y) + annotation (Line(points={{11,0},{110,0}}, color={0,0,127})); + connect(trigger, triggeredMean.trigger) + annotation (Line(points={{0,-120},{0,-12}}, color={255,0,255})); + annotation (Documentation(info=" ++This block calculates the rectified mean of the input signal u over the period the period dtermined by the edges of the trigger, using the +triggered mean block. +
++Note: The output is updated at each trigger instance. +
+"), Icon(graphics={Text( + extent={{-80,60},{80,20}}, + textString="RM")})); + end TriggeredRectifiedMean; + block RootMeanSquare "Calculate root mean square over period 1/f" extends Modelica.Blocks.Interfaces.SISO; parameter SI.Frequency f(start=50) "Base frequency"; @@ -2458,6 +2557,53 @@ Note: The output is updated after each period defined by 1/f. textString="f=%f")})); end RootMeanSquare; + block TriggeredRootMeanSquare + "Calculate root mean square over period determined by trigger" + extends Modelica.Blocks.Interfaces.SISO; + parameter Real x0=0 "Start value of integrator state"; + parameter Real y0=0 "Start value of output"; + Modelica.Blocks.Interfaces.BooleanInput trigger "Trigger input signal" + annotation (Placement( + transformation( + extent={{-20,-20},{20,20}}, + rotation=90, + origin={0,-120}))); + Modelica.Blocks.Math.MultiProduct product(nu=2) + annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); + Modelica.Blocks.Math.TriggeredMean triggeredMean( + final yGreaterOrEqualZero=true, + final x0=x0, + final y0=y0*y0) + annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); + Modelica.Blocks.Math.Sqrt sqrt1 + annotation (Placement(transformation(extent={{40,-10},{60,10}}))); + equation + + connect(product.y, triggeredMean.u) + annotation (Line(points={{-38.3,0},{-12,0}}, color={0,0,127})); + connect(triggeredMean.y, sqrt1.u) + annotation (Line(points={{11,0},{38,0}}, color={0,0,127})); + connect(sqrt1.y, y) annotation (Line( + points={{61,0},{110,0}}, color={0,0,127})); + connect(u, product.u[1]) annotation (Line( + points={{-120,0},{-80,0},{-80,3.5},{-60,3.5}}, color={0,0,127})); + connect(u, product.u[2]) annotation (Line( + points={{-120,0},{-80,0},{-80,-3.5},{-60,-3.5}}, color={0,0,127})); + connect(trigger, triggeredMean.trigger) + annotation (Line(points={{0,-120},{0,-12}}, color={255,0,255})); + annotation (Documentation(info=" ++This block calculates the root mean square of the input signal u over the period the period dtermined by the edges of the trigger:, using the +triggered mean block. +
++Note: The output is updated at each trigger instance. +
+"), Icon(graphics={Text( + extent={{-80,60},{80,20}}, + textString="RMS")})); + end TriggeredRootMeanSquare; + block SignalExtrema "Calculate min and max of a signal" extends Modelica.Blocks.Icons.Block; diff --git a/Modelica/Blocks/package.mo b/Modelica/Blocks/package.mo index 2190133239..94239cf90b 100644 --- a/Modelica/Blocks/package.mo +++ b/Modelica/Blocks/package.mo @@ -1677,6 +1677,89 @@ The output is constant from the beginning.