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.

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

Issue745 add kfw archetypes #757

Merged
merged 30 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from 69 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f1fc186
added KFW efficiency house standards and refactored the parameters me…
jonas0902 Mar 12, 2024
91dc969
adjusted all tests and examples with the two new parameters construct…
jonas0902 Apr 16, 2024
40aa4fe
Updated the documentation, example and tests to new variables
jonas0902 May 7, 2024
a150592
Formal changes: changed 'geometry_data' back to 'usage' in context of…
jonas0902 May 7, 2024
4f5f01f
Merge remote-tracking branch 'origin/development' into issue745_AddKf…
FWuellhorst May 7, 2024
2641e66
enable again
FWuellhorst May 7, 2024
277cebc
rename to usage as discussed
FWuellhorst May 7, 2024
656c0ce
rename to usage as discussed
FWuellhorst May 7, 2024
39aadef
Only calc_building_parameters if not tabula, as in current developmen…
FWuellhorst May 21, 2024
c0798fe
correction of construction_data variable in json data
jonas0902 May 21, 2024
37bc442
Merge remote-tracking branch 'origin/issue745_AddKfWArchetypes' into …
jonas0902 May 21, 2024
0317be8
set raise_errors default to False again
FWuellhorst May 21, 2024
4d13703
set default after setting it to None
FWuellhorst May 21, 2024
b90c5bd
Merge branch 'development' into issue745_AddKfWArchetypes
FWuellhorst May 23, 2024
d87059d
Use warnings without f-string =
FWuellhorst May 23, 2024
0ce1679
chore(examples): Automatic commit of example files in Markdown and Ju…
May 23, 2024
2d63ed1
Use optional import
FWuellhorst May 23, 2024
6c7c5c6
Merge remote-tracking branch 'origin/issue745_AddKfWArchetypes' into …
FWuellhorst May 23, 2024
3028567
Changes based on the review
jonas0902 May 28, 2024
4d9e72b
Moved the construction_data setter functions to data/utilities
jonas0902 May 29, 2024
9ee3d1d
chore(examples): Automatic commit of example files in Markdown and Ju…
May 29, 2024
8d43aa5
updated version number
jonas0902 May 31, 2024
8a40ae0
Merge branch 'development' into issue745_AddKfWArchetypes
DaJansenGit Jul 16, 2024
94b07b7
minor linting changes
DaJansenGit Jul 16, 2024
0c7e3f5
fix wrong indentation
DaJansenGit Jul 16, 2024
4ea919b
updated and deleted version number in json files
jonas0902 Jul 23, 2024
09b7962
Adjusted documentation in e1 and e6
jonas0902 Jul 23, 2024
884c61f
chore(examples): Automatic commit of example files in Markdown and Ju…
Jul 23, 2024
3682606
Edited docs of e1 and e6
jonas0902 Jul 23, 2024
063bfbd
chore(examples): Automatic commit of example files in Markdown and Ju…
Jul 23, 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
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"teaser.data.input.inputdata.weatherdata",
"teaser.data.output",
"teaser.data.output.modelicatemplate",
"teaser.data.output.reports",
"teaser.data.output.modelicatemplate.AixLib",
"teaser.data.output.modelicatemplate.IBPSA",
"teaser.examples",
Expand Down Expand Up @@ -100,5 +101,5 @@
"Topic :: Scientific/Engineering",
"Topic :: Utilities",
],
install_requires=["mako", "pytest", "pandas", "numpy"],
install_requires=["mako", "pytest", "pandas", "numpy", "plotly"],
)
18 changes: 16 additions & 2 deletions teaser/data/output/aixlib_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
import teaser.logic.utilities as utilities


def export_multizone(buildings, prj, path=None):
def export_multizone(
buildings,
prj,
path=None,
use_postprocessing_calc=False,
export_vars=None):
"""Exports models for AixLib library

Exports a building for
Expand Down Expand Up @@ -38,6 +43,13 @@ def export_multizone(buildings, prj, path=None):
path : string
if the Files should not be stored in default output path of TEASER,
an alternative path can be specified as a full path
use_postprocessing_calc : bool
If activated the exported model will use the multizonePostProcessing
to calculate common outputs for simulation time like total heating
demands. Only supported for Aixlib. Default is False.
export_vars : str
Holds the string about which variables to export following the
__Dymola_selection syntax.

Attributes
----------
Expand Down Expand Up @@ -146,7 +158,9 @@ def export_multizone(buildings, prj, path=None):
out_file.write(model_template.render_unicode(
bldg=bldg,
weather=bldg.parent.weather_file_path,
modelica_info=bldg.parent.modelica_info))
modelica_info=bldg.parent.modelica_info,
use_postprocessing_calc=use_postprocessing_calc,
export_vars=export_vars))
out_file.close()

dir_resources = os.path.join(path, "Resources")
Expand Down
33 changes: 33 additions & 0 deletions teaser/data/output/modelicatemplate/AixLib/AixLib_Multizone
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,34 @@ equation
connect(tableTSetCool.y, multizone.TSetCool) annotation (Line(points={{55.2,-58},
{36.8,-58},{36.8,-9}}, color={0,0,127}));

% if use_postprocessing_calc:
connect(multizone.TAir, multizonePostProcessing.TAir) annotation (Line(points={{51,4.95},
{70,4.95},{70,99},{81.8,99}}, color={0,0,127}));

connect(multizone.PCooler, multizonePostProcessing.PCooler) annotation (Line(
points={{51,-7},{70,-7},{70,90.6},{81.8,90.6}},
color={0,0,127}));
connect(multizone.PHeater, multizonePostProcessing.PHeater) annotation (Line(
points={{51,-5},{70,-5},{70,94.8},{81.8,94.8}},
color={0,0,127}));
connect(multizone.Pel, multizonePostProcessing.PelAHU) annotation (Line(
points={{51,1},{70,1},{70,86.6},{81.6,86.6}}, color={0,0,127}));

connect(multizone.PCoolAHU, multizonePostProcessing.PCoolAHU) annotation (
Line(points={{51,-3},{70,-3},{70,79},{81.6,79}}, color={0,0,127}));

connect(multizone.PHeatAHU, multizonePostProcessing.PHeatAHU) annotation (
Line(points={{51,-1},{70,-1},{70,82.8},{81.6,82.8}}, color={0,0,127}));

connect(multizone.X_w, multizonePostProcessing.X_w) annotation (Line(points={{57,2},{
70,2},{70,94.2},{80,94.2}}, color={0,0,127}));

connect(multizone.TRad, multizonePostProcessing.TRad) annotation (Line(points={{51,3},{
70,3},{70,97.6},{80,97.6}}, color={0,0,127}));
connect(multizone.QIntGains_flow, multizonePostProcessing.QIntGains_flow)
annotation (Line(points={{51,-7},{70,-7},{70,80},{80,80}}, color={0,0,127}));
% endif

annotation (experiment(
StartTime=${str(zone.parent.parent.modelica_info.start_time)},
StopTime=${str(zone.parent.parent.modelica_info.stop_time)},
Expand All @@ -147,6 +175,11 @@ equation
__Dymola_Commands(file=
"Resources/Scripts/Dymola/${bldg.name}/${bldg.name}.mos"
"Simulate and Plot"),
% if export_vars:
__Dymola_selections={
Selection(name="BuildingSimulationOutputs",
match={${export_vars}})},
% endif
Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}),
graphics={
Line(points={{80,-82}}, color={28,108,200}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ record ${zone.parent.name}_${zone.name} "${zone.parent.name}_${zone.name}"
HeaterOn = ${get_true_false(zone.use_conditions.with_heating)},
hCool = 0,
lCool = ${zone.model_attr.cool_load},
heaLoadFacOut = ${zone.model_attr.heat_load_outside_factor},
heaLoadFacGrd = ${zone.model_attr.heat_load_ground_factor},
KRCool = 10000,
TNCool = 1,
CoolerOn = ${get_true_false(zone.use_conditions.with_cooling)},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ record ${zone.parent.name}_${zone.name} "${zone.parent.name}_${zone.name}"
TNHeat = 1,
HeaterOn = ${get_true_false(zone.use_conditions.with_heating)},
hCool = 0,
heaLoadFacOut = ${zone.model_attr.heat_load_outside_factor},
heaLoadFacGrd = ${zone.model_attr.heat_load_ground_factor},
lCool = ${zone.model_attr.cool_load},
KRCool = 10000,
TNCool = 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ record ${zone.parent.name}_${zone.name} "${zone.parent.name}_${zone.name}"
HeaterOn = ${get_true_false(zone.use_conditions.with_heating)},
hCool = 0,
lCool = ${zone.model_attr.cool_load},
heaLoadFacOut = ${zone.model_attr.heat_load_outside_factor},
heaLoadFacGrd = ${zone.model_attr.heat_load_ground_factor},
KRCool = 10000,
TNCool = 1,
CoolerOn = ${get_true_false(zone.use_conditions.with_cooling)},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ record ${zone.parent.name}_${zone.name} "${zone.parent.name}_${zone.name}"
HeaterOn = ${get_true_false(zone.use_conditions.with_heating)},
hCool = 0,
lCool = ${zone.model_attr.cool_load},
heaLoadFacOut = ${zone.model_attr.heat_load_outside_factor},
heaLoadFacGrd = ${zone.model_attr.heat_load_ground_factor},
KRCool = 10000,
TNCool = 1,
CoolerOn = ${get_true_false(zone.use_conditions.with_cooling)},
Expand Down
Empty file.
Loading