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

Adapt to new HP models #84

Merged
merged 37 commits into from
Sep 30, 2024
Merged

Adapt to new HP models #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
98915b2
Apply conversion script from AixLib
FWuellhorst Aug 19, 2024
922f946
new ref commit to check if CI passes
FWuellhorst Aug 19, 2024
9d4f97b
Convert StorageDetailed as well
FWuellhorst Aug 19, 2024
11b4a86
fixes for checks
FWuellhorst Aug 19, 2024
c94df3d
update reference results due to new initial temperature in DHW storag…
FWuellhorst Aug 20, 2024
df3087e
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Aug 20, 2024
6add1f3
chore tmp change branch
FWuellhorst Aug 23, 2024
e8b3d21
add new HP model and test subsystem
FWuellhorst Aug 28, 2024
a4b51d0
mv records and make design easier
FWuellhorst Aug 28, 2024
548c9e5
Adjust Examples
FWuellhorst Aug 28, 2024
55ecf3a
Hopefully fix conditional connect for older Dymola Versions
FWuellhorst Aug 29, 2024
8307fac
adjust final setting for different hydraulic connections
FWuellhorst Aug 29, 2024
de3e4c0
trigger_ci
FWuellhorst Aug 29, 2024
2f7c594
use latest fixes in AixLib
FWuellhorst Aug 29, 2024
d4ce980
Update reference results
FWuellhorst Sep 2, 2024
9b44757
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Sep 2, 2024
ed6670d
update again to see if CI works
FWuellhorst Sep 2, 2024
437c848
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Sep 2, 2024
c5fce33
remove again to trigger full pipeline
FWuellhorst Sep 2, 2024
7984fe5
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Sep 2, 2024
f00d299
Update remaining results
FWuellhorst Sep 2, 2024
d5d7023
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Sep 2, 2024
9df1043
update linear statistics
FWuellhorst Sep 2, 2024
92e107a
Merge branch '83_newHPmodels' of https://github.com/RWTH-EBC/BESMod i…
FWuellhorst Sep 2, 2024
59cc0aa
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Sep 2, 2024
e3ec2ae
fix pump and minimal flow rate control
FWuellhorst Sep 9, 2024
c909d72
Merge branch '83_newHPmodels' of https://github.com/RWTH-EBC/BESMod i…
FWuellhorst Sep 9, 2024
c1caf21
update reference results
FWuellhorst Sep 9, 2024
c1309f9
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Sep 9, 2024
b49385c
move frosting to defrost control and remove non-calibrated frosting o…
FWuellhorst Sep 29, 2024
fa7ea51
update control to new defrost model approach and use 2.1.0
FWuellhorst Sep 29, 2024
fb7206f
Merge branch '83_newHPmodels' of https://github.com/RWTH-EBC/BESMod i…
FWuellhorst Sep 30, 2024
998be1e
Merge branch 'main' into 83_newHPmodels
FWuellhorst Sep 30, 2024
2a35591
fix missing input
FWuellhorst Sep 30, 2024
6ee4fb0
update reference results
FWuellhorst Sep 30, 2024
ba19cb4
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Sep 30, 2024
7818341
update translation statistics wrongly reverted from main
FWuellhorst Sep 30, 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
39 changes: 17 additions & 22 deletions BESMod/Examples/BAUSimStudy/PartialCase.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,23 @@ partial model PartialCase
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 Systems.Hydraulical.Generation.HeatPumpAndElectricHeater
generation(
redeclare model RefrigerantCycleHeatPumpHeating =
AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D
(y_nominal=0.8, redeclare
AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane
datTab),
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare package Medium_eva = AixLib.Media.Air,
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,

TBiv=TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
parHeaPum(
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=TBiv,
scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/5000,
dpCon_nominal=0,
dpEva_nominal=0,
use_refIne=false,
refIneFre_constant=0),
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
parHeaPum,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater
BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater
parEleHea,
redeclare model PerDataMainHP =
AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal,
refrigerant="Propane",
flowsheet="VIPhaseSeparatorFlowsheet"),
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen),
Expand All @@ -42,14 +38,13 @@ partial model PartialCase
dTHysDHW=10,
redeclare model DHWHysteresis =
BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater,

redeclare model BuildingHysteresis =
BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater,

redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI
parPIDHeaPum,
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl
safetyControl),
parPIDHeaPum),
redeclare
BESMod.Systems.Hydraulical.Distribution.TwoStoDetailedDirectLoading
distribution(
Expand All @@ -69,7 +64,7 @@ partial model PartialCase
use_QLos=true,
T_m=65 + 273.15),
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater
BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater
parEleHeaAftBuf),
redeclare BESMod.Systems.Hydraulical.Transfer.RadiatorPressureBased
transfer(
Expand Down
43 changes: 14 additions & 29 deletions BESMod/Examples/DesignOptimization/BES.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,23 @@ model BES
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 model PerDataRevHP =
AixLib.DataBase.Chiller.PerformanceData.PolynomalApproach (redeclare
function PolyData =
AixLib.DataBase.HeatPump.Functions.Characteristics.ConstantCoP
( powerCompressor=2000, CoP=2)),
redeclare BESMod.Systems.Hydraulical.Components.Frosting.NoFrosting
frost,
redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater
generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare package Medium_eva = AixLib.Media.Air,
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.DefaultHP
parHeaPum(
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=parameterStudy.TBiv,
scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/
parameterStudy.QHP_flow_biv,
dpCon_nominal=0,
dpEva_nominal=0,
use_refIne=false,
refIneFre_constant=0),
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
parHeaPum,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater
BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater
parEleHea,
redeclare model PerDataMainHP =
AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal,
refrigerant="Propane",
flowsheet="VIPhaseSeparatorFlowsheet"),
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen(transferHeat=true)),
Expand Down Expand Up @@ -73,10 +61,7 @@ model BES
useExtSGSig=false,
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI
parPIDHeaPum,
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl
safetyControl),
parPIDHeaPum),
redeclare Systems.Hydraulical.Distribution.DistributionTwoStorageParallel
distribution(
redeclare
Expand Down
43 changes: 14 additions & 29 deletions BESMod/Examples/DesignOptimization/BESNoDHW.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,23 @@ model BESNoDHW "Example to demonstrate usage without DHW"
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 model PerDataRevHP =
AixLib.DataBase.Chiller.PerformanceData.PolynomalApproach (redeclare
function PolyData =
AixLib.DataBase.HeatPump.Functions.Characteristics.ConstantCoP
( powerCompressor=2000, CoP=2)),
redeclare
BESMod.Systems.Hydraulical.Components.Frosting.NoFrosting frost,
redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater
generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare package Medium_eva = AixLib.Media.Air,
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.DefaultHP
parHeaPum(
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=parameterStudy.TBiv,
scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/
parameterStudy.QHP_flow_biv,
dpCon_nominal=0,
dpEva_nominal=0,
use_refIne=false,
refIneFre_constant=0),
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
parHeaPum,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater
BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater
parEleHea,
redeclare model PerDataMainHP =
AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal,
refrigerant="Propane",
flowsheet="VIPhaseSeparatorFlowsheet"),
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen),
Expand Down Expand Up @@ -70,10 +58,7 @@ model BESNoDHW "Example to demonstrate usage without DHW"
useExtSGSig=false,
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI
parPIDHeaPum,
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl
safetyControl),
parPIDHeaPum),
redeclare BESMod.Systems.Hydraulical.Distribution.BuildingOnly
distribution(nParallelDem=1),
redeclare Systems.Hydraulical.Transfer.IdealValveRadiator transfer(
Expand Down
2 changes: 0 additions & 2 deletions BESMod/Examples/DesignOptimization/ParametersToChange.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ record ParametersToChange
annotation(Evaluate=false);
parameter Modelica.Units.SI.HeatFlowRate QHP_flow_cutOff=3000
annotation (Evaluate=false);
parameter Modelica.Units.SI.HeatFlowRate QHP_flow_biv=4000
annotation (Evaluate=false);
end ParametersToChange;
33 changes: 13 additions & 20 deletions BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithDHW.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
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(
redeclare Systems.Hydraulical.Generation.HeatPump
generation(
extends BaseClasses.PartialHybridSystem(redeclare
BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
redeclare Systems.Hydraulical.Generation.HeatPump generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
parHeaPum(
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=parameterStudy.TBiv,
scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/
parameterStudy.QHP_flow_biv,
dpCon_nominal=0,
dpEva_nominal=0,
use_refIne=false,
refIneFre_constant=0),
redeclare model PerDataMainHP =
AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal,
refrigerant="Propane",
flowsheet="VIPhaseSeparatorFlowsheet"),
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
parHeaPum,
redeclare model RefrigerantCycleHeatPumpHeating =
AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D
(y_nominal=0.8, redeclare
AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane
datTab),
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen),
parTemSen,
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel),
control(boiInGeneration=false),
redeclare Systems.Hydraulical.Distribution.TwoStoragesBoilerWithDHW
distribution(
Expand Down
33 changes: 13 additions & 20 deletions BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithoutDHW.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
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(
redeclare Systems.Hydraulical.Generation.HeatPump
generation(
extends BaseClasses.PartialHybridSystem(redeclare
BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
redeclare Systems.Hydraulical.Generation.HeatPump generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
parHeaPum(
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=parameterStudy.TBiv,
scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/
parameterStudy.QHP_flow_biv,
dpCon_nominal=0,
dpEva_nominal=0,
use_refIne=false,
refIneFre_constant=0),
redeclare model PerDataMainHP =
AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal,
refrigerant="Propane",
flowsheet="VIPhaseSeparatorFlowsheet"),
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
parHeaPum,
redeclare model RefrigerantCycleHeatPumpHeating =
AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D
(y_nominal=0.8, redeclare
AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane
datTab),
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen),
parTemSen,
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel),
control(boiInGeneration=false),
redeclare Systems.Hydraulical.Distribution.TwoStoDetailedDirectLoading
distribution(
Expand Down
3 changes: 0 additions & 3 deletions BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ package BaseClasses "Contains partial example case"
parPIDHeaPum,
TBiv=parameterStudy.TBiv,
boiInGeneration=true,
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl
safetyControl,
TCutOff=parameterStudy.TCutOff,
redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicBoilerPI
Expand Down
34 changes: 13 additions & 21 deletions BESMod/Examples/HeatPumpAndBoiler/Parallel.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,25 @@
within BESMod.Examples.HeatPumpAndBoiler;
model Parallel
"Bivalent Heat Pump Systems with parallel heat generation"
extends BaseClasses.PartialHybridSystem(
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
redeclare Systems.Hydraulical.Generation.HeatPumpAndGasBoilerParallel
generation(
extends BaseClasses.PartialHybridSystem(redeclare
BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(redeclare
Systems.Hydraulical.Generation.HeatPumpAndGasBoilerParallel generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
parHeaPum(
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=parameterStudy.TBiv,
scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/
parameterStudy.QHP_flow_biv,
dpCon_nominal=0,
dpEva_nominal=0,
use_refIne=false,
refIneFre_constant=0),
redeclare model PerDataMainHP =
AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal,
refrigerant="Propane",
flowsheet="VIPhaseSeparatorFlowsheet"),
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
parHeaPum,
redeclare model RefrigerantCycleHeatPumpHeating =
AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D
(y_nominal=0.8, redeclare
AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane
datTab),
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen,
redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve
parThrWayVal),
redeclare Systems.Hydraulical.Distribution.DistributionTwoStorageParallel
parThrWayVal), redeclare
Systems.Hydraulical.Distribution.DistributionTwoStorageParallel
distribution(
redeclare
BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage
Expand Down
34 changes: 13 additions & 21 deletions BESMod/Examples/HeatPumpAndBoiler/Serial.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
within BESMod.Examples.HeatPumpAndBoiler;
model Serial "Bivalent Heat Pump Systems with serial heat generation"
extends BaseClasses.PartialHybridSystem(
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
redeclare Systems.Hydraulical.Generation.HeatPumpAndGasBoilerSerial
generation(
extends BaseClasses.PartialHybridSystem(redeclare
BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(redeclare
Systems.Hydraulical.Generation.HeatPumpAndGasBoilerSerial generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
TBiv=parameterStudy.TBiv,
redeclare
BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
parHeaPum(
genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
TBiv=parameterStudy.TBiv,
scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/
parameterStudy.QHP_flow_biv,
dpCon_nominal=0,
dpEva_nominal=0,
use_refIne=false,
refIneFre_constant=0),
redeclare model PerDataMainHP =
AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal,
refrigerant="Propane",
flowsheet="VIPhaseSeparatorFlowsheet"),
BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP
parHeaPum,
redeclare model RefrigerantCycleHeatPumpHeating =
AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D
(y_nominal=0.8, redeclare
AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane
datTab),
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen),
redeclare Systems.Hydraulical.Distribution.DistributionTwoStorageParallel
parTemSen), redeclare
Systems.Hydraulical.Distribution.DistributionTwoStorageParallel
distribution(
redeclare
BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage
Expand Down
Loading