Skip to content

Revert major part of #227, and remove unit from gain parameter of Modelica.Blocks.Continuous.* blocks and Modelica.Blocks.Math.Gain #3881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 16, 2021
Merged

Revert major part of #227, and remove unit from gain parameter of Modelica.Blocks.Continuous.* blocks and Modelica.Blocks.Math.Gain #3881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1290058
Revert major part of #227 - compare with af01213debfd82ab3e16d7634667…
HansOlsson Oct 14, 2021
e26f8f4
AlsoIntegrator
HansOlsson Oct 14, 2021
d033dcb
Also remove unit here, as it caused similar problems.
HansOlsson Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Modelica/Blocks/Continuous.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package Continuous "Library of continuous control blocks with internal states"

block Integrator "Output the integral of the input signal with optional reset"
import Modelica.Blocks.Types.Init;
parameter Real k(unit="1")=1 "Integrator gain";
parameter Real k=1 "Integrator gain";
parameter Boolean use_reset = false "= true, if reset port enabled"
annotation(Evaluate=true, HideResult=true, choices(checkBox=true));
parameter Boolean use_set = false "= true, if set port enabled and used as reinitialization value when reset"
Expand Down Expand Up @@ -126,7 +126,7 @@ port has a rising edge.

block LimIntegrator "Integrator with limited value of the output and optional reset"
import Modelica.Blocks.Types.Init;
parameter Real k(unit="1")=1 "Integrator gain";
parameter Real k=1 "Integrator gain";
parameter Real outMax(start=1) "Upper limit of output";
parameter Real outMin=-outMax "Lower limit of output";
parameter Boolean use_reset = false "= true, if reset port enabled"
Expand Down Expand Up @@ -265,7 +265,7 @@ port has a rising edge.

block Derivative "Approximated derivative block"
import Modelica.Blocks.Types.Init;
parameter Real k(unit="1")=1 "Gains";
parameter Real k=1 "Gains";
parameter SI.Time T(min=Modelica.Constants.small) = 0.01
"Time constants (T>0 required; T=0 is ideal derivative block)";
parameter Init initType=Init.NoInit
Expand Down Expand Up @@ -350,7 +350,7 @@ If k=0, the block reduces to y=0.

block FirstOrder "First order transfer function block (= 1 pole)"
import Modelica.Blocks.Types.Init;
parameter Real k(unit="1")=1 "Gain";
parameter Real k=1 "Gain";
parameter SI.Time T(start=1) "Time Constant";
parameter Init initType=Init.NoInit
"Type of initialization (1: no init, 2: steady state, 3/4: initial output)" annotation(Evaluate=true,
Expand Down Expand Up @@ -424,7 +424,7 @@ Example:

block SecondOrder "Second order transfer function block (= 2 poles)"
import Modelica.Blocks.Types.Init;
parameter Real k(unit="1")=1 "Gain";
parameter Real k=1 "Gain";
parameter Real w(start=1) "Angular frequency";
parameter Real D(start=1) "Damping";
parameter Init initType=Init.NoInit
Expand Down Expand Up @@ -507,7 +507,7 @@ Example:

block PI "Proportional-Integral controller"
import Modelica.Blocks.Types.Init;
parameter Real k(unit="1")=1 "Gain";
parameter Real k=1 "Gain";
parameter SI.Time T(start=1,min=Modelica.Constants.small)
"Time Constant (T>0 required)";
parameter Init initType=Init.NoInit
Expand Down Expand Up @@ -602,7 +602,7 @@ This is discussed in the description of package
import Modelica.Blocks.Types.Init;
extends Interfaces.SISO;

parameter Real k(unit="1")=1 "Gain";
parameter Real k=1 "Gain";
parameter SI.Time Ti(min=Modelica.Constants.small, start=0.5)
"Time Constant of Integrator";
parameter SI.Time Td(min=0, start=0.1)
Expand Down Expand Up @@ -765,7 +765,7 @@ to compute u by an algebraic equation.
"Control error (set point - measurement)";
parameter .Modelica.Blocks.Types.SimpleController controllerType=
.Modelica.Blocks.Types.SimpleController.PID "Type of controller";
parameter Real k(min=0, unit="1") = 1 "Gain of controller";
parameter Real k(min=0) = 1 "Gain of controller";
parameter SI.Time Ti(min=Modelica.Constants.small)=0.5
"Time constant of Integrator block" annotation (Dialog(enable=
controllerType == .Modelica.Blocks.Types.SimpleController.PI or
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Blocks/Math.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ InverseBlockConstraint invert[3]; // Block to be inverted has 3 input signals

block Gain "Output the product of a gain value with the input signal"

parameter Real k(start=1, unit="1")
parameter Real k(start=1)
"Gain value multiplied with input signal";
public
Interfaces.RealInput u "Input signal connector" annotation (Placement(
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/LimitedPI.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ block LimitedPI
extent={{20,-20},{-20,20}})));
output Real controlError = u - u_m
"Control error (set point - measurement)";
parameter Real k(unit="1")=1 "Gain";
parameter Real k=1 "Gain";
parameter Boolean useI=true "PI else P" annotation(Evaluate=true);
parameter SI.Time Ti(min=Modelica.Constants.small)=1
"Integral time constant (T>0 required)" annotation(Dialog(enable=useI));
parameter Boolean useFF=false "Use feed-forward?"
annotation(Dialog(group="Feed-forward"));
parameter Boolean useConstantKFF=true "Use constant feed-forward factor?"
annotation(Dialog(group="Feed-forward", enable=useFF));
parameter Real KFF(unit="1")=1 "Feed-forward gain"
parameter Real KFF=1 "Feed-forward gain"
annotation(Dialog(group="Feed-forward", enable=useFF and useConstantKFF));
parameter Boolean constantLimits=true "Use constant limits?"
annotation(Dialog(group="Limitation"));
Expand Down
14 changes: 9 additions & 5 deletions ModelicaTest/Blocks.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,7 @@ if homotopy is active, the solution accepted by the assert statement (x = 100) i

model UnitDeduction "Test unit deduction"
extends Modelica.Icons.Example;
parameter Real k(unit="1")=1 "Propagated to relevant blocks";
Modelica.Blocks.Continuous.Integrator integrator
annotation (Placement(transformation(extent={{0,30},{20,50}})));
Modelica.Mechanics.Rotational.Components.Inertia inertia(
Expand All @@ -789,27 +790,30 @@ if homotopy is active, the solution accepted by the assert statement (x = 100) i
annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
Modelica.Mechanics.Rotational.Sensors.SpeedSensor speedSensor
annotation (Placement(transformation(extent={{-50,60},{-30,80}})));
Modelica.Blocks.Math.Gain gain(k=2)
Modelica.Blocks.Math.Gain gain(k=2*k)
annotation (Placement(transformation(extent={{0,80},{20,100}})));
Modelica.Blocks.Continuous.LimIntegrator limIntegrator(outMax=3)
Modelica.Blocks.Continuous.LimIntegrator limIntegrator(outMax=3, k=k)
annotation (Placement(transformation(extent={{0,0},{20,20}})));
Modelica.Blocks.Continuous.Derivative derivative(initType=Modelica.Blocks.Types.Init.InitialState)
Modelica.Blocks.Continuous.Derivative derivative(k=k, initType=Modelica.Blocks.Types.Init.InitialState)
annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
Modelica.Blocks.Continuous.FirstOrder firstOrder(T=2, initType=Modelica.Blocks.Types.Init.InitialState)
Modelica.Blocks.Continuous.FirstOrder firstOrder(k=k, T=2, initType=Modelica.Blocks.Types.Init.InitialState)
annotation (Placement(transformation(extent={{0,-60},{20,-40}})));
Modelica.Blocks.Continuous.SecondOrder secondOrder(
k=k,
w=2,
D=3,
initType=Modelica.Blocks.Types.Init.InitialState)
annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
Modelica.Blocks.Continuous.PI PI(T=2, initType=Modelica.Blocks.Types.Init.InitialState)
Modelica.Blocks.Continuous.PI PI(T=2, k=k, initType=Modelica.Blocks.Types.Init.InitialState)
annotation (Placement(transformation(extent={{60,60},{80,80}})));
Modelica.Blocks.Continuous.PID PID(
k=k,
Ti=2,
Td=3,
initType=Modelica.Blocks.Types.Init.InitialState)
annotation (Placement(transformation(extent={{60,30},{80,50}})));
Modelica.Blocks.Continuous.LimPID PID1(
k=k,
Ti=2,
Td=3,
yMax=4,
Expand Down