Skip to content

Commit ddd9967

Browse files
HansOlssonHansOlsson
committed
Merge remote-tracking branch 'origin/AddDerCheck' into AddDerCheck
2 parents c00ae19 + 048a405 commit ddd9967

File tree

113 files changed

+11057
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+11057
-391
lines changed

‎.CI/checkHTMLDoc/checkLinks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
'''
5-
Copyright (C) 2020, Modelica Association and contributors
5+
Copyright (C) 2020-2025, Modelica Association and contributors
66
All rights reserved.
77
88
Check Modelica HTML documentation for link validity

‎.CI/checkHTMLDoc/checkTags.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
'''
5-
Copyright (C) 2020, Modelica Association and contributors
5+
Copyright (C) 2020-2025, Modelica Association and contributors
66
All rights reserved.
77
88
Check Modelica HTML documentation for tag validity

‎.CI/checkHTMLDoc/tidyHTML.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
'''
5-
Copyright (C) 2020, Modelica Association and contributors
5+
Copyright (C) 2020-2025, Modelica Association and contributors
66
All rights reserved.
77
88
Check Modelica HTML documentation with HTML Tidy

‎.CI/check_deprecated_line_color.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
'''
5-
Copyright (C) 2021-2023, Modelica Association and contributors
5+
Copyright (C) 2021-2025, Modelica Association and contributors
66
All rights reserved.
77
88
Check for deprecated Text.lineColor annotation

‎.CI/check_html.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
'''
5-
Copyright (C) 2020, Modelica Association and contributors
5+
Copyright (C) 2020-2025, Modelica Association and contributors
66
All rights reserved.
77
88
Check Modelica HTML documentation for validity

‎.CI/classCoverage/CountClasses.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
'''
5-
Copyright (C) 2020, Modelica Association and contributors
5+
Copyright (C) 2020-2025, Modelica Association and contributors
66
All rights reserved.
77
88
Print class coverage for all classes, sorted by reference count

‎.github/workflows/checkCI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
run: |
156156
git clone --branch 5.8.0 --depth=1 https://github.com/htacg/tidy-html5.git
157157
pushd tidy-html5
158-
cmake .
158+
cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
159159
make
160160
sudo make install
161161
popd

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ Kristin Majetta <kristin.majetta@eas.iis.fraunhofer.de>
7575
Kristin Majetta <kristin.majetta@eas.iis.fraunhofer.de> <majetta@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
7676
Leo Gall <leo.gall@ltx.de>
7777
Leo Gall <leo.gall@ltx.de> <leo.gall@7ce873d0-865f-4ce7-a662-4bb36ea78beb>
78+
Léo Schmider <150122360+LeoSchmider@users.noreply.github.com>
7879
Leo Zambito <lzambito@maplesoft.com>
7980
Luigi Vanfretti <luigi.vanfretti@gmail.com>
8081
Malte Lenz <maltel@wolfram.com>

‎Complex.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Documentation(info="<html>
264264
<p>Complex number defined as a record containing real and imaginary part, utilizing operator overloading.</p>
265265
<p>
266266
<strong>Licensed by the Modelica Association under the 3-Clause BSD License</strong><br>
267-
Copyright &copy; 2010-2024, Modelica Association and <a href=\"modelica://Modelica.UsersGuide.Contact\">contributors</a>
267+
Copyright &copy; 2010-2025, Modelica Association and <a href=\"modelica://Modelica.UsersGuide.Contact\">contributors</a>
268268
</p>
269269
270270
<p>

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 1998-2024, Modelica Association and contributors
3+
Copyright (c) 1998-2025, Modelica Association and contributors
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

‎Modelica/Blocks/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3255,7 +3255,7 @@ This library contains input/output blocks to build up block diagrams.
32553255
email: <a href=\"mailto:Martin.Otter@dlr.de\">Martin.Otter@dlr.de</a><br></dd>
32563256
</dl>
32573257
<p>
3258-
Copyright &copy; 1998-2024, Modelica Association and contributors
3258+
Copyright &copy; 1998-2025, Modelica Association and contributors
32593259
</p>
32603260
</html>", revisions="<html>
32613261
<ul>

‎Modelica/Clocked/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Furthermore:
4747
gives author and acknowledgement information for this library.</li>
4848
</ul>
4949
<p>
50-
<em>Copyright &copy; 2012-2024, Modelica Association and contributors.</em>
50+
<em>Copyright &copy; 2012-2025, Modelica Association and contributors.</em>
5151
</p>
5252
</html>",
5353
revisions="<html>

‎Modelica/ComplexBlocks/UsersGuide/Contact.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ email: <a href=\"mailto:a.haumer@haumer.at\">a.haumer@haumer.at</a><br>
2121
<h4>Acknowledgements</h4>
2222
2323
<p>
24-
Copyright &copy; 1998-2024, Modelica Association and contributors
24+
Copyright &copy; 1998-2025, Modelica Association and contributors
2525
</p>
2626
</html>"));
2727
end Contact;

‎Modelica/Constants.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ dependent constants and constants from nature. The latter constants
9191
</dl>
9292
9393
<p>
94-
Copyright &copy; 1998-2024, Modelica Association and contributors
94+
Copyright &copy; 1998-2025, Modelica Association and contributors
9595
</p>
9696
</html>", revisions="<html>
9797
<ul>

‎Modelica/Electrical/Analog/Basic/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Christoph Clau&szlig;
2323
</dl>
2424
2525
<p>
26-
Copyright &copy; 1998-2024, Modelica Association and contributors
26+
Copyright &copy; 1998-2025, Modelica Association and contributors
2727
</p>
2828
</html>"), Icon(graphics={
2929
Line(points={{-12,60},{-12,-60}}),

‎Modelica/Electrical/Analog/Ideal/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Christoph Clau&szlig;
2323
</dl>
2424
2525
<p>
26-
Copyright &copy; 1998-2024, Modelica Association and contributors
26+
Copyright &copy; 1998-2025, Modelica Association and contributors
2727
</p>
2828
</html>"), Icon(graphics={
2929
Line(points={{-90,0},{-40,0}}),

‎Modelica/Electrical/Analog/Interfaces/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Christoph Clau&szlig;
2929
</ul>
3030
3131
<p>
32-
Copyright &copy; 1998-2024, Modelica Association and contributors
32+
Copyright &copy; 1998-2025, Modelica Association and contributors
3333
</p>
3434
</html>"));
3535
end Interfaces;

‎Modelica/Electrical/Analog/Lines/TLine1.mo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ equation
1515
i2 = (v2 - er)/Z0;
1616
es = 2*delay(v2, TD) - delay(er, TD);
1717
er = 2*delay(v1, TD) - delay(es, TD);
18-
annotation (defaultComponentName="line",
18+
annotation (obsolete = "Please use Modelica.Electrical.Analog.Lines.TLine instead of this model",
19+
defaultComponentName="line",
1920
Documentation(info="<html>
2021
<p>Lossless transmission line with characteristic impedance Z0 and transmission delay TD The lossless transmission line TLine1 is a two Port. Both port branches consist of a resistor with characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay TD. For further details see [<a href=\"modelica://Modelica.Electrical.Analog.UsersGuide.References\">Branin1967</a>]. The model parameters can be derived from inductance and capacitance per length (L&#39; resp. C&#39;), i. e. Z0 = sqrt(L&#39;/C&#39;) and TD = sqrt(L&#39;*C&#39;)*length_of_line. Resistance R&#39; and conductance C&#39; per meter are assumed to be zero.</p>
2122

‎Modelica/Electrical/Analog/Lines/TLine2.mo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ equation
1919
i2 = (v2 - er)/Z0;
2020
es = 2*delay(v2, TD) - delay(er, TD);
2121
er = 2*delay(v1, TD) - delay(es, TD);
22-
annotation (defaultComponentName="line",
22+
annotation (obsolete = "Please use Modelica.Electrical.Analog.Lines.TLine instead of this model",
23+
defaultComponentName="line",
2324
Documentation(info="<html>
2425
<p>Lossless transmission line with characteristic impedance Z0, frequency F and normalized length NL The lossless transmission line TLine2 is a two Port. Both port branches consist of a resistor with the value of the characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay. For further details see [<a href=\"modelica://Modelica.Electrical.Analog.UsersGuide.References\">Branin1967</a>]. Resistance R&#39; and conductance C&#39; per meter are assumed to be zero. The characteristic impedance Z0 can be derived from inductance and capacitance per length (L&#39; resp. C&#39;), i. e. Z0 = sqrt(L&#39;/C&#39;). The normalized length NL is equal to the length of the line divided by the wavelength corresponding to the frequency F, i. e. the transmission delay TD is the quotient of NL and F.</p>
2526
<p><strong>References:</strong>

‎Modelica/Electrical/Analog/Lines/TLine3.mo

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ equation
1616
i2 = (v2 - er)/Z0;
1717
es = 2*delay(v2, TD) - delay(er, TD);
1818
er = 2*delay(v1, TD) - delay(es, TD);
19-
annotation (defaultComponentName="line",
19+
annotation (obsolete = "Please use Modelica.Electrical.Analog.Lines.TLine instead of this model",
20+
defaultComponentName="line",
2021
Documentation(info="<html>
2122
<p>Lossless transmission line with characteristic impedance Z0 and frequency F The lossless transmission line TLine3 is a two Port. Both port branches consist of a resistor with value of the characteristic impedance Z0 and a controlled voltage source that takes into consideration the transmission delay. For further details see [<a href=\"modelica://Modelica.Electrical.Analog.UsersGuide.References\">Branin1967</a>]. Resistance R&#39; and conductance C&#39; per meter are assumed to be zero. The characteristic impedance Z0 can be derived from inductance and capacitance per length (L&#39; resp. C&#39;), i. e. Z0 = sqrt(L&#39;/C&#39;). The length of the line is equal to a quarter of the wavelength corresponding to the frequency F, i. e. the transmission delay is the quotient of 4 and F. In this case, the characteristic impedance is called natural impedance.</p>
2223
<p><strong>References:</strong>

‎Modelica/Electrical/Analog/Lines/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Christoph Clau&szlig;
2424
</dl>
2525
2626
<p>
27-
Copyright &copy; 1998-2024, Modelica Association and contributors
27+
Copyright &copy; 1998-2025, Modelica Association and contributors
2828
</p>
2929
</html>"), Icon(graphics={
3030
Line(points={{-60,50},{-90,50}}),

‎Modelica/Electrical/Analog/Sensors/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Christoph Clau&szlig;
2525
</dl>
2626
2727
<p>
28-
Copyright &copy; 1998-2024, Modelica Association and contributors
28+
Copyright &copy; 1998-2025, Modelica Association and contributors
2929
</p>
3030
</html>"));
3131
end Sensors;

‎Modelica/Electrical/Analog/Sources/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Christoph Clau&szlig;
2323
</dl>
2424
2525
<p>
26-
Copyright &copy; 1998-2024, Modelica Association and contributors
26+
Copyright &copy; 1998-2025, Modelica Association and contributors
2727
</p>
2828
</html>"));
2929
end Sources;

‎Modelica/Electrical/Digital.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7169,7 +7169,7 @@ the library is implemented and released for public use.
71697169
</p>
71707170
71717171
<p>
7172-
Copyright &copy; 1998-2024, Modelica Association and contributors
7172+
Copyright &copy; 1998-2025, Modelica Association and contributors
71737173
</p>
71747174
</html>"), Icon(coordinateSystem(preserveAspectRatio=false,
71757175
extent={{-100,-100},{100,100}}), graphics={

‎Modelica/Electrical/Machines/Examples/DCMachines/DCPM_Drive.mo

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ model DCPM_Drive
4646
wMechanical(fixed=false),
4747
ia(fixed=true))
4848
annotation (Placement(transformation(extent={{50,-70},{30,-50}})));
49-
Mechanics.Rotational.Components.Coupling coupling
49+
Utilities.Coupling coupling
5050
annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
5151
ControlledDCDrives.Utilities.DcdcInverter dcdcInverter1(fS=1000, VMax=
5252
dcpmData.VaNominal)
@@ -89,6 +89,10 @@ model DCPM_Drive
8989
extent={{-10,-10},{10,10}},
9090
rotation=0,
9191
origin={-70,30})));
92+
Mechanics.Rotational.Sensors.SpeedSensor speedSensor1
93+
annotation (Placement(transformation(extent={{-30,-100},{-50,-80}})));
94+
Mechanics.Rotational.Sensors.SpeedSensor speedSensor2
95+
annotation (Placement(transformation(extent={{30,-100},{50,-80}})));
9296
equation
9397
connect(dcpm1.flange, coupling.flange_a)
9498
annotation (Line(points={{-30,-60},{-10,-60}}, color={0,0,0}));
@@ -128,16 +132,21 @@ equation
128132
32,40},{24,40}}, color={0,0,255}));
129133
connect(multiSensor.nv, constantVoltage.n) annotation (Line(points={{0,70},{-46,
130134
70},{-46,40},{-30,40}}, color={0,0,255}));
135+
connect(dcpm1.flange, speedSensor1.flange) annotation (Line(points={{-30,-60},
136+
{-20,-60},{-20,-90},{-30,-90}}, color={0,0,0}));
137+
connect(dcpm2.flange, speedSensor2.flange) annotation (Line(points={{30,-60},
138+
{20,-60},{20,-90},{30,-90}}, color={0,0,0}));
131139
annotation (experiment(StopTime=2.0, Interval=1E-4, Tolerance=1E-6), Documentation(
132140
info="<html>
133141
<p>
134-
This example demonstrates how to use a <a href=\"modelica://Modelica.Mechanics.Rotational.Components.Coupling\">coupling</a>
142+
This example demonstrates how to use a <a href=\"modelica://Modelica.Electrical.Machines.Utilities.Coupling\">coupling</a>
135143
to implement a drive consisting if two permanent magnet DC machines.
136-
Note that <code>dcpm1</code> is turning in positive direction, whereas <code>dcpm2</code> is turning in the opposite direction.
144+
Note that <code>dcpm1</code> is turning in the positive direction, whereas <code>dcpm2</code> is turning in the opposite direction.
145+
This is evident by comparing <code>speedSensor1.w</code> and <code>speedSensor2.w</code>.
137146
Therefore, the armature of <code>dcpm2</code> is connected reversed to the source.
138147
</p>
139148
<p>
140-
Machine <code>dcpm1</code> starts the drive with a voltage ramp up to half of the no-load speed, the armature of <code>dcpm2</code> is not connected.
149+
Machine <code>dcpm1</code> starts the drive with a voltage ramp up to half of no-load speed, the armature of <code>dcpm2</code> is not connected.
141150
Since the induced voltage of <code>dcpm2</code> is the same as that of <code>dcdcInverter2</code>, the <code>switch</code> is closed without any transient.
142151
After that, the armature voltage of <code>dcpm2</code> is slightly increased, causing <code>dcpm2</code> to drive as motor and <code>dcpm1</code> to brake as generator.
143152
Therefore, the speed <code>coupling.w</code> increases.

‎Modelica/Electrical/Machines/Examples/InductionMachines/IMC_InverterDrive.mo

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,19 @@ model IMC_InverterDrive
5454
rotation=90,
5555
origin={-80,60})));
5656

57-
PowerConverters.ACDC.DiodeBridge2mPulse rectifier
57+
PowerConverters.ACDC.DiodeBridge2mPulse rectifier(RonDiode=1e-4, GoffDiode=
58+
1e-4)
5859
annotation (Placement(transformation(extent={{-68,60},{-48,80}})));
5960
Analog.Basic.Capacitor capacitor(v(fixed=true, start=VDC), C=CDC)
6061
annotation (Placement(transformation(
6162
extent={{-10,-10},{10,10}},
6263
rotation=270,
6364
origin={-30,70})));
64-
PowerConverters.DCAC.Polyphase2Level inverter annotation (Placement(
65+
PowerConverters.DCAC.Polyphase2Level inverter(
66+
RonTransistor=1e-4,
67+
GoffTransistor=1e-4,
68+
RonDiode=1e-4,
69+
GoffDiode=1e-4) annotation (Placement(
6570
transformation(
6671
extent={{-10,-10},{10,10}},
6772
origin={0,70})));

‎Modelica/Electrical/Machines/Examples/SynchronousMachines/SMPM_Braking.mo

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ model SMPM_Braking
6464
origin={-10,0},
6565
extent={{-10,-10},{10,10}},
6666
rotation=270)));
67-
PowerConverters.ACDC.DiodeBridge2mPulse diodeBridge2mPulse(m=m) annotation (
67+
PowerConverters.ACDC.DiodeBridge2mPulse diodeBridge2mPulse(m=m,
68+
RonDiode=1e-4,
69+
GoffDiode=1e-4) annotation (
6870
Placement(transformation(
6971
extent={{-10,10},{10,-10}},
7072
rotation=90,

‎Modelica/Mechanics/Rotational/Components/Coupling.mo renamed to ‎Modelica/Electrical/Machines/Utilities/Coupling.mo

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
within Modelica.Mechanics.Rotational.Components;
1+
within Modelica.Electrical.Machines.Utilities;
22
model Coupling "Ideal rotational coupling"
33
extends Modelica.Mechanics.Rotational.Interfaces.PartialTwoFlanges;
44
Modelica.Units.SI.AngularVelocity w(displayUnit="rpm") = der(flange_a.phi) "Angular velocity of flange_a";
55
Modelica.Units.SI.Torque tau = flange_a.tau "Torque of flange_a and flange_b";
6+
Mechanics.Rotational.Components.IdealGear idealGear(final useSupport=false,
7+
final ratio=-1)
8+
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
69
equation
7-
flange_a.phi + flange_b.phi = 0;
8-
flange_a.tau - flange_b.tau = 0;
10+
connect(idealGear.flange_b, flange_b)
11+
annotation (Line(points={{10,0},{100,0}}, color={0,0,0}));
12+
connect(idealGear.flange_a, flange_a)
13+
annotation (Line(points={{-10,0},{-100,0}}, color={0,0,0}));
914
annotation (Icon(graphics={
1015
Rectangle(
1116
lineColor={64,64,64},
@@ -59,16 +64,20 @@ equation
5964
-10,-22},{10,-20},{10,-42},{-10,-40},{-10,-60}}, color={0,0,0})}),
6065
Documentation(info="<html>
6166
<p>
62-
This is a model of an ideal stiff coupling (face to face),
63-
i.e., the angular velocity if <code>flange_b</code> is exactly in opposite direction of <code>flange_a</code>,
64-
and the torque of both flanges is identical.
67+
This is a model of an ideal stiff coupling:
68+
One device connected to the coupling is turning clockwise (looking at the shaft end),
69+
the other device connected to the coupling is turning counter-clockwise (looking at the shaft end).
70+
The torque at <code>flange_b</code> has the same magnitude as the torque at <code>flange_a</code> but opposite sign.
71+
This is achieved by using an
72+
<a href=\"modelica://Modelica.Mechanics.Rotational.Components.IdealGear\">ideal gear</a> with <code>ratio = -1</code>.
6573
</p>
6674
<p>
67-
The usage is demonstrated in an <a href=\"modelica://Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Drive\">example in Modelica.Electrical.Machines</a>.
75+
Variable <code>w</code> represents the angular velocity of <code>flange_a</code>
76+
and <code>tau</code> represents the torque transferred from <code>flange_a</code> to <code>flange_b</code>.
6877
</p>
6978
<p>
70-
Variable <code>w</code> represents the angular velocity of <code>flange_a</code>
71-
and <code>tau</code> represents the torque transferred between <code>flange_a</code> and <code>flange_b</code>.
79+
This behaviour is essential when coupling electric machines. The usage is demonstrated
80+
in the example <a href=\"modelica://Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Drive\">Modelica.Electrical.Machines.Examples.DCMachines.DCPM_Drive</a>.
7281
</p>
7382
</html>"));
7483
end Coupling;

‎Modelica/Electrical/Machines/Utilities/package.order

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ TerminalBox
1111
MultiTerminalBox
1212
SwitchedRheostat
1313
RampedRheostat
14+
Coupling
1415
DcBrakeSettings
1516
SynchronousMachineData
1617
TransformerData

‎Modelica/Electrical/Machines/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package Machines "Library for electric machines"
77
Documentation(info="<html>
88
<p><strong>For a discrimination of various machine models, see <a href=\"modelica://Modelica.Electrical.Machines.UsersGuide.Discrimination\">discrimination</a></strong>.</p>
99
<p>
10-
Copyright &copy; 1998-2024, Modelica Association and contributors
10+
Copyright &copy; 1998-2025, Modelica Association and contributors
1111
</p>
1212
</html>", revisions="<html>
1313
</html>"),

‎Modelica/Electrical/Polyphase/package.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package Polyphase "Library for electrical components of one or more phases"
44

55
annotation (Documentation(info="<html>
66
<p>
7-
Copyright &copy; 1998-2024, Modelica Association and contributors
7+
Copyright &copy; 1998-2025, Modelica Association and contributors
88
</p>
99
</html>", revisions="<html>
1010
<ul>

‎Modelica/Electrical/PowerConverters/DCDC/ChopperBuckBost.mo renamed to ‎Modelica/Electrical/PowerConverters/DCDC/ChopperBuckBoost.mo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
within Modelica.Electrical.PowerConverters.DCDC;
2-
model ChopperBuckBost "Bidirectional chopper"
2+
model ChopperBuckBoost "Bidirectional chopper"
33
extends Modelica.Electrical.PowerConverters.Interfaces.DCDC.DCtwoPin1;
44
extends Modelica.Electrical.PowerConverters.Interfaces.DCDC.DCtwoPin2;
55
extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort(final T=293.15);
@@ -117,4 +117,4 @@ equation
117117
This is a bidirectional buck / boost - converter with 2 transistors and 2 freewheeling diodes.
118118
</p>
119119
</html>"));
120-
end ChopperBuckBost;
120+
end ChopperBuckBoost;

‎Modelica/Electrical/PowerConverters/DCDC/package.order

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Control
22
ChopperStepDown
33
ChopperStepUp
4-
ChopperBuckBost
4+
ChopperBuckBoost
55
HBridge

‎Modelica/Electrical/PowerConverters/Examples/DCDC/ExampleTemplates/ChopperBuckBoost.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ partial model ChopperBuckBoost "Buck/boost converter example template"
1111
parameter Modelica.Units.SI.Resistance R=1e-3 "Resistance of inductor";
1212
parameter Modelica.Units.SI.Frequency fS=40e3 "Switching frequency";
1313
parameter Real idleDutyCycle=1 - VLV/VHV "Duty cycle for idle operation";
14-
Modelica.Electrical.PowerConverters.DCDC.ChopperBuckBost dcdc
14+
Modelica.Electrical.PowerConverters.DCDC.ChopperBuckBoost dcdc
1515
annotation (Placement(transformation(extent={{10,-8},{30,12}})));
1616
Modelica.Electrical.Analog.Sources.ConstantVoltage constantVoltageLV(V=VLV)
1717
annotation (Placement(transformation(

0 commit comments

Comments
 (0)