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

Issue1248 Solve incorrect parameter assignement in Thermal Zone for human internal gains #1249

Merged
merged 4 commits into from
May 2, 2022
Merged

Issue1248 Solve incorrect parameter assignement in Thermal Zone for human internal gains #1249

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
9d44403
Deletes parameter ´ratioConvectiveHeat´, updates ´ThermalZone´
martinkremer Mar 31, 2022
817f3fd
[skip-ci] Add conversion script and increase AixLib-version
martinkremer Apr 1, 2022
dc88725
Delete reference results to trigger update
martinkremer Apr 1, 2022
f548c59
Correct typo in package.mo
martinkremer Apr 1, 2022
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
2 changes: 0 additions & 2 deletions AixLib/BoundaryConditions/InternalGains/Humans/BaseClasses/PartialHuman.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ partial model PartialHuman "Partial model for internal gains of humans"
gainSurfaces(final k=specificPersons*roomArea*surfaceAreaOnePersion));
//Internal Gains People
parameter Real specificPersons(unit="1/(m.m)") = 0.05 "Specific persons per square metre room area" annotation(Dialog(descriptionLabel = true));
parameter Real ratioConvectiveHeat=0.5
"Ratio of convective heat from overall heat output" annotation(Dialog(descriptionLabel = true));
parameter Modelica.SIunits.Area roomArea "Area of room" annotation(Dialog(descriptionLabel = true));
parameter Modelica.SIunits.HeatFlowRate specificHeatPerPerson = 70
"Specific heat output per person";
Expand Down
15 changes: 0 additions & 15 deletions ...eferenceResults/Dymola/AixLib_ThermalZones_ReducedOrder_Examples_MultizoneMoistAirCO2.txt
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...Results/Dymola/AixLib_ThermalZones_ReducedOrder_Examples_MultizoneMoistAirCO2Equipped.txt
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions AixLib/Resources/Scripts/ConvertAixLib_from_1.0.2_to_1.0.3.mos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
clear

convertClear();

// remove modifiers for PartialHuman-Model
convertModifiers("AixLib.BoundaryConditions.InternalGains.Humans.BaseClasses.PartialHuman", {"ratioConvectiveHeat"}, fill("",0));
30 changes: 13 additions & 17 deletions AixLib/ThermalZones/ReducedOrder/ThermalZone/ThermalZone.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ model ThermalZone "Thermal zone containing moisture balance"
extends AixLib.ThermalZones.ReducedOrder.ThermalZone.BaseClasses.PartialThermalZone;

replaceable model corG = SolarGain.CorrectionGDoublePane
constrainedby
AixLib.ThermalZones.ReducedOrder.SolarGain.BaseClasses.PartialCorrectionG
constrainedby AixLib.ThermalZones.ReducedOrder.SolarGain.BaseClasses.PartialCorrectionG
"Model for correction of solar transmission"
annotation(choicesAllMatching=true);
parameter Integer internalGainsMode = 1
Expand Down Expand Up @@ -51,22 +50,22 @@ model ThermalZone "Thermal zone containing moisture balance"
annotation (Dialog(tab="CO2", enable=use_C_flow));

AixLib.BoundaryConditions.InternalGains.Humans.HumanSensibleHeatTemperatureDependent humanSenHeaDependent(
final ratioConvectiveHeat=zoneParam.ratioConvectiveHeatPeople,
final ratioConv=zoneParam.ratioConvectiveHeatPeople,
final roomArea=zoneParam.AZone,
final specificPersons=zoneParam.specificPeople,
final activityDegree=zoneParam.activityDegree,
final specificHeatPerPerson=zoneParam.fixedHeatFlowRatePersons) if ATot > 0 and internalGainsMode == 1 annotation (Placement(transformation(extent={{56,-34},
{76,-14}})));

AixLib.BoundaryConditions.InternalGains.Humans.HumanSensibleHeatTemperatureIndependent humanSenHeaIndependent(
final ratioConvectiveHeat=zoneParam.ratioConvectiveHeatPeople,
final ratioConv=zoneParam.ratioConvectiveHeatPeople,
final roomArea=zoneParam.AZone,
final specificPersons=zoneParam.specificPeople,
final specificHeatPerPerson=zoneParam.fixedHeatFlowRatePersons) if ATot > 0 and internalGainsMode == 2 annotation (Placement(transformation(extent={{56,-34},
{76,-14}})));

AixLib.BoundaryConditions.InternalGains.Humans.HumanTotalHeatTemperatureDependent humanTotHeaDependent(
final ratioConvectiveHeat=zoneParam.ratioConvectiveHeatPeople,
final ratioConv=zoneParam.ratioConvectiveHeatPeople,
final roomArea=zoneParam.AZone,
final specificPersons=zoneParam.specificPeople,
final activityDegree=zoneParam.activityDegree,
Expand Down Expand Up @@ -423,32 +422,29 @@ equation
connect(intGains[2], machinesSenHea.uRel) annotation (Line(points={{80,-100},{
80,-94},{78,-94},{78,-88},{48,-88},{48,-46.5},{56,-46.5}}, color={0,0,
127}));
connect(intGains[3], lights.uRel) annotation (Line(points={{80,-86.6667},{80,
-86},{50,-86},{50,-68.5},{56,-68.5}},
connect(intGains[3], lights.uRel) annotation (Line(points={{80,-86.6667},{80,-86},{50,-86},{50,-68.5},{56,-68.5}},
color={0,0,127}));
connect(lights.convHeat, ROM.intGainsConv) annotation (Line(points={{75,-62.8},
{92,-62.8},{92,78},{86,78}}, color={191,0,0}));
connect(machinesSenHea.convHeat, ROM.intGainsConv) annotation (Line(points={{75,
-40.8},{92,-40.8},{92,78},{86,78}}, color={191,0,0}));
connect(intGains[1], humanSenHeaDependent.uRel) annotation (Line(points={{80,
-113.333},{80,-92},{46,-92},{46,-24},{56,-24}},
connect(intGains[1], humanSenHeaDependent.uRel) annotation (Line(points={{80,-113.333},{80,-92},{46,-92},{46,-24},{56,-24}},
color={0,0,127}));
connect(humanSenHeaDependent.convHeat, ROM.intGainsConv) annotation (Line(
points={{75,-18},{92,-18},{92,78},{86,78}}, color={191,0,0}));
connect(ROM.intGainsConv, humanSenHeaDependent.TRoom) annotation (Line(points=
{{86,78},{92,78},{92,-10},{57,-10},{57,-15}}, color={191,0,0}));
connect(humanSenHeaDependent.radHeat, ROM.intGainsRad) annotation (Line(
points={{75,-30},{94,-30},{94,82},{86,82}}, color={95,95,95}));
connect(intGains[1], humanSenHeaIndependent.uRel) annotation (Line(points={{80,
-113.333},{80,-92},{46,-92},{46,-24},{56,-24}}, color={0,0,127}));
connect(intGains[1], humanSenHeaIndependent.uRel) annotation (Line(points={{80,-113.333},{80,-92},{46,-92},{46,-24},{56,-24}},
color={0,0,127}));
connect(humanSenHeaIndependent.convHeat, ROM.intGainsConv) annotation (Line(
points={{75,-18},{92,-18},{92,78},{86,78}}, color={191,0,0}));
connect(ROM.intGainsConv, humanSenHeaIndependent.TRoom) annotation (Line(
points={{86,78},{92,78},{92,-10},{57,-10},{57,-15}}, color={191,0,0}));
connect(humanSenHeaIndependent.radHeat, ROM.intGainsRad) annotation (Line(
points={{75,-30},{94,-30},{94,82},{86,82}}, color={95,95,95}));
connect(intGains[1], humanTotHeaDependent.uRel) annotation (Line(points={{80,
-113.333},{80,-92},{46,-92},{46,-24},{56,-24}},
connect(intGains[1], humanTotHeaDependent.uRel) annotation (Line(points={{80,-113.333},{80,-92},{46,-92},{46,-24},{56,-24}},
color={0,0,127}));
connect(humanTotHeaDependent.convHeat, ROM.intGainsConv) annotation (Line(
points={{75,-18},{92,-18},{92,78},{86,78}}, color={191,0,0}));
Expand Down Expand Up @@ -613,8 +609,8 @@ equation
points={{-49,-24},{-41.2,-24},{-41.2,-24.4}},
color={0,0,127},
smooth=Smooth.None));
connect(intGains[1], ventCont.relOccupation) annotation (Line(points={{80,
-113.333},{80,-92},{46,-92},{46,-36},{-68,-36},{-68,-30}}, color=
connect(intGains[1], ventCont.relOccupation) annotation (Line(points={{80,-113.333},{80,-92},{46,-92},{46,-36},{-68,-36},{-68,-30}},
color=
{0,0,127}));
connect(ventRate, addInfVen.u2) annotation (Line(points={{-108,-64},{-76,-64},
{-76,-34},{-44,-34},{-44,-31.6},{-41.2,-31.6}},
Expand Down Expand Up @@ -680,8 +676,8 @@ equation
connect(addInfVen.y, cO2Balance.airExc) annotation (Line(points={{-27.4,-28},{
-24,-28},{-24,-40},{12,-40},{12,-64.9},{20,-64.9}},
color={0,0,127}));
connect(cO2Balance.uRel, intGains[1]) annotation (Line(points={{20,-61.4},{20,
-50},{46,-50},{46,-113.333},{80,-113.333}}, color={0,0,127}));
connect(cO2Balance.uRel, intGains[1]) annotation (Line(points={{20,-61.4},{20,-50},{46,-50},{46,-113.333},{80,-113.333}},
color={0,0,127}));
connect(cO2Balance.TAir, TAir) annotation (Line(points={{27,-60},{26,-60},{26,
0},{96,0},{96,80},{110,80}},
color={0,0,127}));
Expand Down
6 changes: 4 additions & 2 deletions AixLib/package.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package AixLib
NcDataReader2(version="2.5.0"),
SDF(version="0.4.1"),
Modelica_DeviceDrivers(version="1.7.0")),
version = "1.0.2",
version = "1.0.3",
conversion(from(
version="0.3.2",
script="modelica://AixLib/Resources/Scripts/ConvertAixLib_from_0.3.2_to_0.4.mos",
Expand Down Expand Up @@ -78,7 +78,9 @@ package AixLib
version="0.12.0",
script="modelica://AixLib/Resources/Scripts/ConvertAixLib_from_0.12.0_to_0.12.1.mos",
version="1.0.1",
script="modelica://AixLib/Resources/Scripts/ConvertAixLib_from_1.0.1_to_1.0.2.mos")),
script="modelica://AixLib/Resources/Scripts/ConvertAixLib_from_1.0.1_to_1.0.2.mos",
version="1.0.2",
script="modelica://AixLib/Resources/Scripts/ConvertAixLib_from_1.0.2_to_1.0.3.mos")),

Documentation(info = "<html><p>
The free open-source <code>AixLib</code> library is being developed
Expand Down