Skip to content

Commit 8136306

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 45dd567 + d298b0e commit 8136306

177 files changed

Lines changed: 755 additions & 456 deletions

File tree

Some content is hidden

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

.travis.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

IDEAS/Airflow/AHU/Examples/Adsolair58.mo

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ model Adsolair58 "Adsolair58 example model"
77
replaceable package Medium = IDEAS.Media.Air;
88
replaceable package MediumWater = IDEAS.Media.Water "Heating medium";
99
parameter Modelica.Units.SI.Pressure dp_nominal=100 "Constant output value";
10-
parameter SI.MassFlowRate m_flow_nominal=0.3 "Nominal air mass flow rate";
10+
parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=0.3 "Nominal air mass flow rate";
1111
Adsolair58HeaCoi adsolair58(
1212
redeclare package MediumAir = Medium,
1313
redeclare BaseClasses.Adsolair14200 per,
@@ -361,6 +361,11 @@ A PI controller is used to track the set point temperature.
361361
</html>", revisions="<html>
362362
<ul>
363363
<li>
364+
February 4, 2025, by Jelger Jansen:<br/>
365+
Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
366+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
367+
</li>
368+
<li>
364369
October 30, 2024, by Lucas Verleyen:<br/>
365370
Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
366371
See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a>

IDEAS/Airflow/Multizone/CrackOrOperableDoor.mo

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ model CrackOrOperableDoor
3535
parameter Modelica.Units.SI.Length h_a1 = 0 "Height at port a1(hasCavity=false)";
3636
parameter Modelica.Units.SI.Length h_a2 "Height at port a2(hasCavity=false)";
3737

38-
parameter SI.Length hA=(h_a1 + h_b2)/2
38+
parameter Modelica.Units.SI.Length hA=(h_a1 + h_b2)/2
3939
"Height of reference pressure at port a1 for opening (hasCavity=true) model";
40-
parameter SI.Length hB=(h_a2 + h_b1)/2
40+
parameter Modelica.Units.SI.Length hB=(h_a2 + h_b1)/2
4141
"Height of reference pressure at port b1 for opening (hasCavity=true) model";
4242

4343
final parameter Real CDCloRat(min=0, max=1)=1
@@ -151,7 +151,7 @@ model CrackOrOperableDoor
151151
hOpe=hOpe,
152152
dpCloRat=dpCloRat,
153153
LClo=LClo,
154-
vZer=vZer*MFtrans*rho_default)
154+
vZer=MFtrans/(rho_default*doo.wOpe*doo.hOpe))
155155
if useDoor and interZonalAirFlowType == IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts annotation (
156156
Placement(visible = true, transformation(origin={-2,0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
157157
IDEAS.Fluid.Sources.Boundary_pT bou(
@@ -165,7 +165,7 @@ model CrackOrOperableDoor
165165
"Door constantly opened" annotation (
166166
Placement(visible = true, transformation(origin = {-54, -14}, extent = {{-6, -6}, {6, 6}}, rotation = 0)));
167167

168-
parameter SI.Angle inc=Modelica.Constants.pi/2
168+
parameter Modelica.Units.SI.Angle inc=Modelica.Constants.pi/2
169169
"inclination angle (vertical=pi/2)";
170170
initial equation
171171
assert( not (interZonalAirFlowType <> IDEAS.BoundaryConditions.Types.InterZonalAirFlow.TwoPorts and useDoor and use_y),
@@ -223,6 +223,16 @@ There is no support for open doors when using only a single fluid port.
223223
revisions="<html>
224224
<ul>
225225
<li>
226+
February 4, 2025, by Jelger Jansen:<br/>
227+
Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
228+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
229+
</li>
230+
<li>
231+
January 30, 2025, by Klaas De Jonge:<br/>
232+
Changed wrong parameter declaration <code>doo.vZer</code> to have compatible units.
233+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1402\">#1402</a>.
234+
</li>
235+
<li>
226236
October 30, 2024, by Klaas De Jonge:<br/>
227237
Changes for column heights,used default density and transition point to laminar flow at low dp.
228238
</li>

IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
within IDEAS.BoundaryConditions.Examples;
22
model StrobeInfoManager_offset
33
"Unit test for SimInfoManager with time offset on read data"
4-
import IDEAS;
54
extends Modelica.Icons.Example;
65
inner IDEAS.BoundaryConditions.Occupants.Extern.StrobeInfoManager strobe(
76
nOcc=10,
@@ -26,6 +25,11 @@ model StrobeInfoManager_offset
2625
Documentation(revisions="<html>
2726
<ul>
2827
<li>
28+
February 7, 2025, by Jelger Jansen:<br/>
29+
Removed <code>import IDEAS</code> statement.
30+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
31+
</li>
32+
<li>
2933
December 20, 2017 by Bram van der Heijde:<br/>
3034
First implementation.
3135
</li>

IDEAS/BoundaryConditions/SolarIrradiation/RadSol.mo

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ model RadSol "Block that computes surface-dependent environment data"
33
extends Modelica.Blocks.Icons.Block;
44

55
parameter Real rho=0.2 "Ground reflectance";
6-
parameter Modelica.Units.SI.Angle inc(displayUnit="degree") "inclination";
7-
parameter Modelica.Units.SI.Angle azi(displayUnit="degree") "azimuth";
8-
parameter Modelica.Units.SI.Angle lat(displayUnit="degree") "latitude";
6+
parameter Modelica.Units.SI.Angle inc(displayUnit="deg") "inclination";
7+
parameter Modelica.Units.SI.Angle azi(displayUnit="deg") "azimuth";
8+
parameter Modelica.Units.SI.Angle lat(displayUnit="deg") "latitude";
99
parameter Boolean remDefVals = false "Remove default signal values";
1010
parameter Boolean outputAngles=true "Set to false when linearising only";
1111

@@ -141,6 +141,11 @@ equation
141141
Documentation(revisions="<html>
142142
<ul>
143143
<li>
144+
January 24, 2025, by Klaas De Jonge:<br/>
145+
Changed <code>displayUnit</code> angles from <code>degree</code> to <code>deg</code> to avoid warnings.
146+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1402\">#1402</a>
147+
</li>
148+
<li>
144149
November 28, 2019, by Ian Beausoleil-Morrison:<br/>
145150
Add RealInput's for wind speed and wind direction.<br/>
146151
Instantiate extConvForcedCoeff.mo and place resulting coefficient for forced convection on SolBus.

IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MonoLayer.mo

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected
7373
"True when a convection + radiation equation should be used to model the layer instead of conduction";
7474

7575
public
76-
parameter SI.TemperatureDifference dT_nom_air=1
76+
parameter Modelica.Units.SI.TemperatureDifference dT_nom_air=1
7777
"Nominal temperature difference for air layers, used for linearising Rayleigh number";
7878
equation
7979
connect(E_internal, monLayDyn.E);
@@ -150,6 +150,11 @@ equation
150150
</html>", revisions="<html>
151151
<ul>
152152
<li>
153+
February 4, 2025, by Jelger Jansen:<br/>
154+
Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
155+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
156+
</li>
157+
<li>
153158
September 9, 2019, by Kristoff Six:<br/>
154159
Updated with <code>checkCoating</code> for issue
155160
<a href=\"https://github.com/open-ideas/IDEAS/issues/1038\">#1038</a>.

IDEAS/Buildings/Components/BaseClasses/ConductiveHeatTransfer/MultiLayer.mo

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ model MultiLayer "multiple material layers in series"
2727
parameter Boolean disableInitPortB= false
2828
"Remove initial equation at port b"
2929
annotation(Evaluate=true, Dialog(group="Dynamics"));
30-
parameter SI.TemperatureDifference dT_nom_air=1
30+
parameter Modelica.Units.SI.TemperatureDifference dT_nom_air=1
3131
"Nominal temperature difference for air layers, used for linearising Rayleigh number"
3232
annotation(Dialog(enable=linIntCon));
3333
parameter Boolean checkCoatings = false
@@ -176,6 +176,11 @@ equation
176176
</html>", revisions="<html>
177177
<ul>
178178
<li>
179+
February 4, 2025, by Jelger Jansen:<br/>
180+
Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
181+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
182+
</li>
183+
<li>
179184
August 9, 2022, by Filip Jorissen:<br/>
180185
Updated documentation and added parameters for issue
181186
<a href=\"https://github.com/open-ideas/IDEAS/issues/1270\">#1270</a>.

IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
within IDEAS.Buildings.Components.BaseClasses.RadiativeHeatTransfer.Examples;
22
model ZoneLwGainDistribution
3-
import IDEAS;
43
extends Modelica.Icons.Example;
54
Modelica.Blocks.Sources.Ramp ramDir(
65
duration=1,
@@ -90,6 +89,11 @@ equation
9089
Documentation(revisions="<html>
9190
<ul>
9291
<li>
92+
February 7, 2025, by Jelger Jansen:<br/>
93+
Removed <code>import IDEAS</code> statement.
94+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
95+
</li>
96+
<li>
9397
January 19, 2017 by Filip Jorissen:<br/>
9498
First implementation
9599
</li>

IDEAS/Buildings/Components/Interfaces/PartialSurface.mo

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
within IDEAS.Buildings.Components.Interfaces;
22
partial model PartialSurface "Partial model for building envelope component"
3-
3+
44
outer IDEAS.BoundaryConditions.SimInfoManager sim
55
"Simulation information manager for climate data"
66
annotation (Placement(visible = true, transformation(origin = {50, 180}, extent = {{30, -100}, {50, -80}}, rotation = 0)));
@@ -26,7 +26,7 @@ partial model PartialSurface "Partial model for building envelope component"
2626
annotation (Dialog(group="Design power",tab="Advanced"));
2727
parameter Modelica.Units.SI.Temperature T_start=293.15
2828
"Start temperature for each of the layers"
29-
annotation (Dialog(tab="Dynamics", group="Initial condition"));
29+
annotation (Dialog(tab="Dynamics", group="Initial condition"));
3030
parameter Boolean linIntCon_a=sim.linIntCon
3131
"= true, if convective heat transfer should be linearised"
3232
annotation (Dialog(tab="Convection"));
@@ -52,15 +52,15 @@ partial model PartialSurface "Partial model for building envelope component"
5252
final parameter Modelica.Units.SI.Length hzone_a( fixed=false);//connected with propsbus in inital equation
5353
final parameter Modelica.Units.SI.Length hAbs_floor_a( fixed=false);
5454
parameter Modelica.Units.SI.Length hVertical=if IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Floor) or IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Ceiling) then 0 else hzone_a "Vertical surface height, height of the surface projected to the vertical, 0 for floors and ceilings" annotation(Evaluate=true);
55-
parameter Modelica.Units.SI.Length hRelSurfBot_a= if IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Ceiling) then hzone_a else 0 "Height between the lowest point of the surface (bottom) and the floor level of the zone connected at propsBus_a"annotation(Evaluate=true);
55+
parameter Modelica.Units.SI.Length hRelSurfBot_a= if IDEAS.Utilities.Math.Functions.isAngle(inc,IDEAS.Types.Tilt.Ceiling) then hzone_a else 0 "Height between the lowest point of the surface (bottom) and the floor level of the zone connected at propsBus_a"
56+
annotation(Evaluate=true);
5657
final parameter Modelica.Units.SI.Length Habs_surf=hAbs_floor_a+hRelSurfBot_a+(hVertical/2) "Absolute height of the middle of the surface, can be used to check the heights after initialisation";
5758

5859
IDEAS.Buildings.Components.Interfaces.ZoneBus propsBus_a(
5960
redeclare final package Medium = Medium,
6061
numIncAndAziInBus=sim.numIncAndAziInBus, outputAngles=sim.outputAngles,
6162
final use_port_1=sim.use_port_1,
62-
final use_port_2=sim.use_port_2)
63-
"If inc = Floor, then propsbus_a should be connected to the zone above this floor.
63+
final use_port_2=sim.use_port_2) "If inc = Floor, then propsbus_a should be connected to the zone above this floor.
6464
If inc = ceiling, then propsbus_a should be connected to the zone below this ceiling.
6565
If component is an outerWall, porpsBus_a should be connect to the zone."
6666
annotation (Placement(transformation(
@@ -106,6 +106,16 @@ partial model PartialSurface "Partial model for building envelope component"
106106
Placement(visible = true, transformation(origin = {30, -52}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
107107
Modelica.Blocks.Sources.RealExpression AExp(y = A) "Area expression" annotation(
108108
Placement(transformation(origin = {0, 20}, extent = {{-10, -10}, {10, 10}})));
109+
Modelica.Blocks.Routing.BooleanPassThrough use_custom_q50PassThrough
110+
annotation (Placement(transformation(
111+
extent={{-5,5},{5,-5}},
112+
rotation=90,
113+
origin={62,-20})));
114+
Modelica.Blocks.Routing.RealPassThrough v50PassThrough annotation (Placement(transformation(
115+
extent={{-5,-5},{5,5}},
116+
rotation=90,
117+
origin={50,-20})));
118+
109119
protected
110120
parameter Boolean add_door = true "Option to disable crackOrOperableDoor";
111121
final parameter Modelica.Units.SI.Angle aziInt=
@@ -170,6 +180,9 @@ model Q50_parameterToConnector "Converts parameter values into connectors for pr
170180
"Custom v50 value";
171181
parameter Boolean use_custom_q50=false
172182
"true if custom q50 value should be considered by the zone";
183+
parameter Integer nDum=2
184+
"Number of dummy connections";
185+
173186
Modelica.Blocks.Interfaces.RealInput q50_zone
174187
"Input for q50 value computed by the zone"
175188
annotation (Placement(transformation(extent={{-126,50},{-86,90}})));
@@ -180,7 +193,7 @@ model Q50_parameterToConnector "Converts parameter values into connectors for pr
180193
Modelica.Blocks.Interfaces.BooleanOutput using_custom_q50 = use_custom_q50
181194
"Output indicating whether a custom q50 value should be considered by the zone"
182195
annotation (Placement(transformation(extent={{-100,-30},{-120,-10}})));
183-
Modelica.Blocks.Interfaces.RealInput dummy_h[2]
196+
Modelica.Blocks.Interfaces.RealInput dummy_h[nDum]
184197
"Dummy connectors for hzone and hfloor"
185198
annotation (Placement(transformation(extent={{-126,14},{-86,54}})));
186199
annotation (Icon(graphics={Rectangle(
@@ -237,37 +250,44 @@ equation
237250
color={255,204,51},
238251
thickness=0.5));
239252
connect(setArea.areaPort, sim.areaPort);
240-
connect(q50_zone.v50, propsBusInt.v50) annotation (Line(points={{79,-58},{56,-58},
241-
{56,-20},{56.09,-20},{56.09,19.91}}, color={0,0,127}));
242253
connect(q50_zone.q50_zone, propsBusInt.q50_zone) annotation (Line(points={{79.4,
243254
-43},{79.4,-44},{56.09,-44},{56.09,19.91}}, color={0,0,127}));
244-
connect(q50_zone.using_custom_q50, propsBusInt.use_custom_q50) annotation (Line(points={{79,-52},
245-
{56.09,-52},{56.09,19.91}}, color={0,0,127}));
246255
connect(setArea.use_custom_n50, propsBusInt.use_custom_n50) annotation (Line(points={{79.4,
247256
-91},{79.4,-90.5},{56.09,-90.5},{56.09,19.91}}, color={255,0,255}));
248257
connect(setArea.v50, propsBus_a.v50) annotation (Line(points={{79.4,-83.2},{
249258
79.4,-82},{56,-82},{56,0},{100.1,0},{100.1,19.9}}, color={0,0,127}));
250-
connect(q50_zone.dummy_h[1], propsBusInt.hzone) annotation (Line(points={{79.4,
251-
-47.6},{80,-47.6},{80,-48},{56.09,-48},{56.09,19.91}}, color={0,0,127}));
252-
connect(q50_zone.dummy_h[2], propsBusInt.hfloor) annotation (Line(points={{79.4,
253-
-45.6},{80,-45.6},{80,-46},{56.09,-46},{56.09,19.91}}, color={0,0,127}));
259+
connect(q50_zone.dummy_h[1], propsBusInt.hzone);
260+
connect(q50_zone.dummy_h[2], propsBusInt.hfloor);
254261
if sim.use_port_1 then
255262
connect(crackOrOperableDoor.port_b1, propsBusInt.port_1) annotation(
256-
Line(points = {{40, -46}, {56, -46}, {56, 20}}, color = {0, 127, 255}));
263+
Line(points={{40,-46},{56.09,-46},{56.09,19.91}},
264+
color = {0, 127, 255}));
257265
end if;
258266
if sim.use_port_2 then
259267
connect(crackOrOperableDoor.port_a2, propsBusInt.port_2) annotation(
260-
Line(points = {{40, -58}, {56, -58}, {56, 20}}, color = {0, 127, 255}));
268+
Line(points={{40,-58},{56.09,-58},{56.09,19.91}},
269+
color = {0, 127, 255}));
261270
end if;
262271
connect(AExp.y, propsBusInt.area) annotation(
263-
Line(points = {{12, 20}, {56, 20}}, color = {0, 0, 127}));
272+
Line(points={{11,20},{34,20},{34,19.91},{56.09,19.91}},
273+
color = {0, 0, 127}));
274+
connect(q50_zone.v50, v50PassThrough.u) annotation (Line(points={{79,-58},{56,-58},{56,-30},{50,-30},{50,-26}}, color={0,0,127}));
275+
connect(v50PassThrough.y, propsBusInt.v50) annotation (Line(points={{50,-14.5},{50,-8},{56.09,-8},{56.09,19.91}}, color={0,0,127}));
276+
connect(q50_zone.using_custom_q50, use_custom_q50PassThrough.u) annotation (Line(points={{79,-52},{56,-52},{56,-30},{62,-30},{62,-26}}, color={255,0,255}));
277+
connect(use_custom_q50PassThrough.y, propsBusInt.use_custom_q50) annotation (Line(points={{62,-14.5},{62,-8},{56.09,-8},{56.09,19.91}}, color={255,0,255}));
264278
annotation (
265279
Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
266280
100,100}})),
267281
Icon(coordinateSystem(preserveAspectRatio = false, extent = {{-50, -100}, {50, 100}})),
268282
Documentation(revisions="<html>
269283
<ul>
270284
<li>
285+
January 24, 2025, by Klaas De Jonge:<br/>
286+
Addition of BooleanPassThrough and RealPassThrough block for v50 and use_custom_q50 and
287+
parameter for number of dummy connections in <code>Q50_parameterToConnector</code> to avoid translation warnings.
288+
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1402\">#1402</a>
289+
</li>
290+
<li>
271291
November 7, 2024, by Anna Dell'Isola and Jelger Jansen:<br/>
272292
Add variable <code>TRefZon</code> to be used when calculating <code>QTra_design</code>.
273293
See <a href=\"https://github.com/open-ideas/IDEAS/issues/1337\">#1337</a>

0 commit comments

Comments
 (0)