From 0117cee26703fda1e033a6dc84d4eed271f4a268 Mon Sep 17 00:00:00 2001 From: Filip Jorissen Date: Mon, 2 May 2022 13:33:01 +0200 Subject: [PATCH 1/3] fixed reversely connected temperature sensor for #1260 --- .../IBPSA/SingleZoneResidentialHydronicHeatPump.mo | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo b/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo index 086b1f167..e19d31923 100644 --- a/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo +++ b/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo @@ -124,6 +124,7 @@ model SingleZoneResidentialHydronicHeatPump annotation (Placement(transformation(extent={{40,30},{20,50}}))); Fluid.Sensors.TemperatureTwoPort senTemSup( redeclare package Medium = MediumWater, + allowFlowReversal=false, m_flow_nominal=pum.m_flow_nominal, tau=0) "Supply water temperature sensor" annotation (Placement(transformation(extent={{80,50},{60,30}}))); @@ -139,9 +140,10 @@ model SingleZoneResidentialHydronicHeatPump annotation (Placement(transformation(extent={{0,0},{-20,20}}))); Fluid.Sensors.TemperatureTwoPort senTemRet( redeclare package Medium = MediumWater, + allowFlowReversal=false, m_flow_nominal=pum.m_flow_nominal, tau=0) "Return water temperature sensor" - annotation (Placement(transformation(extent={{80,-10},{60,-30}}))); + annotation (Placement(transformation(extent={{60,-10},{80,-30}}))); Fluid.HeatPumps.ScrollWaterToWater heaPum( redeclare package Medium1 = MediumWater, redeclare package Medium2 = MediumAir, @@ -284,14 +286,10 @@ equation annotation (Line(points={{50,20},{50,40},{40,40}}, color={0,127,255})); connect(heaPum.port_b1,senTemSup.port_a) annotation (Line(points={{124,20},{124, 40},{80,40}}, color={0,127,255})); - connect(senTemRet.port_a,heaPum. port_a1) annotation (Line(points={{80,-20},{124, - -20},{124,0}}, color={0,127,255})); connect(case900Template.gainEmb[1], floHea.heatPortEmb[1]) annotation (Line( points={{-60,1},{-40,1},{-40,20},{-10,20}}, color={191,0,0})); connect(pum.port_b, floHea.port_a) annotation (Line(points={{20,40},{0,40},{0,10}}, color={0,127,255})); - connect(floHea.port_b, senTemRet.port_b) - annotation (Line(points={{-20,10},{-20,-20},{60,-20}},color={0,127,255})); connect(pum.P, reaPPumEmi.u) annotation (Line(points={{19,49},{0,49},{0,80},{18,80}}, color={0,0,127})); connect(yPum.y, ovePum.u) @@ -369,6 +367,10 @@ equation annotation (Line(points={{213,110},{250,110}}, color={0,0,127})); connect(ovePum.y, realToInteger.u) annotation (Line(points={{13,110},{50,110}}, color={0,0,127})); + connect(senTemRet.port_b, heaPum.port_a1) + annotation (Line(points={{80,-20},{124,-20},{124,0}}, color={0,127,255})); + connect(senTemRet.port_a, floHea.port_b) + annotation (Line(points={{60,-20},{-20,-20},{-20,10}}, color={0,127,255})); annotation ( experiment( StopTime=1728000, From 4c0f816c5b4569bb8640488d94cec4f2cef13296 Mon Sep 17 00:00:00 2001 From: Filip Jorissen Date: Tue, 3 May 2022 07:47:02 +0200 Subject: [PATCH 2/3] hotfix for boptest in threshold for #1260 --- IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo b/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo index e19d31923..a46938520 100644 --- a/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo +++ b/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo @@ -260,7 +260,7 @@ model SingleZoneResidentialHydronicHeatPump annotation (Placement(transformation(extent={{-80,90},{-60,70}}))); Modelica.Blocks.Logical.Switch switch1(y(unit="K")) annotation (Placement(transformation(extent={{-20,140},{0,160}}))); - Modelica.Blocks.Sources.Constant const(k=0) + Modelica.Blocks.Sources.Constant const(k=1e-8) annotation (Placement(transformation(extent={{-114,100},{-94,120}}))); Utilities.IO.SignalExchange.WeatherStation weaSta "BOPTEST weather station" annotation (Placement(transformation(extent={{-160,160},{-140,180}}))); From 0fc757130d93946b4e01c33f427fc39abe78562b Mon Sep 17 00:00:00 2001 From: Filip Jorissen Date: Tue, 3 May 2022 11:20:31 +0200 Subject: [PATCH 3/3] Update IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo --- IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo b/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo index a46938520..c7d939e39 100644 --- a/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo +++ b/IDEAS/Examples/IBPSA/SingleZoneResidentialHydronicHeatPump.mo @@ -260,7 +260,7 @@ model SingleZoneResidentialHydronicHeatPump annotation (Placement(transformation(extent={{-80,90},{-60,70}}))); Modelica.Blocks.Logical.Switch switch1(y(unit="K")) annotation (Placement(transformation(extent={{-20,140},{0,160}}))); - Modelica.Blocks.Sources.Constant const(k=1e-8) + Modelica.Blocks.Sources.Constant const(k=1e-8) "Threshold strictly larger than 0 for detecting occupancy" annotation (Placement(transformation(extent={{-114,100},{-94,120}}))); Utilities.IO.SignalExchange.WeatherStation weaSta "BOPTEST weather station" annotation (Placement(transformation(extent={{-160,160},{-140,180}})));