diff --git a/Buildings/Fluid/DXSystems/Cooling/AirSource/VariableSpeed.mo b/Buildings/Fluid/DXSystems/Cooling/AirSource/VariableSpeed.mo index 4ba318df520..1a05ce0845b 100644 --- a/Buildings/Fluid/DXSystems/Cooling/AirSource/VariableSpeed.mo +++ b/Buildings/Fluid/DXSystems/Cooling/AirSource/VariableSpeed.mo @@ -1,6 +1,7 @@ within Buildings.Fluid.DXSystems.Cooling.AirSource; model VariableSpeed "Variable speed DX cooling coil" - extends Buildings.Fluid.DXSystems.Cooling.BaseClasses.PartialDXCoolingCoil( + extends + Buildings.Fluid.DXSystems.Cooling.BaseClasses.PartialDXCoolingCoil( dxCoi( final variableSpeedCoil=true, wetCoi(redeclare @@ -26,13 +27,11 @@ model VariableSpeed "Variable speed DX cooling coil" annotation (Placement(transformation(extent={{-120,70},{-100,90}}), iconTransformation(extent={{-120,70},{-100,90}}))); - Controls.OBC.CDL.Conversions.BooleanToReal booToRea - "Convert Boolean to Real number" - annotation (Placement(transformation(extent={{-42,84},{-30,96}}))); protected Modelica.Blocks.Logical.Hysteresis deaBan( final uLow=minSpeRat - speRatDeaBan/2, - final uHigh=minSpeRat + speRatDeaBan/2) "Speed ratio deadband" + final uHigh=minSpeRat + speRatDeaBan/2) + "Speed ratio deadband" annotation (Placement(transformation(extent={{-64,64},{-52,76}}))); Modelica.Blocks.Math.BooleanToInteger onSwi( @@ -63,10 +62,6 @@ equation points={{-51.4,70},{-43.2,70}}, color={255,0,255}, smooth=Smooth.None)); - connect(deaBan.y, booToRea.u) annotation (Line(points={{-51.4,70},{-48,70},{ - -48,90},{-43.2,90}}, color={255,0,255})); - connect(booToRea.y, damPreInd.y) annotation (Line(points={{-28.8,90},{-22,90}, - {-22,66},{-26,66},{-26,-14},{-78,-14},{-78,12}}, color={0,0,127})); annotation (defaultComponentName="varSpeDXCoo", Documentation(info="

This model can be used to simulate an air source DX cooling coil with continuously diff --git a/Buildings/Fluid/DXSystems/Heating/AirSource/SingleSpeed.mo b/Buildings/Fluid/DXSystems/Heating/AirSource/SingleSpeed.mo index 0bec5206027..a8b275e200e 100644 --- a/Buildings/Fluid/DXSystems/Heating/AirSource/SingleSpeed.mo +++ b/Buildings/Fluid/DXSystems/Heating/AirSource/SingleSpeed.mo @@ -45,9 +45,6 @@ equation color={255,0,255})); connect(booToReaOn.y, defCap.uSpe) annotation (Line(points={{22,140},{44,140}, {44,100},{61,100}}, color={0,0,127})); - connect(booToReaOn.y, damPreInd.y) annotation (Line(points={{22,140},{28,140}, - {28,126},{-78,126},{-78,12}}, color={0,0, - 127})); annotation (defaultComponentName="sinSpeDXHea", Documentation(info="

This model can be used to simulate an air-source DX heating coil with single speed compressor. diff --git a/Buildings/Fluid/HeatExchangers/HeaterCooler_u.mo b/Buildings/Fluid/HeatExchangers/HeaterCooler_u.mo index 689e6833308..2db0539ed35 100644 --- a/Buildings/Fluid/HeatExchangers/HeaterCooler_u.mo +++ b/Buildings/Fluid/HeatExchangers/HeaterCooler_u.mo @@ -12,8 +12,6 @@ model HeaterCooler_u "Heater or cooler with prescribed heat flow rate" Modelica.Blocks.Interfaces.RealOutput Q_flow(unit="W") "Heat added to the fluid" annotation (Placement(transformation(extent={{100,50},{120,70}}))); - Controls.OBC.CDL.Continuous.Sources.Constant con(k=1) - annotation (Placement(transformation(extent={{-78,22},{-58,42}}))); protected Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHea( final alpha=0) @@ -37,8 +35,6 @@ equation connect(gai.y, Q_flow) annotation (Line( points={{-59,60},{-50,60},{-50,80},{80,80},{80,60},{110,60}}, color={0,0,127})); - connect(con.y, damPreInd.y) annotation (Line(points={{-56,32},{-50,32},{-50, - 18},{-78,18},{-78,12}}, color={0,0,127})); annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, -100},{100,100}}), graphics={ Rectangle( diff --git a/Buildings/Fluid/Interfaces/TwoPortHeatMassExchanger.mo b/Buildings/Fluid/Interfaces/TwoPortHeatMassExchanger.mo index 570123d90d9..00ee2cf3655 100644 --- a/Buildings/Fluid/Interfaces/TwoPortHeatMassExchanger.mo +++ b/Buildings/Fluid/Interfaces/TwoPortHeatMassExchanger.mo @@ -63,11 +63,6 @@ model TwoPortHeatMassExchanger final dp_nominal=dp_nominal) "Flow resistance" annotation (Placement(transformation(extent={{-60,-10},{-40,10}}))); - Actuators.Dampers.PressureIndependent damPreInd( - redeclare package Medium = Medium, - m_flow_nominal=m_flow_nominal, - dpDamper_nominal=dp_nominal) - annotation (Placement(transformation(extent={{-88,-10},{-68,10}}))); protected parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX( T=Medium.T_default, p=Medium.p_default, X=Medium.X_default); @@ -93,13 +88,12 @@ equation connect(vol.ports[2], port_b) annotation (Line( points={{1,0},{100,0}}, color={0,127,255})); + connect(port_a, preDro.port_a) annotation (Line( + points={{-100,0},{-90,0},{-90,0},{-80,0},{-80,0},{-60,0}}, + color={0,127,255})); connect(preDro.port_b, vol.ports[1]) annotation (Line( points={{-40,0},{1,0}}, color={0,127,255})); - connect(port_a, damPreInd.port_a) - annotation (Line(points={{-100,0},{-88,0}}, color={0,127,255})); - connect(damPreInd.port_b, preDro.port_a) - annotation (Line(points={{-68,0},{-60,0}}, color={0,127,255})); annotation ( Documentation(info="