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

Issue1267_UpdateConstructions #1420

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Issue1267_UpdateConstructions #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0542cb2
new materials
annadellisola Jan 3, 2025
e91727d
EPB package with different labels
annadellisola Jan 3, 2025
df87b6c
add annotation
annadellisola Jan 3, 2025
15cb4f6
naming according to standard, EPC folder in materials, added document…
annadellisola Jan 14, 2025
006e7b0
remove old duplicate files
lucasverleyen Jan 22, 2025
09ec892
Merge pull request #1 from lucasverleyen/issue1267_UpdateConstructions
annadellisola Jan 23, 2025
15446bc
updated packages
annadellisola Jan 26, 2025
7661d6b
Updated Frame.U_value for different labels
annadellisola Jan 26, 2025
5afebca
Merge branch 'issue1267_UpdateConstructions' of https://github.com/an…
annadellisola Jan 26, 2025
548b09e
insulated and unisulated floor
annadellisola Jan 26, 2025
e06058f
Merge remote-tracking branch 'origin/master' into issue1267_UpdateCon…
annadellisola Feb 4, 2025
ab8829d
Merge remote-tracking branch 'origin/master' into issue1267_UpdateCon…
annadellisola Feb 10, 2025
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
15 changes: 15 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/CommonWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelA;
record CommonWall "Construction data of CommonWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.02),
IDEAS.Buildings.Data.Materials.EPC.MediumMasonryForInteriorApplications(
d=0.14)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end CommonWall;
23 changes: 23 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/GroundFloor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelA;
record GroundFloor "Construction data of GroundFloor"
extends IDEAS.Buildings.Data.Interfaces.Construction(
locGain={3},
incLastLay=IDEAS.Types.Tilt.Floor,
final mats={
IDEAS.Buildings.Data.Materials.EPC.DenseCastConcreteAlsoForFinishing(d=
0.2),IDEAS.Buildings.Data.Insulation.EPC.ExpandedPolystrenemOrEPS(d=
0.13413005339301134),
IDEAS.Buildings.Data.Materials.EPC.ScreedOrLightCastConcrete(d=0.06),
IDEAS.Buildings.Data.Materials.EPC.CeramicTileForFinishing(
d=0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>March 10, 2024, by Lucas Verleyen:<br>
Add locGain={3}.</li>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
Implementation in IDEAS. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end GroundFloor;
16 changes: 16 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/InnerWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelA;
record InnerWall "Construction data of InnerWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.02),
IDEAS.Buildings.Data.Materials.EPC.MediumMasonryForInteriorApplications(
d=0.1),IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=
0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end InnerWall;
19 changes: 19 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/OuterWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelA;
record OuterWall "Construction data of OuterWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.HeavyMasonryForExteriorApplications(
d=0.09),
IDEAS.Buildings.Data.Materials.EPC.LargeCavityHorizontalHeatTransfer(d=
0.025),IDEAS.Buildings.Data.Insulation.Rockwool(d=0.12520020438577814),
IDEAS.Buildings.Data.Materials.EPC.HeavyMasonryForInteriorApplications(
d=0.14),IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=
0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end OuterWall;
16 changes: 16 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/Rooftop.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelA;
record Rooftop "Construction data of Rooftop"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Insulation.EPC.Rockwool415TimberForFinishing35(
d=0.16148316146540032),
IDEAS.Buildings.Data.Materials.EPC.TimberForFinishing(d=0.01),
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.025)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end Rooftop;
15 changes: 15 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/WindowFrame.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelA;
record WindowFrame "Frame data of Window"
extends IDEAS.Buildings.Data.Interfaces.Frame(
present=true,
U_value=3.38,
redeclare parameter IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.06, len=3.824108964701916));
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end WindowFrame;
11 changes: 11 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/WindowGlazing.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelA;
record WindowGlazing = IDEAS.Buildings.Data.Glazing.Ins2Ar2020
"Glazing data of Window"
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
18 changes: 18 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
within IDEAS.Buildings.Data.Constructions.EPC;
package LabelA "Library of building envelope constructions label A"

extends Modelica.Icons.MaterialPropertiesPackage;

annotation (Documentation(info="<html>
<p>
Constructions with insulation level of label A (<a href=\"https://energyville.be/wp-content/uploads/2024/12/VEKA_hybride-WP_eindrapport_final.pdf\">ref</a>).
</p>
</html>",revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end LabelA;
7 changes: 7 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelA/package.order
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OuterWall
Rooftop
GroundFloor
CommonWall
InnerWall
WindowGlazing
WindowFrame
15 changes: 15 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/CommonWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelB;
record CommonWall "Construction data of CommonWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.02),
IDEAS.Buildings.Data.Materials.EPC.MediumMasonryForInteriorApplications(
d=0.14)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end CommonWall;
23 changes: 23 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/GroundFloor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelB;
record GroundFloor "Construction data of GroundFloor"
extends IDEAS.Buildings.Data.Interfaces.Construction(
locGain={3},
incLastLay=IDEAS.Types.Tilt.Floor,
final mats={
IDEAS.Buildings.Data.Materials.EPC.DenseCastConcreteAlsoForFinishing(d=
0.2),IDEAS.Buildings.Data.Insulation.EPC.ExpandedPolystrenemOrEPS(d=
0.07382181126658739),
IDEAS.Buildings.Data.Materials.EPC.ScreedOrLightCastConcrete(d=0.06),
IDEAS.Buildings.Data.Materials.EPC.CeramicTileForFinishing(
d=0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>March 10, 2024, by Lucas Verleyen:<br>
Add locGain={3}.</li>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
Implementation in IDEAS. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end GroundFloor;
16 changes: 16 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/InnerWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelB;
record InnerWall "Construction data of InnerWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.02),
IDEAS.Buildings.Data.Materials.EPC.MediumMasonryForInteriorApplications(
d=0.1),IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=
0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end InnerWall;
19 changes: 19 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/OuterWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelB;
record OuterWall "Construction data of OuterWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.HeavyMasonryForExteriorApplications(
d=0.09),
IDEAS.Buildings.Data.Materials.EPC.LargeCavityHorizontalHeatTransfer(d=
0.025),IDEAS.Buildings.Data.Insulation.Rockwool(d=0.037261869785843296),
IDEAS.Buildings.Data.Materials.EPC.HeavyMasonryForInteriorApplications(
d=0.14),IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=
0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end OuterWall;
16 changes: 16 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/Rooftop.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelB;
record Rooftop "Construction data of Rooftop"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Insulation.EPC.Rockwool415TimberForFinishing35(
d=0.09096077340569879),
IDEAS.Buildings.Data.Materials.EPC.TimberForFinishing(d=0.01),
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.025)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end Rooftop;
15 changes: 15 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/WindowFrame.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelB;
record WindowFrame "Frame data of Window"
extends IDEAS.Buildings.Data.Interfaces.Frame(
present=true,
U_value=1,
redeclare parameter IDEAS.Buildings.Components.ThermalBridges.LineLosses briTyp(psi=0.06, len=3.5176479597266095));
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end WindowFrame;
10 changes: 10 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/WindowGlazing.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelB;
record WindowGlazing = IDEAS.Buildings.Data.Glazing.EpcDouble
"Glazing data of Window" annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
18 changes: 18 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
within IDEAS.Buildings.Data.Constructions.EPC;
package LabelB "Library of building envelope constructions label B"

extends Modelica.Icons.MaterialPropertiesPackage;

annotation (Documentation(info="<html>
<p>
Constructions with insulation level of label B (<a href=\"https://energyville.be/wp-content/uploads/2024/12/VEKA_hybride-WP_eindrapport_final.pdf\">ref</a>).
</p>
</html>",revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end LabelB;
7 changes: 7 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelB/package.order
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OuterWall
Rooftop
GroundFloor
CommonWall
InnerWall
WindowGlazing
WindowFrame
15 changes: 15 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelC/CommonWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelC;
record CommonWall "Construction data of CommonWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.02),
IDEAS.Buildings.Data.Materials.EPC.MediumMasonryForInteriorApplications(
d=0.14)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end CommonWall;
23 changes: 23 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelC/GroundFloor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelC;
record GroundFloor "Construction data of GroundFloor"
extends IDEAS.Buildings.Data.Interfaces.Construction(
locGain={3},
incLastLay=IDEAS.Types.Tilt.Floor,
final mats={
IDEAS.Buildings.Data.Materials.EPC.DenseCastConcreteAlsoForFinishing(d=
0.2),IDEAS.Buildings.Data.Insulation.EPC.ExpandedPolystrenemOrEPS(d=
0.07382181126658739),
IDEAS.Buildings.Data.Materials.EPC.ScreedOrLightCastConcrete(d=0.06),
IDEAS.Buildings.Data.Materials.EPC.CeramicTileForFinishing(
d=0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>March 10, 2024, by Lucas Verleyen:<br>
Add locGain={3}.</li>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
Implementation in IDEAS. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end GroundFloor;
16 changes: 16 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelC/InnerWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelC;
record InnerWall "Construction data of InnerWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.02),
IDEAS.Buildings.Data.Materials.EPC.MediumMasonryForInteriorApplications(
d=0.1),IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=
0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end InnerWall;
19 changes: 19 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelC/OuterWall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelC;
record OuterWall "Construction data of OuterWall"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Materials.EPC.HeavyMasonryForExteriorApplications(
d=0.09),
IDEAS.Buildings.Data.Materials.EPC.LargeCavityHorizontalHeatTransfer(d=
0.025),IDEAS.Buildings.Data.Insulation.Rockwool(d=0.037261869785843296),
IDEAS.Buildings.Data.Materials.EPC.HeavyMasonryForInteriorApplications(
d=0.14),IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=
0.02)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end OuterWall;
16 changes: 16 additions & 0 deletions IDEAS/Buildings/Data/Constructions/EPC/LabelC/Rooftop.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
within IDEAS.Buildings.Data.Constructions.EPC.LabelC;
record Rooftop "Construction data of Rooftop"
extends IDEAS.Buildings.Data.Interfaces.Construction(final mats={
IDEAS.Buildings.Data.Insulation.EPC.Rockwool415TimberForFinishing35(
d=0.03872196743554952),
IDEAS.Buildings.Data.Materials.EPC.TimberForFinishing(d=0.01),
IDEAS.Buildings.Data.Materials.EPC.GypsumPlasterForFinishing(d=0.025)});
annotation (Documentation(revisions="<html>
<ul>
<li>
Jan 3, 2025, by Anna Dell'Isola:<br/>
First implementation. See <a href=\"https://github.com/open-ideas/IDEAS/issues/1267\">#1267</a>.
</li>
</ul>
</html>"));
end Rooftop;
Loading
Loading