Skip to content
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

Jump to bottom

Correction of Modelica language compliance errors #1932

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Correction of Modelica language compliance errors #1932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf7668
Removed wrong parameter keyword
mwetter Aug 30, 2024
10951f5
Merge branch 'master' into issue1930_dymola2025x
mwetter Sep 12, 2024
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
30 changes: 27 additions & 3 deletions IBPSA/Electrical/Transmission/BaseClasses/BaseCable.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,16 @@ record BaseCable "Record that contains the properties of a generic cable"
"Frequency considered in the definition of cables properties";
output Modelica.Units.SI.Resistance R "Resistance of the cable";
protected
parameter Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
annotation (Documentation(revisions="<html>
<ul>
<li>
August 30, 2024, by Michael Wetter:<br/>
Removed wrong parameter keyword on protected variable, which is needed for Dymola 2025x.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1930\">IBPSA, #1930</a>.
</li>
<li>
September 23, 2014, by Marco Bonvini:<br/>
Added function and documentation
</li>
Expand All @@ -36,10 +42,16 @@ Added function and documentation
"Frequency considered in the definition of cables properties";
output Modelica.Units.SI.Inductance L "Inductance of the cable";
protected
parameter Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
annotation (Documentation(revisions="<html>
<ul>
<li>
August 30, 2024, by Michael Wetter:<br/>
Removed wrong parameter keyword on protected variable, which is needed for Dymola 2025x.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1930\">IBPSA, #1930</a>.
</li>
<li>
September 23, 2014, by Marco Bonvini:<br/>
Added function and documentation
</li>
Expand All @@ -55,10 +67,16 @@ Added function and documentation
"Frequency considered in the definition of cables properties";
output Modelica.Units.SI.Capacitance C "Capacitance of the cable";
protected
parameter Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
Modelica.Units.SI.AngularVelocity omega=2*Modelica.Constants.pi*f;
annotation (Documentation(revisions="<html>
<ul>
<li>
August 30, 2024, by Michael Wetter:<br/>
Removed wrong parameter keyword on protected variable, which is needed for Dymola 2025x.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1930\">IBPSA, #1930</a>.
</li>
<li>
September 23, 2014, by Marco Bonvini:<br/>
Added function and documentation
</li>
Expand All @@ -69,6 +87,12 @@ Added function and documentation
annotation (Documentation(revisions="<html>
<ul>
<li>
August 30, 2024, by Michael Wetter:<br/>
Removed wrong parameter keyword on protected variable, which is needed for Dymola 2025x.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1930\">IBPSA, #1930</a>.
</li>
<li>
September 24, 2014, by Marco Bonvini:<br/>
Revised structure of the record, now the temperature constant <code>M</code>
is directly specified in the record.
Expand Down
Loading