diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo b/Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo index 99858014f2a..15aca798d68 100644 --- a/Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo +++ b/Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo @@ -28,15 +28,15 @@ record GenericDomesticHotWaterWithHeatExchanger "Design mass flow rate of domestic hot water" annotation (Dialog(group="Heat exchanger")); - parameter Modelica.Units.SI.HeatFlowRate QHex_flow_nominal(min=0) = mDom_flow_nominal*4200*(TMix_nominal-TCol_nominal) + parameter Modelica.Units.SI.HeatFlowRate QHex_flow_nominal(min=0) = mDom_flow_nominal*4200*(TDom_nominal-TCol_nominal) "Nominal heating flow rate at heat exchanger" annotation (Dialog(group="Heat exchanger")); // parameter Modelica.Units.SI.HeatFlowRate QTan_flow_nominal = mHex_flow_nominal*4200*(THex_nominal-TTan_nominal) // "Nominal heating flow rate"; // parameter Modelica.Units.SI.Height hHex_a = 1 "Height of portHex_a of the heat exchanger, measured from tank bottom"; // parameter Modelica.Units.SI.Height hHex_b = 0.2 "Height of portHex_b of the heat exchanger, measured from tank bottom"; - parameter Modelica.Units.SI.Temperature TMix_nominal = 318.15 - "Temperature of fluid leaving tank at nominal conditions" + parameter Modelica.Units.SI.Temperature TDom_nominal = 318.15 + "Temperature of domestic hot water leaving heater at nominal conditions" annotation (Dialog(group="Domestic hot water")); parameter Modelica.Units.SI.Temperature TCol_nominal = 288.15 "Temperature of cold water" diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo b/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo index a9c82dc5e93..818e0bac988 100644 --- a/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo +++ b/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo @@ -45,8 +45,8 @@ model StorageTankWithExternalHeatExchanger use_m_flow_in=true, nPorts=1, redeclare package Medium = Medium, - T(displayUnit="degC") = datWatHea.TMix_nominal + datWatHea.dTHexApp_nominal + - 1) + T(displayUnit="degC") = datWatHea.TDom_nominal + datWatHea.dTHexApp_nominal + + 1) "Source for heating water" annotation ( Placement(transformation( diff --git a/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo b/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo index 01ebdd462ba..7b9ffd952fc 100644 --- a/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo +++ b/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo @@ -16,7 +16,7 @@ model StorageTankWithExternalHeatExchanger "Start value of tank temperature" annotation(Dialog(tab="Initialization")); final parameter Real eps = - dat.QHex_flow_nominal / CMin_flow_nominal / ( dat.TMix_nominal + dat.dTHexApp_nominal - dat.TCol_nominal) + dat.QHex_flow_nominal / CMin_flow_nominal / ( dat.TDom_nominal + dat.dTHexApp_nominal - dat.TCol_nominal) "Heat exchanger effectiveness" annotation(Dialog(tab="Advanced")); Fluid.Movers.Preconfigured.FlowControlled_dp pumHex(