diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/package.mo b/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/package.mo index f04f4ad8eb..c14cacbe18 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/package.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/Validation/BaseClasses/package.mo @@ -1,4 +1,10 @@ within IBPSA.Fluid.Chillers.ModularReversible.Validation; package BaseClasses "Package with partial validation models" extends Modelica.Icons.BasesPackage; + +annotation (preferredView="info", Documentation(info=" +

+This package contains partial models for comparative validation. +

+")); end BaseClasses; diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Validation/package.mo b/IBPSA/Fluid/Chillers/ModularReversible/Validation/package.mo index 99f1317541..6a38b26d4c 100644 --- a/IBPSA/Fluid/Chillers/ModularReversible/Validation/package.mo +++ b/IBPSA/Fluid/Chillers/ModularReversible/Validation/package.mo @@ -1,4 +1,13 @@ within IBPSA.Fluid.Chillers.ModularReversible; package Validation "Package for model validation" extends Modelica.Icons.ExamplesPackage; + +annotation (preferredView="info", Documentation(info=" +

+This package contains models that validate the modular reversible chiller models +using comparative validation against the carnot model: + +IBPSA.Fluid.Chillers.Examples.Carnot_y +

+")); end Validation; diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo index 23ea407d60..db9a40a895 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo @@ -158,14 +158,14 @@ equation pattern=LinePattern.None, fillColor={0,0,255}, fillPattern=FillPattern.Solid, - visible=is_con), + visible=isCon), Rectangle( extent={{44,-4},{100,5}}, lineColor={0,0,255}, pattern=LinePattern.None, fillColor={255,0,0}, fillPattern=FillPattern.Solid, - visible=is_con), + visible=isCon), Line( points={{0,-96},{0,-50},{0,-46}}, color={0,0,0}, @@ -242,14 +242,14 @@ equation pattern=LinePattern.None, fillColor={255,0,0}, fillPattern=FillPattern.Solid, - visible=not is_con), + visible=not isCon), Rectangle( extent={{43,5},{106,-4}}, lineColor={0,0,255}, pattern=LinePattern.None, fillColor={0,0,255}, fillPattern=FillPattern.Solid, - visible=not is_con), + visible=not isCon), Text( extent={{-100,-100},{100,-60}}, textColor={28,108,200}, diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo index ae7df4f007..3665b3bd58 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo @@ -48,8 +48,8 @@ partial model PartialReversibleRefrigerantMachine IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 safCtrPar constrainedby IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Generic - "Safety control parameters" annotation (Dialog(enable= - use_internalSafetyControl, group="Safety Control"), + "Safety control parameters" annotation (Dialog(enable=use_intSafCtr, + group="Safety Control"), choicesAllMatching=true); //Condenser parameter Modelica.Units.SI.Time tauCon=30 @@ -349,8 +349,8 @@ partial model PartialReversibleRefrigerantMachine // To avoid using the bus, set the section below to protected // +protected RefrigerantMachineControlBus sigBus "Bus with model outputs and possibly inputs" annotation (Placement(transformation( extent={{-120,-60},{-90,-26}}), iconTransformation(extent={{-108,-52}, @@ -363,8 +363,8 @@ protected use_intSafCtr)); // +protected parameter Real scaFac "Scaling factor"; parameter MediumCon.ThermodynamicState staCon_nominal=MediumCon.setState_pTX( T=MediumCon.T_default, p=MediumCon.p_default, X=MediumCon.X_default) diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/BoundaryMap.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/BoundaryMap.mo index 0543dfb1e9..860bbde62e 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/BoundaryMap.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/BoundaryMap.mo @@ -120,7 +120,7 @@ equation coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={ Line(points=DynamicSelect( - {{-66,-66},{-66,50},{-44,66}, {68,66},{68,-66},{-66,-66}},points), + {{-66,-66},{-66,50},{-44,66}, {68,66},{68,-66},{-66,-66}},poi), color={238,46,47}, thickness=0.5), Polygon( diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mo index d34f41b1de..77d4017508 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Examples/Safety.mo @@ -52,6 +52,11 @@ model Safety "Example for usage of all safety controls" Modelica.Blocks.Sources.Pulse mEvaEmu_flow(amplitude=1, period=100) "Emulator for evaporator mass flow rate" annotation (Placement(transformation(extent={{-20,-100},{0,-80}}))); + Modelica.Blocks.Sources.BooleanConstant conHea(final k=true) + "Constant heating mode" annotation (Placement(transformation( + extent={{-10,-10},{10,10}}, + rotation=0, + origin={-90,70}))); equation connect(safCtr.sigBus, sigBus) annotation (Line( points={{0.0833333,3.91667},{-50,3.91667},{-50,-52}}, @@ -109,6 +114,12 @@ equation index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); + connect(conHea.y, sigBus.hea) annotation (Line(points={{-79,70},{-50,70},{-50, + -52}}, color={255,0,255}), Text( + string="%second", + index=1, + extent={{6,3},{6,3}}, + horizontalAlignment=TextAlignment.Left)); annotation (Documentation(info="

This example shows the usage and effect of diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo index 3fd4d7cb3c..8124b20170 100644 --- a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo +++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo @@ -78,7 +78,7 @@ record WAMAK_WaterToWater_220kW "220 kW water to water with R513A"

WAMAK, Produktblatt ver. 2023/24. -https://products.wamak.eu/combine.php?&ampcoverpg&ampdescriptmrktadv&amplang=de-DE&ampcode_id=WAHDR2XE\. +https://products.wamak.eu/combine.php?&ampcoverpg&ampdescriptmrktadv&amplang=de-DE&ampcode_id=WAHDR2XE.

", revisions="