Skip to content

Units in examples and components #4820

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

Open
henrikt-ma wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Units in examples and components #4820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
318e03f
Make the units of a few examples and components consistent
henrikt-ma Oct 5, 2026
04017ff
Give the zero frequencies of the Cauer low-pass filters their unit
henrikt-ma Oct 5, 2026
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
2 changes: 1 addition & 1 deletion Modelica/ComplexBlocks/Examples/ShowTransferFunction.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Unitless denominator polynomial coefficients {m,d,c} of the transfer function";
parameter Real wMin=0.01 "Lower bound for frequency sweep";
parameter Real wMax=100 "Upper bound for frequency sweep";
Real lg_w=log10(logFrequencySweep.y) "Logarithm of frequency";
Real lg_w=log10(logFrequencySweep.y/1'rad/s') "Logarithm of frequency";

Check failure on line 20 in Modelica/ComplexBlocks/Examples/ShowTransferFunction.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `)` but received `'rad/s'`
Real dB=20*log10(complexToPolar.len) "Magnitude of the transfer function in decibel";
Modelica.Units.SI.Angle phi(displayUnit="deg")=complexToPolar.phi "Argument of the transfer function";
Modelica.Blocks.Sources.LogFrequencySweep logFrequencySweep(
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Electrical/Analog/Examples/CauerLowPassAnalog.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
parameter SI.Inductance l1=1.304 "Filter coefficient I1";
parameter SI.Inductance l2=0.8586 "Filter coefficient I2";
parameter SI.Capacitance c1=1.072 "Filter coefficient c1";
parameter SI.Capacitance c2=1/(1.704992^2*l1)
parameter SI.Capacitance c2=1/((1.704992'rad/s')^2*l1)

Check failure on line 8 in Modelica/Electrical/Analog/Examples/CauerLowPassAnalog.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected an expression, `)`, or `,` but received `'rad/s'`
"Filter coefficient c2";
parameter SI.Capacitance c3=1.682 "Filter coefficient c3";
parameter SI.Capacitance c4=1/(1.179945^2*l2)
parameter SI.Capacitance c4=1/((1.179945'rad/s')^2*l2)
"Filter coefficient c4";
parameter SI.Capacitance c5=0.7262 "Filter coefficient c5";
Modelica.Electrical.Analog.Basic.Ground G
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Electrical/Analog/Examples/CauerLowPassOPV.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
parameter SI.Capacitance l1=1.304 "Filter coefficient i1";
parameter SI.Capacitance l2=0.8586 "Filter coefficient i2";
parameter SI.Capacitance c1=1.072 "Filter coefficient c1";
parameter SI.Capacitance c2=1/(1.704992^2*l1)
parameter SI.Capacitance c2=1/((1.704992'rad/s')^2*l1*1'Ohm2')

Check failure on line 8 in Modelica/Electrical/Analog/Examples/CauerLowPassOPV.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected an expression, `)`, or `,` but received `'rad/s'`
"Filter coefficient c2";
parameter SI.Capacitance c3=1.682 "Filter coefficient c3";
parameter SI.Capacitance c4=1/(1.179945^2*l2)
parameter SI.Capacitance c4=1/((1.179945'rad/s')^2*l2*1'Ohm2')
"Filter coefficient c4";
parameter SI.Capacitance c5=0.7262 "Filter coefficient c5";
Modelica.Electrical.Analog.Basic.Capacitor C1(C=c1 + c2, v(start=0, fixed=true))
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Electrical/Analog/Examples/CauerLowPassSC.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
parameter SI.Capacitance l1=1.304 "Filter coefficient i1";
parameter SI.Capacitance l2=0.8586 "Filter coefficient i2";
parameter SI.Capacitance c1=1.072 "Filter coefficient c1";
parameter SI.Capacitance c2=1/(1.704992^2*l1)
parameter SI.Capacitance c2=1/((1.704992'rad/s')^2*l1*1'Ohm2')

Check failure on line 8 in Modelica/Electrical/Analog/Examples/CauerLowPassSC.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected an expression, `)`, or `,` but received `'rad/s'`
"Filter coefficient c2";
parameter SI.Capacitance c3=1.682 "Filter coefficient c3";
parameter SI.Capacitance c4=1/(1.179945^2*l2)
parameter SI.Capacitance c4=1/((1.179945'rad/s')^2*l2*1'Ohm2')
"Filter coefficient c4";
parameter SI.Capacitance c5=0.7262 "Filter coefficient c5";
Modelica.Electrical.Analog.Basic.Capacitor C1(C=c1 + c2,v(start=0, fixed=true))
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Analog/Semiconductors/Thyristor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
iGK = Gate.i;
vGK = smooth(0,(if vGK < vRef then VGT/IGT*iGK else
vRef^2/VGT+iGK*(VGT-vRef)/IGT));
vContot = vConmain + smooth(0, if iGK < 0.95 * IGT then 0 else if iGK < 0.95*IGT + 1e-3 then 10000*(iGK-0.95*IGT)*vAK else 10* vAK);
vContot = vConmain + smooth(0, if iGK < 0.95 * IGT then 0 else if iGK < 0.95*IGT + 1e-3 then 10*vAK*(iGK-0.95*IGT)/1e-3'A' else 10* vAK);

Check failure on line 53 in Modelica/Electrical/Analog/Semiconductors/Thyristor.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `else` but received `'A'`
der(vControl)= (vContot - vControl) / (if (vContot - vControl) > 0 then 1.87*TON else 0.638*TOFF);

// Anode-Cathode characteristics
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
origin={10,70})));
Analog.Sources.ConstantVoltage constantVoltage(V=dcpmData.VaNominal)
annotation (Placement(transformation(extent={{-10,30},{-30,50}})));
Analog.Basic.Resistor resistor(R=0.05*dcpmData.VaNominal/1000)
Analog.Basic.Resistor resistor(R=0.05*dcpmData.VaNominal/1000'A')

Check failure on line 81 in Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `)` but received `'A'`
annotation (Placement(
transformation(
extent={{10,10},{-10,-10}},
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Magnetic/FluxTubes/Basic/ElectroMagneticConverterWithLeakageInductance.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ model ElectroMagneticConverterWithLeakageInductance
SI.Inductance L_stat "Static inductance (valid if this coil is the only source)";

protected
constant Real eps=100*Modelica.Constants.eps;
constant SI.Current eps=100*Modelica.Constants.eps;
equation
v = p.v - n.v;
0 = p.i + n.i;
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Mechanics/MultiBody/Examples/Elementary/Surfaces.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
T_min=0,
T_max=2,
T=Modelica.Math.sin(Modelica.Constants.pi*pipeWithScalarField.xsi)*
Modelica.Math.cos(Modelica.Constants.pi*time) .+ 1,
Modelica.Math.cos(2*Modelica.Constants.pi*0.5'Hz'*time) .+ 1,

Check failure on line 56 in Modelica/Mechanics/MultiBody/Examples/Elementary/Surfaces.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `)` but received `'Hz'`
n_colors=32)
annotation (Placement(transformation(extent={{14,-30},{34,-10}})));
Parts.FixedTranslation fixedTranslation3(
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/GasForce2.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
x = 1 - s_rel/L;
v_rel = der(s_rel);

press = 1e5 * (
press = 1e5'Pa' * (

Check failure on line 29 in Modelica/Mechanics/MultiBody/Examples/Loops/Utilities/GasForce2.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `;` but received `'Pa'`
if v_rel < 0 then (
if x < 0.986061 then 177.4132*x^4 - 287.2189*x^3 + 151.8252*x^2 - 24.9973*x + 2.4
else 2836360*x^4 - 10569296*x^3 + 14761814*x^2 - 9158505*x + 2129670)
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Media/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2293,7 +2293,7 @@

// smooth states
m_flow_ext2 = time - 0.5;
state2 = Medium.setState_pT(1e5*(1 + time), 300 + 200*time);
state2 = Medium.setState_pT(1e5'Pa'*(1 + time/1's'), 300'K' + 200'K/s' * time);

Check failure on line 2296 in Modelica/Media/package.mo

View workflow job for this annotation

GitHub Actions / syntax_checks 

expected `)` but received `'Pa'`
state = Medium.setSmoothState(
m_flow_ext2,
medium.state,
Expand Down
Loading