Issue 78 new top down parameters for a partial retrofitted bes

BESMod/Examples/package.order

@@ -6,3 +6,4 @@ HighOrderModel
 ModelicaConferencePaper
 SolarThermalSystem
 TEASERHeatLoadCalculation
+PartialRetrofit

BESMod/Systems/BaseClasses/PartialBuildingEnergySystem.mo

@@ -96,8 +96,10 @@ partial model PartialBuildingEnergySystem "Partial BES"
       hydraulicSystemParameters(
       final nZones=systemParameters.nZones,
       final Q_flow_nominal=systemParameters.QBui_flow_nominal,
+      final QOld_flow_design=systemParameters.QBuiOld_flow_design,
       final TOda_nominal=systemParameters.TOda_nominal,
       final TSup_nominal=systemParameters.THydSup_nominal,
+      final TSupOld_design=systemParameters.THydSupOld_design,
       final TZone_nominal=systemParameters.TSetZone_nominal,
       final TAmb=systemParameters.TAmbHyd,
       final AZone=building.AZone,
@@ -126,6 +128,7 @@ partial model PartialBuildingEnergySystem "Partial BES"
       ventilationSystemParameters(
       final nZones=systemParameters.nZones,
       final Q_flow_nominal=systemParameters.QBui_flow_nominal,
+      final QOld_flow_design=systemParameters.QBuiOld_flow_design,
       final TOda_nominal=systemParameters.TOda_nominal,
       final TSup_nominal=systemParameters.TVenSup_nominal,
       final TZone_nominal=systemParameters.TSetZone_nominal,

BESMod/Systems/BaseClasses/PartialSubsystemParameters.mo

@@ -10,15 +10,27 @@ model PartialSubsystemParameters "Model for a partial subsystem"
   parameter Modelica.Units.SI.Temperature TSup_nominal[nParallelSup]
     "Nominal supply temperature" annotation (Dialog(group=
           "Design - Bottom Up: Parameters are defined by the subsystem"));
+  parameter Modelica.Units.SI.Temperature TSupOld_design[nParallelSup]=TSup_nominal
+    "Old nominal design supply temperature" annotation (Dialog(group=
+          "Design - Bottom Up: Parameters are defined by the subsystem"));
   parameter Modelica.Units.SI.TemperatureDifference dTTra_nominal[nParallelDem]
     "Nominal temperature difference for heat transfer" annotation (Dialog(group=
          "Design - Bottom Up: Parameters are defined by the subsystem"));
+  parameter Modelica.Units.SI.TemperatureDifference dTTraOld_design[nParallelDem]=dTTra_nominal
+    "Old nominal design temperature difference for heat transfer" annotation (Dialog(group=
+         "Design - Bottom Up: Parameters are defined by the subsystem"));
+
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nParallelDem](each
       min=Modelica.Constants.eps) "Nominal mass flow rate" annotation (Dialog(
         group="Design - Bottom Up: Parameters are defined by the subsystem"));
+  parameter Modelica.Units.SI.MassFlowRate mOld_flow_design[nParallelDem](each
+      min=Modelica.Constants.eps)=m_flow_nominal "Old nominal design mass flow rate of old design" annotation (Dialog(
+        group="Design - Bottom Up: Parameters are defined by the subsystem"));
+
   parameter Modelica.Units.SI.PressureDifference dp_nominal[nParallelDem]
     "Nominal pressure difference at m_flow_nominal" annotation (Dialog(group=
           "Design - Bottom Up: Parameters are defined by the subsystem"));
+
   parameter Modelica.Units.SI.TemperatureDifference dTLoss_nominal[nParallelDem]=
      fill(0, nParallelDem) "Nominal temperature difference due to heat losses"
     annotation (Dialog(group=
@@ -34,17 +46,37 @@ model PartialSubsystemParameters "Model for a partial subsystem"
   parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal[nParallelDem](each min=Modelica.Constants.eps)
     "Nominal heat flow rate" annotation (Dialog(group=
           "Design - Top Down: Parameters are given by the parent system"));
+
+  parameter Modelica.Units.SI.HeatFlowRate QOld_flow_design[nParallelDem](each min=Modelica.Constants.eps) = Q_flow_nominal
+    "Old nominal design heat flow rate" annotation (Dialog(group=
+          "Design - Top Down: Parameters are given by the parent system"));
   parameter Modelica.Units.SI.Temperature TOda_nominal
     "Nominal outdoor air temperature" annotation (Dialog(group=
           "Design - Top Down: Parameters are given by the parent system"));
   parameter Modelica.Units.SI.Temperature TDem_nominal[nParallelDem]
     "Nominal demand temperature" annotation (Dialog(group=
           "Design - Top Down: Parameters are given by the parent system"));
+  parameter Modelica.Units.SI.Temperature TDemOld_design[nParallelDem]=TDem_nominal
+    "Old nominal design demand temperature" annotation (Dialog(group=
+          "Design - Top Down: Parameters are given by the parent system"));
   parameter Modelica.Units.SI.Temperature TAmb
     "Ambient temperature of system. Used to calculate default heat loss."
     annotation (Dialog(group=
           "Design - Top Down: Parameters are given by the parent system"));
 
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_design[nParallelDem](each min=Modelica.Constants.eps) = Q_flow_nominal
+    "Nominal design heat flow rate" annotation (Dialog(group=
+          "Design - Internal: Parameters are defined by the subsystem"));
+  parameter Modelica.Units.SI.MassFlowRate m_flow_design[nParallelDem](each
+      min=Modelica.Constants.eps) = m_flow_nominal "Nominal design mass flow rate" annotation (Dialog(
+        group="Design - Internal: Parameters are defined by the subsystem"));
+  parameter Modelica.Units.SI.TemperatureDifference dTTra_design[nParallelDem] = dTTra_nominal
+    "Nominal design temperature difference for heat transfer" annotation (Dialog(group=
+         "Design - Internal: Parameters are defined by the subsystem"));
+  parameter Modelica.Units.SI.PressureDifference dp_design[nParallelDem] = dp_nominal
+    "Nominal design pressure difference at m_flow_design" annotation (Dialog(group=
+          "Design - Internal: Parameters are defined by the subsystem"));
+
   annotation (Icon(graphics,
                    coordinateSystem(preserveAspectRatio=false)), Diagram(graphics,
         coordinateSystem(preserveAspectRatio=false)));

BESMod/Systems/Hydraulical/BaseClasses/PartialHydraulicSystem.mo

@@ -16,14 +16,18 @@ partial model PartialHydraulicSystem
     annotation (choicesAllMatching=true, Placement(transformation(extent={{-178,-136},{-158,-116}})));
 
   replaceable BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration generation(
-      dTTra_nominal=fill(1, generation.nParallelDem), dp_nominal=fill(0,
-        generation.nParallelDem))       constrainedby
+      dTTra_nominal=fill(1, generation.nParallelDem),
+      dp_nominal=fill(0, generation.nParallelDem))       constrainedby
     BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration(
     final TDem_nominal=distribution.TSup_nominal,
+    final TDemOld_design=distribution.TSupOld_design,
     final Q_flow_nominal={sum(distribution.Q_flow_nominal)*generation.f_design[
         i] + distribution.QDHWBefSto_flow_nominal for i in 1:generation.nParallelDem},
+    final QOld_flow_design={sum(distribution.QOld_flow_design)*generation.f_design[
+        i] + distribution.QDHWBefSto_flow_nominal for i in 1:generation.nParallelDem},
     redeclare package Medium = Medium,
     final dpDem_nominal=distribution.dpSup_nominal,
+    final dpDemOld_design=distribution.dpSupOld_design,
     final energyDynamics=energyDynamics,
     final massDynamics=massDynamics,
     final p_start=p_start,
@@ -122,15 +126,19 @@ partial model PartialHydraulicSystem
     final mSenFac=mSenFac,
     final TAmb=hydraulicSystemParameters.TAmb,
     final Q_flow_nominal=transfer.QSup_flow_nominal,
+    final QOld_flow_design=transfer.QSupOld_flow_design,
     final TDem_nominal=transfer.TSup_nominal,
+    final TDemOld_design=transfer.TSupOld_design,
     final allowFlowReversal=allowFlowReversal,
     final show_T=show_T,
     final rho=rho,
     final cp=cp,
     final TOda_nominal=hydraulicSystemParameters.TOda_nominal,
     final use_dhw=use_dhw,
     final mDem_flow_nominal=transfer.mSup_flow_nominal,
+    final mDemOld_flow_design=transfer.mSupOld_flow_design,
     final mSup_flow_nominal=generation.m_flow_nominal,
+    final mSupOld_flow_design=generation.mOld_flow_design,
     final mDHW_flow_nominal=hydraulicSystemParameters.mDHW_flow_nominal,
     final VDHWDay=hydraulicSystemParameters.VDHWDay,
     final QDHW_flow_nominal=hydraulicSystemParameters.QDHW_flow_nominal,
@@ -153,17 +161,20 @@ partial model PartialHydraulicSystem
     final X_start=X_start,
     final C_start=C_start,
     final TTra_nominal=hydraulicSystemParameters.TSup_nominal,
+    final TTraOld_design=hydraulicSystemParameters.TSupOld_design,
     final AZone=hydraulicSystemParameters.AZone,
     final hZone=hydraulicSystemParameters.hZone,
     final ABui=hydraulicSystemParameters.ABui,
     final hBui=hydraulicSystemParameters.hBui,
     final dpSup_nominal=distribution.dpDem_nominal,
+    final dpSupOld_design=distribution.dpDemOld_design,
     final C_nominal=C_nominal,
     final mSenFac=mSenFac,
     final TOda_nominal=hydraulicSystemParameters.TOda_nominal,
     final nParallelDem=hydraulicSystemParameters.nZones,
     final TAmb=hydraulicSystemParameters.TAmb,
     final Q_flow_nominal=hydraulicSystemParameters.Q_flow_nominal,
+    final QOld_flow_design=hydraulicSystemParameters.QOld_flow_design,
     final TDem_nominal=hydraulicSystemParameters.TZone_nominal,
     final allowFlowReversal=allowFlowReversal,
     final show_T=show_T,
@@ -189,8 +200,8 @@ partial model PartialHydraulicSystem
       Medium = MediumDHW) "Outlet for the distribution to the DHW" annotation (
       Placement(transformation(extent={{190,-70},{210,-50}}),iconTransformation(
           extent={{188,-76},{208,-56}})));
-  Modelica.Fluid.Interfaces.FluidPort_a portDHW_in(redeclare final package Medium
-      =        MediumDHW) "Inet for the distribution from the DHW" annotation (
+  Modelica.Fluid.Interfaces.FluidPort_a portDHW_in(redeclare final package Medium =
+               MediumDHW) "Inet for the distribution from the DHW" annotation (
       Placement(transformation(extent={{190,-130},{210,-110}}),
                                                              iconTransformation(
           extent={{188,-116},{208,-96}})));

BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialDistribution.mo

@@ -4,7 +4,8 @@ partial model PartialDistribution
   extends BESMod.Utilities.Icons.StorageIcon;
   extends BESMod.Systems.BaseClasses.PartialFluidSubsystemWithParameters(final
       dp_nominal=dpDem_nominal,
-      TSup_nominal=TDem_nominal .+ dTLoss_nominal .+ dTTra_nominal);
+      TSup_nominal=TDem_nominal .+ dTLoss_nominal .+ dTTra_nominal,
+      TSupOld_design=TDemOld_design .+ dTLoss_nominal .+ dTTraOld_design);
   extends PartialDHWParameters;
   replaceable package MediumDHW =
       Modelica.Media.Interfaces.PartialMedium
@@ -18,24 +19,40 @@ partial model PartialDistribution
     "Nominal mass flow rate of system supplying the distribution" annotation (
       Dialog(group=
           "Design - Top Down: Parameters are given by the parent system"));
+  parameter Modelica.Units.SI.MassFlowRate mSupOld_flow_design[nParallelSup](each min=Modelica.Constants.eps)
+    "Old nominal design mass flow rate of system supplying the distribution" annotation (
+      Dialog(group=
+          "Design - Top Down: Parameters are given by the parent system"));
   parameter Modelica.Units.SI.MassFlowRate mDem_flow_nominal[nParallelDem](each min=Modelica.Constants.eps)
     "Nominal mass flow rate of demand system of the distribution" annotation (
       Dialog(group=
           "Design - Top Down: Parameters are given by the parent system"));
+  parameter Modelica.Units.SI.MassFlowRate mDemOld_flow_design[nParallelDem](each min=Modelica.Constants.eps)
+    "Old nominal design mass flow rate of demand system of the distribution" annotation (
+      Dialog(group=
+          "Design - Top Down: Parameters are given by the parent system"));
   parameter Modelica.Units.SI.TemperatureDifference dTTraDHW_nominal
     "Nominal temperature difference to transfer heat to the DHW storage"
     annotation (Dialog(group="DHW Demand"));
   parameter Modelica.Units.SI.PressureDifference dpSup_nominal[nParallelSup]
     "Nominal pressure loss of resistances connected to the supply system of the distribution"
     annotation (Dialog(group=
           "Design - Bottom Up: Parameters are defined by the subsystem"));
+  parameter Modelica.Units.SI.PressureDifference dpSupOld_design[nParallelSup]=dpSup_nominal
+    "Old nominal design pressure loss of resistances connected to the supply system of the distribution"
+    annotation (Dialog(group=
+          "Design - Bottom Up: Parameters are defined by the subsystem"));
   parameter Modelica.Units.SI.PressureDifference dpDem_nominal[nParallelDem]
     "Nominal pressure loss of resistances connected to the demand system of the distribution"
     annotation (Dialog(group=
           "Design - Bottom Up: Parameters are defined by the subsystem"));
+  parameter Modelica.Units.SI.PressureDifference dpDemOld_design[nParallelDem] = dpDem_nominal
+    "Old nominal design pressure loss of resistances connected to the demand system of the distribution"
+    annotation (Dialog(group=
+          "Design - Bottom Up: Parameters are defined by the subsystem"));
 
-  Modelica.Fluid.Interfaces.FluidPort_a portGen_in[nParallelSup](redeclare final
-      package       Medium = MediumGen) "Inlet from the generation" annotation (
+  Modelica.Fluid.Interfaces.FluidPort_a portGen_in[nParallelSup](redeclare
+      final package Medium = MediumGen) "Inlet from the generation" annotation (
      Placement(transformation(extent={{-110,70},{-90,90}}), iconTransformation(
           extent={{-110,70},{-90,90}})));
   Modelica.Fluid.Interfaces.FluidPort_b portGen_out[nParallelSup](redeclare
@@ -47,8 +64,8 @@ partial model PartialDistribution
                Medium) "Outlet for the distribution to the building"
     annotation (Placement(transformation(extent={{90,70},{110,90}}),
         iconTransformation(extent={{90,70},{110,90}})));
-  Modelica.Fluid.Interfaces.FluidPort_a portBui_in[nParallelDem](redeclare final
-      package       Medium =
+  Modelica.Fluid.Interfaces.FluidPort_a portBui_in[nParallelDem](redeclare
+      final package Medium =
                Medium) "Inlet for the distribution from the building"
     annotation (Placement(transformation(extent={{90,30},{110,50}}),
         iconTransformation(extent={{90,30},{110,50}})));

BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo

@@ -1,7 +1,11 @@
 within BESMod.Systems.Hydraulical.Distribution.BaseClasses;
 partial model PartialTwoStorageParallel "Partial model to later extent"
   extends BaseClasses.PartialDistribution(
-    final dpDHW_nominal=0,
+    Q_flow_design={if use_old_design[i] then QOld_flow_design[i] else
+        Q_flow_nominal[i] for i in 1:nParallelDem},
+    m_flow_design={if use_old_design[i] then mOld_flow_design[i] else
+        m_flow_nominal[i] for i in 1:nParallelDem},
+    final mOld_flow_design=mDemOld_flow_design,
     final dpDem_nominal={0},
     final dpSup_nominal={parThrWayVal.dpValve_nominal + max(parThrWayVal.dp_nominal)},
     final dTTraDHW_nominal=parStoDHW.dTLoadingHC1,
@@ -14,6 +18,10 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
     final nParallelSup=1,
     final nParallelDem=1);
 
+  parameter Boolean use_old_design[nParallelDem]=fill(false, nParallelDem)
+    "If true, design parameters of old building state are used"
+    annotation (Dialog(group="Design - Internal: Parameters are defined by the subsystem"));
+
   parameter Modelica.Units.SI.TemperatureDifference dTLoaHCBuf
     "Temperature difference for loading of heating coil in buffer storage"
       annotation(Dialog(group="Component data"));
@@ -31,7 +39,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
   replaceable parameter BESMod.Systems.RecordsCollection.Valves.ThreeWayValve parThrWayVal
     constrainedby BESMod.Systems.RecordsCollection.Valves.ThreeWayValve(
     final dp_nominal={dpBufHCSto_nominal,dpDHWHCSto_nominal},
-    final m_flow_nominal=mSup_flow_nominal[1],
+    final m_flow_nominal=if use_old_design[1] then mSupOld_flow_design[1] else mSup_flow_nominal[1],
     final fraK=1,
     use_inputFilter=false) "Parameters for three way valve" annotation (
     Dialog(group="Component data"),
@@ -41,14 +49,14 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
   replaceable parameter
     RecordsCollection.BufferStorage.BufferStorageBaseDataDefinition parStoBuf
     constrainedby RecordsCollection.BufferStorage.BufferStorageBaseDataDefinition(
-    final Q_flow_nominal=Q_flow_nominal[1]*f_design[1],
+    final Q_flow_nominal=Q_flow_design[1]*f_design[1],
     final rho=rho,
     final c_p=cp,
     final dTLoadingHC1=dTLoaHCBuf,
     final TAmb=TAmb,
     T_m=TSup_nominal[1],
-    final QHC1_flow_nominal=Q_flow_nominal[1]*f_design[1],
-    final mHC1_flow_nominal=mSup_flow_nominal[1],
+    final QHC1_flow_nominal=Q_flow_design[1]*f_design[1],
+    final mHC1_flow_nominal=if use_old_design[1] then mSupOld_flow_design[1] else mSup_flow_nominal[1],
     final use_HC2=stoBuf.useHeatingCoil2,
     final use_HC1=stoBuf.useHeatingCoil1,
     final dTLoadingHC2=9999999,
@@ -74,7 +82,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
     final TAmb=TAmb,
     T_m=TDHW_nominal,
     final QHC1_flow_nominal=QDHW_flow_nominal,
-    final mHC1_flow_nominal=mSup_flow_nominal[1],
+    final mHC1_flow_nominal=if use_old_design[1] then mSupOld_flow_design[1] else mSup_flow_nominal[1],
     final use_HC2=stoDHW.useHeatingCoil2,
     final use_HC1=stoDHW.useHeatingCoil1,
     final dTLoadingHC2=dTLoadingHC2,
@@ -137,8 +145,8 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
     final mSenFac=1,
     redeclare package MediumHC1 = MediumGen,
     redeclare package MediumHC2 = MediumGen,
-    final m1_flow_nominal=mSup_flow_nominal[1],
-    final m2_flow_nominal=m_flow_nominal[1],
+    final m1_flow_nominal=if use_old_design[1] then mSupOld_flow_design[1] else mSup_flow_nominal[1],
+    final m2_flow_nominal=m_flow_design[1],
     final mHC1_flow_nominal=parStoBuf.mHC1_flow_nominal,
     final mHC2_flow_nominal=parStoBuf.mHC2_flow_nominal,
     final useHeatingCoil2=false,
@@ -191,7 +199,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent"
     final mSenFac=1,
     redeclare final package MediumHC1 = MediumGen,
     redeclare final package MediumHC2 = MediumGen,
-    final m1_flow_nominal=mSup_flow_nominal[1],
+    final m1_flow_nominal=if use_old_design[1] then mSupOld_flow_design[1] else mSup_flow_nominal[1],
     final m2_flow_nominal=mDHW_flow_nominal,
     final mHC1_flow_nominal=parStoDHW.mHC1_flow_nominal,
     final mHC2_flow_nominal=parStoDHW.mHC2_flow_nominal,

BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo

@@ -36,8 +36,8 @@ partial model PartialTwoStorageParallelWithHeaters
   BESMod.Systems.Hydraulical.Components.ElectricHeaterWithSecurityControl hea(
     redeclare package Medium = Medium,
     final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal[1],
-    final m_flow_small=1E-4*abs(m_flow_nominal[1]),
+    final m_flow_nominal=m_flow_design[1],
+    final m_flow_small=1E-4*abs(m_flow_design[1]),
     final show_T=show_T,
     final dp_nominal=parEleHeaAftBuf.dp_nominal,
     final tau=30,
@@ -67,8 +67,8 @@ partial model PartialTwoStorageParallelWithHeaters
   AixLib.Fluid.BoilerCHP.BoilerNoControl boi(
     redeclare package Medium = AixLib.Media.Water,
     final allowFlowReversal=true,
-    final m_flow_nominal=m_flow_nominal[1],
-    final m_flow_small=1E-4*abs(m_flow_nominal[1]),
+    final m_flow_nominal=m_flow_design[1],
+    final m_flow_small=1E-4*abs(m_flow_design[1]),
     final show_T=show_T,
     final tau=parTemSen.tau,
     final initType=parTemSen.initType,

BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo

@@ -10,7 +10,8 @@ model TwoStoragesBoilerWithDHW
     final dpBufHCSto_nominal=0,
     final dTLoaHCBuf=0,
     final use_secHeaCoiDHWSto=true,
-    stoDHW(nHC2Up=parStoDHW.nLayer, nHC2Low=1));
+    stoDHW(nHC2Up=parStoDHW.nLayer, nHC2Low=1),
+    final use_old_design=fill(false, nParallelDem));
   parameter Modelica.Units.SI.TemperatureDifference dTBoiDHWLoa = 5
     "Temperature difference for DHW storage loading with the boiler"
     annotation(Dialog(group="Component data"));