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

Jump to bottom

Issue1350 hom om compatible #1356

Merged
merged 4 commits into from
Oct 13, 2022
Merged

Issue1350 hom om compatible #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e1101d
Add each so that model checks in OM #1350 [skip ci]
LauraMaier Oct 12, 2022
3465ac2
Add parameter for surface type to make compatible with OM #1350
LauraMaier Oct 12, 2022
c0c1073
Set default value for wall base data record for layer number #1350
LauraMaier Oct 12, 2022
41d42f6
Specify medium model so that HOM can check in OM #1350
LauraMaier Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion AixLib/DataBase/Walls/WallBaseDataDefinition.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ within AixLib.DataBase.Walls;
record WallBaseDataDefinition "Wall base data definition"
extends Modelica.Icons.Record;

parameter Integer n(min = 1)
parameter Integer n(min = 1)=1
"Number of wall layers"
annotation(Dialog(tab = "Wall", group = "Wall parameters"));
parameter Modelica.Units.SI.Length d[n] "Thickness of wall layers"
Expand Down
2 changes: 1 addition & 1 deletion AixLib/ThermalZones/HighOrder/Components/Walls/Wall.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ model Wall
tab="Surface Parameters",
group="Outside surface",
enable=calcMethodOut == 3 and outside));
DataBase.Surfaces.RoughnessForHT.PolynomialCoefficients_ASHRAEHandbook surfaceType = DataBase.Surfaces.RoughnessForHT.Brick_RoughPlaster()
parameter DataBase.Surfaces.RoughnessForHT.PolynomialCoefficients_ASHRAEHandbook surfaceType = DataBase.Surfaces.RoughnessForHT.Brick_RoughPlaster()
"Surface type of outside wall" annotation(Dialog(tab = "Surface Parameters", group = "Outside surface", enable=
calcMethodOut == 2 and outside), choicesAllMatching = true);
parameter Integer ISOrientation = 1 "Inside surface orientation" annotation(Dialog(tab = "Surface Parameters", group = "Inside surface", compact = true, descriptionLabel = true), choices(choice = 1
Expand Down
2 changes: 1 addition & 1 deletion ...malZones/HighOrder/Components/WindowsDoors/BaseClasses/CorrectionSolarGain/PartialCorG.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ partial model PartialCorG
extent={{18,-19},{-18,19}},
rotation=180,
origin={-98,-1})));
Modelica.Blocks.Interfaces.RealOutput solarRadWinTrans[n](unit="W/m2")
Modelica.Blocks.Interfaces.RealOutput solarRadWinTrans[n](each unit="W/m2")
"transmitted solar radiation through window"
annotation (Placement(transformation(extent={{80,-10},{100,10}}),
iconTransformation(extent={{80,-10},{100,10}})));
Expand Down
8 changes: 4 additions & 4 deletions AixLib/ThermalZones/HighOrder/Examples/OFD_1Jan.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ model OFD_1Jan "OFD with TMC, TIR and TRY"
Modelica.Blocks.Sources.CombiTimeTable NaturalVentilation(
columns={2,3,4,5,7}, extrapolation = Modelica.Blocks.Types.Extrapolation.Periodic, tableOnFile = false, table = VentilationProfile.Profile) annotation(Placement(transformation(extent={{-53,59},{-73,79}})));
Modelica.Blocks.Sources.CombiTimeTable TSet(columns = {2, 3, 4, 5, 6, 7}, extrapolation = Modelica.Blocks.Types.Extrapolation.Periodic, tableOnFile = false, table = TSetProfile.Profile) annotation(Placement(transformation(extent={{-94,-2},{-114,18}})));
Modelica.Blocks.Interfaces.RealOutput TAirRooms[10](unit = "degC") annotation(Placement(transformation(extent={{122,-57},{142,-37}}), iconTransformation(extent={{101,-7},{117,9}})));
Modelica.Blocks.Interfaces.RealOutput Toutside(unit = "degC") annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin={106,-77}), iconTransformation(extent={{100,83},{116,99}})));
Modelica.Blocks.Interfaces.RealOutput SolarRadiation[6](unit = "W/m2") annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin={127,-77}), iconTransformation(extent={{100,63},{116,79}})));
Modelica.Blocks.Interfaces.RealOutput TAirRooms[10](each unit = "degC") annotation(Placement(transformation(extent={{122,-57},{142,-37}}), iconTransformation(extent={{101,-7},{117,9}})));
Modelica.Blocks.Interfaces.RealOutput Toutside(each unit = "degC") annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin={106,-77}), iconTransformation(extent={{100,83},{116,99}})));
Modelica.Blocks.Interfaces.RealOutput SolarRadiation[6](each unit = "W/m2") annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin={127,-77}), iconTransformation(extent={{100,63},{116,79}})));
Modelica.Blocks.Interfaces.RealOutput VentilationSchedule[4] annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin={64,-77}), iconTransformation(extent={{101,-79},{117,-63}})));
Modelica.Blocks.Interfaces.RealOutput TsetValvesSchedule[5](unit = "degC") annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin={85,-77}), iconTransformation(extent={{101,-99},{117,-83}})));
Modelica.Blocks.Interfaces.RealOutput TsetValvesSchedule[5](each unit = "degC") annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin={85,-77}), iconTransformation(extent={{101,-99},{117,-83}})));
AixLib.BoundaryConditions.WeatherData.Old.WeatherTRY.Weather Weather(
Latitude=49.5,
Longitude=8.5,
Expand Down
8 changes: 5 additions & 3 deletions ...s/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/GroundFloorBuildingEnvelope.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.ThermalZones.HighOrder.House.OFD_MiddleInnerLoadWall.BuildingEnvelope;
within AixLib.ThermalZones.HighOrder.House.OFD_MiddleInnerLoadWall.BuildingEnvelope;
model GroundFloorBuildingEnvelope

extends AixLib.ThermalZones.HighOrder.Rooms.BaseClasses.PartialRoomParams(
Expand All @@ -8,8 +8,10 @@ model GroundFloorBuildingEnvelope
"Type of energy balance: dynamic (3 initialization options) or steady state"
annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));

replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
"Medium model";
replaceable package Medium = AixLib.Media.Air constrainedby Modelica.Media.Interfaces.PartialMedium "Medium in the component"
annotation (choices(
choice(redeclare package MediumR = AixLib.Media.Air "Moist air"),
choice(redeclare package MediumR = AixLib.Media.Air (extraPropertiesNames={"CO2"}, C_nominal = {6.12E-4}) "Moist air with tracer gas (404 ppm CO2)")));

//////////room geometry
parameter Modelica.Units.SI.Length room_width=3.92 "width"
Expand Down
6 changes: 4 additions & 2 deletions ...es/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/UpperFloorBuildingEnvelope.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ model UpperFloorBuildingEnvelope
"Type of energy balance: dynamic (3 initialization options) or steady state"
annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));

replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
"Medium model";
replaceable package Medium = AixLib.Media.Air constrainedby Modelica.Media.Interfaces.PartialMedium "Medium in the component"
annotation (choices(
choice(redeclare package MediumR = AixLib.Media.Air "Moist air"),
choice(redeclare package MediumR = AixLib.Media.Air (extraPropertiesNames={"CO2"}, C_nominal = {6.12E-4}) "Moist air with tracer gas (404 ppm CO2)")));

//////////room geometry
parameter Modelica.Units.SI.Length room_width_long=3.92 "w1 "
Expand Down
6 changes: 4 additions & 2 deletions ...es/HighOrder/House/OFD_MiddleInnerLoadWall/BuildingEnvelope/WholeHouseBuildingEnvelope.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ model WholeHouseBuildingEnvelope
parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
"Type of energy balance: dynamic (3 initialization options) or steady state"
annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Equations"));
replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
"Medium model";
replaceable package Medium = AixLib.Media.Air constrainedby Modelica.Media.Interfaces.PartialMedium "Medium in the component"
annotation (choices(
choice(redeclare package MediumR = AixLib.Media.Air "Moist air"),
choice(redeclare package MediumR = AixLib.Media.Air (extraPropertiesNames={"CO2"}, C_nominal = {6.12E-4}) "Moist air with tracer gas (404 ppm CO2)")));
parameter Real AirExchangeCorridor=2 "Air exchange corridors in 1/h "
annotation (Dialog(group="Air Exchange Corridors", descriptionLabel=true));

Expand Down