Skip to content
Merged
2 changes: 1 addition & 1 deletion IDEAS/Examples/PPD12/Structure.mo
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ This is for <a href=\"https://github.com/open-ideas/IDEAS/issues/1177\">#1177</a
<li>
August 26, 2022, by Klaas De Jonge:<br/>
Assigned correct vertical heights for sloped surfaces in the roof.
commit <a href=\\\"https://github.com/open-ideas/IDEAS/commit/e25590cf60a1ef31c4d15274f30aa798c6c6479e\">\e25590c\</a>.
commit <a href=\"https://github.com/open-ideas/IDEAS/commit/e25590cf60a1ef31c4d15274f30aa798c6c6479e\">e25590c</a>.
</li>
<li>
August 2, 2022, by Filip Jorissen:<br/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ model PVT_UI_Electrical_DayType1
"[W/m2K]" annotation (Placement(transformation(extent={{15,-84},{41,-68}})));
Modelica.Blocks.Sources.RealExpression simPel(y=PvtCol.Pel) "[W]"
annotation (Placement(transformation(extent={{-41,-82},{-15,-66}})));
BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
Modelica.Utilities.Files.loadResource(
"modelica://IDEAS/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
"Weather data input file"
annotation (Placement(transformation(extent={{-46,30},{-26,50}})));
equation

connect(meaDat.y[13],TFluKel. Celsius) annotation (Line(points={{-71,34},{-60,
Expand All @@ -62,6 +67,10 @@ equation
annotation (Line(points={{-38,0},{-10,0}}, color={0,127,255}));
connect(PvtCol.port_b, sou.ports[1])
annotation (Line(points={{10,0},{42,0}}, color={0,127,255}));
connect(weaDat.weaBus, PvtCol.weaBus) annotation (Line(
points={{-26,40},{-16,40},{-16,8},{-10,8}},
color={255,204,51},
thickness=0.5));
annotation (
Documentation(info="<html>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ model PVTQuasiDynamicCollectorValidation
"Validation model of a photovoltaic–thermal (PVT) collector using the ISO 9806:2013 quasi-dynamic thermal method with integrated electrical coupling"

extends IDEAS.Fluid.SolarCollectors.BaseClasses.PartialSolarCollector(
redeclare IDEAS.Fluid.PVTCollectors.Data.GenericQuasiDynamic per,
break weaBus,
break HDifTilIso,
break HDirTil);
redeclare IDEAS.Fluid.PVTCollectors.Data.GenericQuasiDynamic per);

// ===== Parameters =====
parameter Modelica.Units.SI.Efficiency eleLosFac(min=0, max=1) = 0.09
Expand Down Expand Up @@ -170,7 +167,7 @@ equation
connect(Eglob.y, eleGen.HGloTil) annotation (Line(points={{-73.55,-38},{-32,-38},
{-32,-76},{-22,-76}}, color={0,0,127}));
connect(qThSegExp.y,eleGen.Qth) annotation (Line(
points={{-40,-90},{-30,-90},{-30,-70},{-22,-70}},
points={{-39,-90},{-30,-90},{-30,-70},{-22,-70}},
Comment thread
LoneMeertens marked this conversation as resolved.
Outdated
color={0,0,127}));
annotation (
defaultComponentName="pvtCol",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ model PVT_UI_Thermal_DayType1
*(PvtCol.sta_a.T - PvtCol.sta_b.T))
"[W]"
annotation (Placement(transformation(extent={{-41,-82},{-15,-66}})));
BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
Modelica.Utilities.Files.loadResource(
"modelica://IDEAS/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
"Weather data input file"
annotation (Placement(transformation(extent={{-48,34},{-28,54}})));
equation

connect(meaDat.y[13],TAmbKel. Celsius) annotation (Line(points={{-71,34},{-60,
Expand All @@ -70,6 +75,10 @@ equation
annotation (Line(points={{-38,0},{-10,0}}, color={0,127,255}));
connect(PvtCol.port_b, sou.ports[1])
annotation (Line(points={{10,0},{42,0}}, color={0,127,255}));
connect(weaDat.weaBus, PvtCol.weaBus) annotation (Line(
points={{-28,44},{-16,44},{-16,8},{-10,8}},
color={255,204,51},
thickness=0.5));
annotation (
Documentation(info="<html>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ model PVTQuasiDynamicCollectorValidation
"Validation model of a photovoltaic–thermal (PVT) collector using the ISO 9806:2013 quasi-dynamic thermal method with integrated electrical coupling"

extends IDEAS.Fluid.SolarCollectors.BaseClasses.PartialSolarCollector(
redeclare IDEAS.Fluid.PVTCollectors.Data.GenericQuasiDynamic per,
break weaBus,
break HDifTilIso,
break HDirTil);
redeclare IDEAS.Fluid.PVTCollectors.Data.GenericQuasiDynamic per);

// ===== Parameters =====
parameter Modelica.Units.SI.Efficiency eleLosFac(min=0, max=1) = 0.07
Expand Down Expand Up @@ -128,7 +125,7 @@ equation
connect(TFluKel.Celsius, meaDat.y[5]) annotation (Line(points={{22,82},{54,82},
{54,80},{57,80}}, color={0,0,127}));
connect(qThSegExp.y,eleGen.Qth) annotation (Line(
points={{-40,-70},{-22,-70}},
points={{-39,-70},{-22,-70}},
Comment thread
LoneMeertens marked this conversation as resolved.
color={0,0,127}));
annotation (
defaultComponentName="pvtCol",
Expand Down
11 changes: 10 additions & 1 deletion IDEAS/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_Electrical.mo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within IDEAS.Fluid.PVTCollectors.Validation.PVT_UN;
within IDEAS.Fluid.PVTCollectors.Validation.PVT_UN;
Comment thread
LoneMeertens marked this conversation as resolved.
model PVT_UN_Electrical
"Electrical Behavior of Unglazed Rear-Non-Insulated PVT Collector"
extends Modelica.Icons.Example;
Expand Down Expand Up @@ -52,6 +52,11 @@ model PVT_UN_Electrical
"[W/m2K]" annotation (Placement(transformation(extent={{17,-82},{43,-66}})));
Modelica.Blocks.Sources.RealExpression simPel(y=PvtCol.Pel) "[W]"
annotation (Placement(transformation(extent={{-39,-80},{-13,-64}})));
BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
Modelica.Utilities.Files.loadResource(
"modelica://IDEAS/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
"Weather data input file"
annotation (Placement(transformation(extent={{-54,40},{-34,60}})));
equation
connect(bou.T_in,TFluKel. Kelvin)
annotation (Line(points={{-60,4},{-76.5,4}}, color={0,0,127}));
Expand All @@ -63,6 +68,10 @@ equation
annotation (Line(points={{-60,8},{-60,34},{-71,34}}, color={0,0,127}));
connect(meaDat.y[2],TFluKel. Celsius) annotation (Line(points={{-71,34},{-60,34},
{-60,16},{-92,16},{-92,4},{-88,4}}, color={0,0,127}));
connect(weaDat.weaBus, PvtCol.weaBus) annotation (Line(
points={{-34,50},{-14,50},{-14,8},{-8,8}},
color={255,204,51},
thickness=0.5));
annotation (Documentation(info = "<html>
<p>
This model validates the electrical performance of the
Expand Down
11 changes: 10 additions & 1 deletion IDEAS/Fluid/PVTCollectors/Validation/PVT_UN/PVT_UN_Thermal.mo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within IDEAS.Fluid.PVTCollectors.Validation.PVT_UN;
within IDEAS.Fluid.PVTCollectors.Validation.PVT_UN;
Comment thread
LoneMeertens marked this conversation as resolved.
model PVT_UN_Thermal
"Thermal Behavior of Unglazed Rear-Non-Insulated PVT Collector"
extends Modelica.Icons.Example;
Expand Down Expand Up @@ -61,6 +61,11 @@ model PVT_UN_Thermal
annotation (Placement(transformation(extent={{-8,-10},{12,10}})));
parameter Data.Uncovered.UN_Validation datPvtCol
annotation (Placement(transformation(extent={{66,54},{86,74}})));
BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
Modelica.Utilities.Files.loadResource(
"modelica://IDEAS/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
"Weather data input file"
annotation (Placement(transformation(extent={{-46,36},{-26,56}})));
equation
connect(bou.T_in,TFluKel. Kelvin)
annotation (Line(points={{-60,4},{-76.5,4}}, color={0,0,127}));
Expand All @@ -72,6 +77,10 @@ equation
annotation (Line(points={{-60,8},{-60,34},{-71,34}}, color={0,0,127}));
connect(meaDat.y[2],TFluKel. Celsius) annotation (Line(points={{-71,34},{-60,34},
{-60,16},{-92,16},{-92,4},{-88,4}}, color={0,0,127}));
connect(weaDat.weaBus, PvtCol.weaBus) annotation (Line(
points={{-26,46},{-14,46},{-14,8},{-8,8}},
color={255,204,51},
thickness=0.5));
annotation ( Documentation(info = "<html>
<p>
This model validates the thermal performance of the
Expand Down
3 changes: 0 additions & 3 deletions IDEAS/Media/Refrigerants/R410A/package.order
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@ B
C
b
k
A
B
C
Comment on lines -21 to -23
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I am right, this change has nothing to do with syntax, but with the duplicate names in the .order file (which can raise an issue in OMEdit)?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, indeed. It gave a warning in OM.

Loading