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

77 pressure losses and distribution #102

Open
wants to merge 66 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
988454b
Adapt HR control with option to only operate above bivalence temperature
FWuellhorst Aug 6, 2024
884868d
add icon with name
FWuellhorst Aug 7, 2024
257ca43
move movers and boundaries to distribution
FWuellhorst Aug 7, 2024
d7bfa43
Add preconfigured control mover package
FWuellhorst Aug 8, 2024
2b506b8
Continue work and fix regression test. add typical mover options
FWuellhorst Aug 8, 2024
cec7bd4
fix protected variable names
FWuellhorst Aug 8, 2024
3189443
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Aug 8, 2024
ea6595c
Merge branch 'main' into 77_pressureLossesAndDistribution
FWuellhorst Nov 29, 2024
ed66bd4
Work on pressure boundaries and add typical pressure drops, except fo…
FWuellhorst Nov 30, 2024
483914d
continue work on pressure losses
FWuellhorst Dec 7, 2024
77e1a77
Merge branch 'main' into 77_pressureLossesAndDistribution
FWuellhorst Dec 12, 2024
c6de055
Merge branch 'main' into 77_pressureLossesAndDistribution
FWuellhorst Dec 17, 2024
ca1fc4a
merge fix and add valid tests with regressions for Transfer systems T…
FWuellhorst Dec 17, 2024
099b9dc
Merge branch '77_pressureLossesAndDistribution' of https://github.com…
FWuellhorst Dec 17, 2024
cd14e35
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Dec 17, 2024
41b464e
new tests for generation and transfer
FWuellhorst Dec 19, 2024
3784da4
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Dec 19, 2024
2b4ed7f
further work on distribution pressure losses and bottom-up top-down p…
FWuellhorst Dec 20, 2024
5db5e3c
finalize distribution modules
FWuellhorst Dec 21, 2024
dd8587b
Merge branch '77_pressureLossesAndDistribution' of https://github.com…
FWuellhorst Dec 21, 2024
687dce0
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Dec 21, 2024
1d8dc93
further fixes
FWuellhorst Dec 23, 2024
21062b6
fix multiple errors except for ventilation system
FWuellhorst Dec 30, 2024
4452393
fix ventilation errors
FWuellhorst Dec 30, 2024
ebb5e07
Merge branch '77_pressureLossesAndDistribution' of https://github.com…
FWuellhorst Dec 30, 2024
19d7fe2
fix missing defaults
FWuellhorst Dec 31, 2024
6102b1a
add solar thermal pump control option, fix retrofit
FWuellhorst Dec 31, 2024
e34e8b8
disable ventilation system
FWuellhorst Dec 31, 2024
1e21e6d
rm ref results as they are generated with input filter
FWuellhorst Dec 31, 2024
d43bf40
update statistics to see reference errors
FWuellhorst Dec 31, 2024
98c95d8
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Dec 31, 2024
3dd484d
update reference results teaser gas, as only pump electricity demand …
FWuellhorst Jan 2, 2025
4908f0b
gas boiler mass flow rate was not proper in current main, updating bo…
FWuellhorst Jan 2, 2025
ea1f58d
bausim case changed only in state events with DHW loading, but no dir…
FWuellhorst Jan 2, 2025
4b74b04
minor change in noDHW power consumption due to pressure losses
FWuellhorst Jan 2, 2025
2f2cb9d
pressure loss was wrong in main, leading to slightly different mass f…
FWuellhorst Jan 2, 2025
996f212
same, simple storage had wrong m_flow.
FWuellhorst Jan 2, 2025
859ab8e
hydraulic connection was corrected, new events
FWuellhorst Jan 2, 2025
0da7a0a
same reason as with Bausim case1
FWuellhorst Jan 2, 2025
94e7134
new pump control in aixlib case and correct mass flow rate in buildin…
FWuellhorst Jan 2, 2025
f519b3b
simple storage m_flow as before
FWuellhorst Jan 2, 2025
47379e8
fix simple storage issue and adjust pressure values in transfer syste…
FWuellhorst Jan 2, 2025
0028de9
Merge branch '77_pressureLossesAndDistribution' of https://github.com…
FWuellhorst Jan 2, 2025
c4634c6
update reference results and save remaining files
FWuellhorst Jan 2, 2025
5c967e4
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jan 2, 2025
b5fb788
update reference results again due to error in the transfer system pr…
FWuellhorst Jan 3, 2025
33cd96a
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jan 3, 2025
b38efb1
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jan 3, 2025
b8ff110
add conversion script and revert unwanted changes
FWuellhorst Jan 3, 2025
746d4bf
fix initialization issues by providing better start values
FWuellhorst Jan 3, 2025
af9d466
update reference results (same reasons as in previous ref updates)
FWuellhorst Jan 3, 2025
71b5ebc
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jan 3, 2025
be8c6d9
fix initial conditions and bad re-declaration
FWuellhorst Jan 3, 2025
02263b2
Merge branch '77_pressureLossesAndDistribution' of https://github.com…
FWuellhorst Jan 3, 2025
7794478
new ref due to changed initials with new movers
FWuellhorst Jan 3, 2025
4507728
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jan 3, 2025
d4dd7c8
fix conversion script, remove need for DHW pump parameters and fix pa…
FWuellhorst Jan 3, 2025
b1337bb
Merge branch '77_pressureLossesAndDistribution' of https://github.com…
FWuellhorst Jan 3, 2025
611e088
Rework DHW design based on EN 15450 to incorporate all cases: 60 °C, …
FWuellhorst Jan 7, 2025
0760182
Adjust DHWCalc regression based on new scaling and fix missing default
FWuellhorst Jan 8, 2025
54e0ae9
add case for AFloor=0
FWuellhorst Jan 9, 2025
015fb88
enable case of no-dhw in SimpleTwoStorageParallel.mo and update example
FWuellhorst Jan 10, 2025
07450bb
tCrit is also relevant for heat losses
FWuellhorst Jan 13, 2025
c5ca0ef
fix unit in full-storage design
FWuellhorst Jan 13, 2025
44a634a
Add warnings for unreasonable storage HC
FWuellhorst Jan 14, 2025
b1935d1
fix wrong solar gain in eneBal (#104)
HvanderStok Jan 17, 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
8 changes: 1 addition & 7 deletions BESMod/Examples/BAUSimStudy/PartialCase.mo
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ partial model PartialCase
(y_nominal=0.8, redeclare
AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane
datTab),
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=TBiv,
redeclare
Expand Down Expand Up @@ -67,15 +66,10 @@ partial model PartialCase
transfer(
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.RadiatorTransferData
parRad,
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum)),
parRad)),
redeclare Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
calcmFlow),
redeclare Systems.UserProfiles.TEASERProfiles userProfiles,
Expand Down
19 changes: 8 additions & 11 deletions BESMod/Examples/DesignOptimization/BES.mo
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ model BES
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater
generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare package MediumEva = AixLib.Media.Air,
redeclare model RefrigerantCycleHeatPumpHeating =
AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D
(y_nominal=0.8, redeclare
AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane
datTab),
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,

TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
Expand Down Expand Up @@ -62,7 +62,7 @@ model BES
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI
parPIDHeaPum),
redeclare Systems.Hydraulical.Distribution.DistributionTwoStorageParallel
redeclare Systems.Hydraulical.Distribution.SimpleTwoStorageParallel
distribution(
redeclare
BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage
Expand All @@ -78,15 +78,10 @@ model BES
redeclare Systems.Hydraulical.Transfer.IdealValveRadiator transfer(
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.RadiatorTransferData
parRad,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra)),
parRad)),
redeclare Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
calcmFlow),
redeclare Systems.UserProfiles.TEASERProfiles userProfiles,
Expand All @@ -99,9 +94,11 @@ model BES

extends Modelica.Icons.Example;

annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
annotation (experiment(
StopTime=31536000,
Interval=599.999616,
Tolerance=1e-06,
__Dymola_Algorithm="Dassl"),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/DesignOptimization/BES.mos"
"Simulate and plot"));
end BES;
91 changes: 7 additions & 84 deletions BESMod/Examples/DesignOptimization/BESNoDHW.mo
Original file line number Diff line number Diff line change
@@ -1,94 +1,17 @@
within BESMod.Examples.DesignOptimization;
model BESNoDHW "Example to demonstrate usage without DHW"
extends Systems.BaseClasses.PartialBuildingEnergySystem(
redeclare BESMod.Systems.Electrical.DirectGridConnectionSystem electrical,
redeclare Systems.Demand.Building.TEASERThermalZone building(
ABui=sum(building.zoneParam.VAir)^(2/3),
hBui=sum(building.zoneParam.VAir)^(1/3),
ARoo=sum(building.zoneParam.ARoof),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
oneZoneParam,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater
generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare package MediumEva = AixLib.Media.Air,
redeclare model RefrigerantCycleHeatPumpHeating =
AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D
(y_nominal=0.8, redeclare
AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane
datTab),
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
parHeaPum,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater
parEleHea,
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen),
redeclare Systems.Hydraulical.Control.MonoenergeticHeatPumpSystem control(
redeclare
BESMod.Systems.Hydraulical.Control.Components.ThermostaticValveController.ThermostaticValvePIControlled
valCtrl,
redeclare model DHWHysteresis =
BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.PartParallelBivalent
(
TCutOff=parameterStudy.TCutOff,
TBiv=parameterStudy.TBiv,
TOda_nominal=systemParameters.TOda_nominal,
TRoom=systemParameters.TSetZone_nominal[1],
QDem_flow_nominal=systemParameters.QBui_flow_nominal[1],
QHP_flow_cutOff=parameterStudy.QHP_flow_cutOff),
redeclare model BuildingHysteresis =
BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.PartParallelBivalent
(
TCutOff=parameterStudy.TCutOff,
TBiv=parameterStudy.TBiv,
TOda_nominal=systemParameters.TOda_nominal,
TRoom=systemParameters.TSetZone_nominal[1],
QDem_flow_nominal=systemParameters.QBui_flow_nominal[1],
QHP_flow_cutOff=parameterStudy.QHP_flow_cutOff),
useSGReady=true,
useExtSGSig=false,
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI
parPIDHeaPum),
redeclare BESMod.Systems.Hydraulical.Distribution.BuildingOnly
distribution(nParallelDem=1),
redeclare Systems.Hydraulical.Transfer.IdealValveRadiator transfer(
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.RadiatorTransferData
parRad,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra)),
redeclare Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
calcmFlow),
redeclare Systems.UserProfiles.TEASERProfiles userProfiles,
redeclare AachenSystem systemParameters(use_ventilation=false, use_dhw=
false),
redeclare ParametersToChange parameterStudy(VPerQFlow=1),
redeclare final package MediumDHW = AixLib.Media.Water,
redeclare final package MediumZone = AixLib.Media.Air,
redeclare final package MediumHyd = AixLib.Media.Water,
redeclare BESMod.Systems.Ventilation.NoVentilation ventilation);
extends BES(systemParameters(use_dhw=false), DHW(redeclare
BESMod.Systems.Demand.DHW.RecordsCollection.NoDHW DHWProfile));

extends Modelica.Icons.Example;

annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/DesignOptimization/BESNoDHW.mos"
"Simulate and plot"));
"Simulate and plot"),
Documentation(info="<html>
<p>In this case, DHW is disabled which is currently only supported for the distribution systems X and Y. However, you can create your own distribution modules if this is a relevant use case for you. </p>
<p>As Modelica does not allow conditional variables outside of connect and the DHW parameters are used as bottom-up and top-down, this workaround is needed.</p>
</html>"));
end BESNoDHW;
19 changes: 6 additions & 13 deletions BESMod/Examples/GasBoilerBuildingOnly.mo
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ model GasBoilerBuildingOnly
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Hydraulical.Generation.GasBoiler generation(
dTTra_nominal={10},
redeclare
dTTra_nominal={10}, redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum),
parTemSen),
redeclare BESMod.Systems.Hydraulical.Control.GasBoiler control(
redeclare
BESMod.Systems.Hydraulical.Control.Components.ThermostaticValveController.ThermostaticValvePIControlled
Expand All @@ -28,20 +26,15 @@ model GasBoilerBuildingOnly
redeclare
BESMod.Systems.Hydraulical.Control.Components.RelativeSpeedController.PID
PIDCtrl),
redeclare BESMod.Systems.Hydraulical.Distribution.BuildingOnly distribution(
nParallelDem=1),
redeclare BESMod.Systems.Hydraulical.Distribution.BuildingOnly
distribution(redeclare
BESMod.Systems.RecordsCollection.Movers.DPVar parPum),
redeclare BESMod.Systems.Hydraulical.Transfer.RadiatorPressureBased
transfer(
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare
transfer(redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.RadiatorTransferData
parRad)),
redeclare BESMod.Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.PassThrough calcmFlow),
redeclare BESMod.Systems.UserProfiles.TEASERProfiles userProfiles,
Expand Down
6 changes: 2 additions & 4 deletions BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithDHW.mo
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
within BESMod.Examples.HeatPumpAndBoiler;
model AfterBufferWithDHW
"Bivalent Heat Pump System with boiler integration after buffer tank without DHW support"
extends BaseClasses.PartialHybridSystem(redeclare
BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
extends BaseClasses.PartialHybridSystem(hydraulic(
redeclare Systems.Hydraulical.Generation.HeatPump generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
Expand Down Expand Up @@ -33,7 +31,7 @@ model AfterBufferWithDHW
redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve
parThrWayVal,
dTBoiDHWLoa=10,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.RecordsCollection.Movers.DPVar parPumGen,
redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve
parThrWayValBoi,
redeclare
Expand Down
4 changes: 1 addition & 3 deletions BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithoutDHW.mo
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
within BESMod.Examples.HeatPumpAndBoiler;
model AfterBufferWithoutDHW
"Bivalent Heat Pump System with boiler integration after buffer tank without DHW support"
extends BaseClasses.PartialHybridSystem(redeclare
BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
extends BaseClasses.PartialHybridSystem(hydraulic(
redeclare Systems.Hydraulical.Generation.HeatPump generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
Expand Down
10 changes: 2 additions & 8 deletions BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,14 @@ package BaseClasses "Contains partial example case"
Systems.Hydraulical.Transfer.IdealValveRadiator transfer(
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.RadiatorTransferData
parRad,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra)),
parRad)),
redeclare Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
calcmFlow),
redeclare Systems.UserProfiles.TEASERProfiles userProfiles,
redeclare DesignOptimization.AachenSystem systemParameters(use_ventilation=
true),
redeclare DesignOptimization.AachenSystem systemParameters,
redeclare DesignOptimization.ParametersToChange parameterStudy,
redeclare final package MediumDHW = AixLib.Media.Water,
redeclare final package MediumZone = AixLib.Media.Air,
Expand Down
11 changes: 5 additions & 6 deletions BESMod/Examples/HeatPumpAndBoiler/Parallel.mo
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
within BESMod.Examples.HeatPumpAndBoiler;
model Parallel
"Bivalent Heat Pump Systems with parallel heat generation"
extends BaseClasses.PartialHybridSystem(redeclare
BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(redeclare
extends BaseClasses.PartialHybridSystem(hydraulic(redeclare
Systems.Hydraulical.Generation.HeatPumpAndGasBoilerParallel generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
Expand All @@ -19,16 +17,17 @@ model Parallel
parTemSen,
redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve
parThrWayVal), redeclare
Systems.Hydraulical.Distribution.DistributionTwoStorageParallel
distribution(
Systems.Hydraulical.Distribution.SimpleTwoStorageParallel distribution(
redeclare
BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage
parStoBuf(VPerQ_flow=parameterStudy.VPerQFlow, dTLoadingHC1=0),
redeclare
BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage
parStoDHW(dTLoadingHC1=10),
redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve
parThrWayVal)));
parThrWayVal,
redeclare BESMod.Systems.RecordsCollection.Movers.DPVar parPumGen,
redeclare BESMod.Systems.RecordsCollection.Movers.DPVar parPumTra)));

extends Modelica.Icons.Example;

Expand Down
11 changes: 5 additions & 6 deletions BESMod/Examples/HeatPumpAndBoiler/Serial.mo
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
within BESMod.Examples.HeatPumpAndBoiler;
model Serial "Bivalent Heat Pump Systems with serial heat generation"
extends BaseClasses.PartialHybridSystem(redeclare
BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(redeclare
extends BaseClasses.PartialHybridSystem(hydraulic(redeclare
Systems.Hydraulical.Generation.HeatPumpAndGasBoilerSerial generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
Expand All @@ -16,16 +14,17 @@ model Serial "Bivalent Heat Pump Systems with serial heat generation"
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen), redeclare
Systems.Hydraulical.Distribution.DistributionTwoStorageParallel
distribution(
Systems.Hydraulical.Distribution.SimpleTwoStorageParallel distribution(
redeclare BESMod.Systems.RecordsCollection.Movers.DPVar parPumGen,
redeclare
BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage
parStoBuf(VPerQ_flow=parameterStudy.VPerQFlow, dTLoadingHC1=0),
redeclare
BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage
parStoDHW(dTLoadingHC1=10),
redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve
parThrWayVal)));
parThrWayVal,
redeclare BESMod.Systems.RecordsCollection.Movers.DPVar parPumTra)));

extends Modelica.Icons.Example;

Expand Down
Loading