diff --git a/docs/jupyter_notebooks/e3_export_ibpsa_models.ipynb b/docs/jupyter_notebooks/e3_export_ibpsa_models.ipynb index bb74b0068..833a70d62 100644 --- a/docs/jupyter_notebooks/e3_export_ibpsa_models.ipynb +++ b/docs/jupyter_notebooks/e3_export_ibpsa_models.ipynb @@ -3,7 +3,7 @@ { "cell_type": "markdown", "metadata": {}, - "source": "# Example 3: Export Modelica models for IBPSA library using TEASER API\nThis module contains an example how to export buildings from a TEASER\nproject to ready-to-run simulation models for Modelica library IBPSA. These\nmodels simulate in Dymola, OpenModelica and JModelica.\nYou can run this example using the [jupyter-notebook](https://mybinder.org/v2/gh/RWTH-EBC/TEASER/main?labpath=docs%2Fjupyter_notebooks)\n" + "source": "# Example 3: Export Modelica models for IBPSA library using TEASER API\nThis module contains an example how to export buildings from a TEASER\nproject to ready-to-run simulation models for Modelica library IBPSA. These\nmodels should simulate in Dymola, OpenModelica and JModelica.\nYou can run this example using the [jupyter-notebook](https://mybinder.org/v2/gh/RWTH-EBC/TEASER/main?labpath=docs%2Fjupyter_notebooks)\n" }, { "cell_type": "code", diff --git a/docs/source/examples/e3_export_ibpsa_models.md b/docs/source/examples/e3_export_ibpsa_models.md index 8caf1b035..81d9d0485 100644 --- a/docs/source/examples/e3_export_ibpsa_models.md +++ b/docs/source/examples/e3_export_ibpsa_models.md @@ -2,7 +2,7 @@ # Example 3: Export Modelica models for IBPSA library using TEASER API This module contains an example how to export buildings from a TEASER project to ready-to-run simulation models for Modelica library IBPSA. These -models simulate in Dymola, OpenModelica and JModelica. +models should simulate in Dymola, OpenModelica and JModelica. You can run this example using the [jupyter-notebook](https://mybinder.org/v2/gh/RWTH-EBC/TEASER/main?labpath=docs%2Fjupyter_notebooks) ```python diff --git a/teaser/data/output/modelicatemplate/IBPSA/IBPSA_FourElements b/teaser/data/output/modelicatemplate/IBPSA/IBPSA_FourElements index f9b6eef82..38975e74a 100644 --- a/teaser/data/output/modelicatemplate/IBPSA/IBPSA_FourElements +++ b/teaser/data/output/modelicatemplate/IBPSA/IBPSA_FourElements @@ -13,12 +13,10 @@ model ${zone.parent.name}_${zone.name} ${library}.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[${min_orientations(zone.model_attr.n_outer)}]( each outSkyCon=true, each outGroCon=true, til=${get_list(deg_to_rad(zone.model_attr.tilt_facade))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi = ${get_list(azmiut_conv(zone.model_attr.orientation_facade))}) "Calculates diffuse solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,20},{-48,40}}))); ${library}.BoundaryConditions.SolarIrradiation.DirectTiltedSurface HDirTil[${min_orientations(zone.model_attr.n_outer)}]( til=${get_list(deg_to_rad(zone.model_attr.tilt_facade))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi=${get_list(azmiut_conv(zone.model_attr.orientation_facade))}) "Calculates direct solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,52},{-48,72}}))); @@ -200,12 +198,10 @@ model ${zone.parent.name}_${zone.name} "Sums up solar radiation of both directions" annotation (Placement(transformation(extent={{4,76},{14,86}}))); ${library}.BoundaryConditions.SolarIrradiation.DirectTiltedSurface HDirTilRoof[${min_orientations(zone.model_attr.n_rt)}]( til=${get_list(deg_to_rad(zone.model_attr.tilt_rt))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi=${get_list(azmiut_conv(zone.model_attr.orientation_rt))}) "Calculates direct solar radiation on titled surface for both directions" annotation (Placement(transformation(extent={{-68,74},{-48,94}}))); ${library}.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTilRoof[${min_orientations(zone.model_attr.n_rt)}]( til=${get_list(deg_to_rad(zone.model_attr.tilt_rt))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi=${get_list(azmiut_conv(zone.model_attr.orientation_rt))}) "Calculates diffuse solar radiation on titled surface for both directions" annotation (Placement(transformation(extent={{-68,48},{-48,68}}))); diff --git a/teaser/data/output/modelicatemplate/IBPSA/IBPSA_OneElement b/teaser/data/output/modelicatemplate/IBPSA/IBPSA_OneElement index 38134403e..f7750f396 100644 --- a/teaser/data/output/modelicatemplate/IBPSA/IBPSA_OneElement +++ b/teaser/data/output/modelicatemplate/IBPSA/IBPSA_OneElement @@ -13,12 +13,10 @@ model ${zone.parent.name}_${zone.name} ${library}.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[${min_orientations(zone.model_attr.n_outer)}]( each outSkyCon=true, each outGroCon=true, til=${get_list(deg_to_rad(zone.model_attr.tilt_facade))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi = ${get_list(azmiut_conv(zone.model_attr.orientation_facade))}) "Calculates diffuse solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,20},{-48,40}}))); ${library}.BoundaryConditions.SolarIrradiation.DirectTiltedSurface HDirTil[${min_orientations(zone.model_attr.n_outer)}]( til=${get_list(deg_to_rad(zone.model_attr.tilt_facade))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi=${get_list(azmiut_conv(zone.model_attr.orientation_facade))}) "Calculates direct solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,52},{-48,72}}))); diff --git a/teaser/data/output/modelicatemplate/IBPSA/IBPSA_ThreeElements b/teaser/data/output/modelicatemplate/IBPSA/IBPSA_ThreeElements index 9e1f53072..a050bfbd9 100644 --- a/teaser/data/output/modelicatemplate/IBPSA/IBPSA_ThreeElements +++ b/teaser/data/output/modelicatemplate/IBPSA/IBPSA_ThreeElements @@ -13,12 +13,10 @@ model ${zone.parent.name}_${zone.name} ${library}.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[${min_orientations(zone.model_attr.n_outer)}]( each outSkyCon=true, each outGroCon=true, til=${get_list(deg_to_rad(zone.model_attr.tilt_facade))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi = ${get_list(azmiut_conv(zone.model_attr.orientation_facade))}) "Calculates diffuse solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,20},{-48,40}}))); ${library}.BoundaryConditions.SolarIrradiation.DirectTiltedSurface HDirTil[${min_orientations(zone.model_attr.n_outer)}]( til=${get_list(deg_to_rad(zone.model_attr.tilt_facade))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi=${get_list(azmiut_conv(zone.model_attr.orientation_facade))}) "Calculates direct solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,52},{-48,72}}))); diff --git a/teaser/data/output/modelicatemplate/IBPSA/IBPSA_TwoElements b/teaser/data/output/modelicatemplate/IBPSA/IBPSA_TwoElements index d0767d082..18db774b2 100644 --- a/teaser/data/output/modelicatemplate/IBPSA/IBPSA_TwoElements +++ b/teaser/data/output/modelicatemplate/IBPSA/IBPSA_TwoElements @@ -13,12 +13,10 @@ model ${zone.parent.name}_${zone.name} ${library}.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[${min_orientations(zone.model_attr.n_outer)}]( each outSkyCon=true, each outGroCon=true, til=${get_list(deg_to_rad(zone.model_attr.tilt_facade))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi = ${get_list(azmiut_conv(zone.model_attr.orientation_facade))}) "Calculates diffuse solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,20},{-48,40}}))); ${library}.BoundaryConditions.SolarIrradiation.DirectTiltedSurface HDirTil[${min_orientations(zone.model_attr.n_outer)}]( til=${get_list(deg_to_rad(zone.model_attr.tilt_facade))}, - each lat = ${deg_to_rad(zone.parent.latitude)}, azi=${get_list(azmiut_conv(zone.model_attr.orientation_facade))}) "Calculates direct solar radiation on titled surface for all directions" annotation (Placement(transformation(extent={{-68,52},{-48,72}}))); diff --git a/teaser/examples/e3_export_ibpsa_models.py b/teaser/examples/e3_export_ibpsa_models.py index 3c3592f41..180e20666 100644 --- a/teaser/examples/e3_export_ibpsa_models.py +++ b/teaser/examples/e3_export_ibpsa_models.py @@ -1,7 +1,7 @@ # # Example 3: Export Modelica models for IBPSA library using TEASER API # This module contains an example how to export buildings from a TEASER # project to ready-to-run simulation models for Modelica library IBPSA. These -# models simulate in Dymola, OpenModelica and JModelica. +# models should simulate in Dymola, OpenModelica and JModelica. # You can run this example using the [jupyter-notebook](https://mybinder.org/v2/gh/RWTH-EBC/TEASER/main?labpath=docs%2Fjupyter_notebooks) import teaser.examples.e1_generate_archetype as e1 diff --git a/teaser/logic/buildingobjects/calculation/ibpsa.py b/teaser/logic/buildingobjects/calculation/ibpsa.py index f19c7bc5c..bb8d71cb2 100644 --- a/teaser/logic/buildingobjects/calculation/ibpsa.py +++ b/teaser/logic/buildingobjects/calculation/ibpsa.py @@ -36,10 +36,10 @@ def __init__(self, parent): self.parent = parent self.file_internal_gains = "InternalGains_" + self.parent.name + ".mat" self.version = { - "AixLib": "1.0.0", - "Buildings": "7.0.0", + "AixLib": "2.1.0", + "Buildings": "11.0.0", "BuildingSystems": "2.0.0-beta2", - "IDEAS": "2.1.0", + "IDEAS": "3.0.0", } self.consider_heat_capacity = True