diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Components/Chillers/Validation/Compression.mos b/Buildings/Resources/Scripts/Dymola/Templates/Components/Chillers/Validation/Compression.mos
index d5bcf92197d..028bab48855 100644
--- a/Buildings/Resources/Scripts/Dymola/Templates/Components/Chillers/Validation/Compression.mos
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Components/Chillers/Validation/Compression.mos
@@ -14,7 +14,7 @@ createPlot(
 createPlot(
     id=1,
     subPlot=2,
-    y={"chiAirCoo.bus.reqChiWat", "chiWatCoo.bus.reqChiWat", "chiWatCoo.bus.reqConWat"},
+    y={"chiAirCoo.bus.y1ReqFloChiWat", "chiWatCoo.bus.y1ReqFloChiWat", "chiWatCoo.bus.y1ReqFloConWat"},
     autoscale=true,
     grid=true
 );
diff --git a/Buildings/Templates/Components/Chillers/Validation/Compression.mo b/Buildings/Templates/Components/Chillers/Validation/Compression.mo
index 29cf049ea89..673a7507c3b 100644
--- a/Buildings/Templates/Components/Chillers/Validation/Compression.mo
+++ b/Buildings/Templates/Components/Chillers/Validation/Compression.mo
@@ -14,7 +14,6 @@ model Compression
     Dialog(tab="Dynamics",group="Conservation equations"));
   parameter Data.Chiller datChiAirCoo(
     final typ=chiAirCoo.typ,
-    final use_datDes=true,
     mChiWat_flow_nominal=datChiAirCoo.cap_nominal / abs(datChiAirCoo.TChiWatSup_nominal -
       Buildings.Templates.Data.Defaults.TChiWatRet) / datChiAirCoo.cpChiWat_default,
     cap_nominal=750E3,
@@ -32,15 +31,21 @@ model Compression
         1.535993E+00, - 4.944902E-02, 0.000000E+00, 1.396972E+00, 0.000000E+00, 0.000000E+00},
       PLRMax=1.15,
       etaMotor=1.0))
-    "Air-cooled chiller parameters – Parameterization based on design conditions and direct assignment of performance curves"
+    "Air-cooled chiller parameters – Parameterization by direct assignment of performance curves"
     annotation (Placement(transformation(extent={{40,80},{60,100}})));
   parameter Buildings.Templates.Components.Data.Chiller datChiWatCoo(
     final typ=chiWatCoo.typ,
-    final use_datDes=false,
+    mChiWat_flow_nominal=datChiWatCoo.cap_nominal / abs(datChiWatCoo.TChiWatSup_nominal -
+      Buildings.Templates.Data.Defaults.TChiWatRet) / datChiWatCoo.cpChiWat_default,
+    mCon_flow_nominal=datChiWatCoo.mChiWat_flow_nominal,
+    cap_nominal=750E3,
+    COP_nominal=Buildings.Templates.Data.Defaults.COPChiWatCoo,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    TConEnt_nominal=Buildings.Templates.Data.Defaults.TConWatSup,
     dpChiWat_nominal=Buildings.Templates.Data.Defaults.dpChiWatChi,
     dpCon_nominal=Buildings.Templates.Data.Defaults.dpConWatChi,
     redeclare Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Trane_CVHE_1442kW_6_61COP_VSD per)
-    "Water-cooled chiller parameters – Parameterization based on rating conditions specified in the sub-record per"
+    "Water-cooled chiller parameters – Parameterization by redeclaring sub-record per"
     annotation (Placement(transformation(extent={{40,-40},{60,-20}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(
     k=datChiAirCoo.TChiWatSup_nominal,
@@ -78,8 +83,8 @@ model Compression
     "Boundary condition at distribution system supply"
     annotation (Placement(transformation(extent={{130,10},{110,30}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatRet(
-    amplitude=(datChiAirCoo.TChiWatRet_nominal - datChiAirCoo.TChiWatSup_nominal) /
-      2,
+    amplitude=(datChiAirCoo.TChiWatRet_nominal - datChiAirCoo.TChiWatSup_nominal)
+        /2,
     freqHz=2 / 3000,
     y(final unit="K",
       displayUnit="degC"),
@@ -193,7 +198,8 @@ protected
     annotation (Placement(transformation(extent={{-20,-60},{20,-20}}),
       iconTransformation(extent={{-276,6},{-236,46}})));
 initial equation
-  Modelica.Utilities.Streams.print("Coef at rating conditions = " + String(Buildings.Utilities.Math.Functions.biquadratic(
+  Modelica.Utilities.Streams.print(
+    "Coef at rating conditions = " + String(Buildings.Utilities.Math.Functions.biquadratic(
     a=datChiWatCoo.per.capFunT,
     x1=Modelica.Units.Conversions.to_degC(datChiWatCoo.per.TEvaLvg_nominal),
     x2=Modelica.Units.Conversions.to_degC(datChiWatCoo.per.TConLvg_nominal))));
@@ -262,27 +268,14 @@ This model validates the model
 <a href=\"modelica://Buildings.Templates.Components.Chillers.Compression\">
 Buildings.Templates.Components.Chillers.Compression</a>
 in a configuration in which the chiller is exposed
-to a constant differential pressure and a varying
-return temperature.
+to the design CHW differential pressure and a varying
+CHW return temperature.
 </p>
 <p>
 The chiller model is configured to represent either an air-cooled
 chiller (component <code>chiAirCoo</code>) or a water-cooled
 chiller (component <code>chiWatCoo</code>).
 </p>
-<p>
-Regarding the parameterization logic described in the documentation of 
-<a href=\"modelica://Buildings.Templates.Components.Chillers.Compression\">
-Buildings.Templates.Components.Chillers.Compression</a>:
-The air-cooled chiller component is parameterized using the 
-specified design conditions (<code>datChiAirCoo.use_datDes=true</code>)
-and a direct assignment of the performance curves
-<code>per.capFunT</code>, <code>per.EIRFunT</code> and <code>per.EIRFunPLR</code>.
-The water-cooled chiller component is parameterized using the 
-rating conditions specified in the redeclared performance record
-(<code>datChiWatCoo.use_datDes=false</code>) and no direct assignment
-of the design parameters.
-</p>
 </html>",
       revisions="<html>
 <ul>
diff --git a/Buildings/Templates/Components/Data/Chiller.mo b/Buildings/Templates/Components/Data/Chiller.mo
index d594a8446b0..8fca2b09304 100644
--- a/Buildings/Templates/Components/Data/Chiller.mo
+++ b/Buildings/Templates/Components/Data/Chiller.mo
@@ -2,177 +2,139 @@ within Buildings.Templates.Components.Data;
 record Chiller
   "Record for chiller model"
   extends Modelica.Icons.Record;
-  parameter Boolean use_datDes=true
-    "Set to true to use specified design conditions, false to use data from performance record"
-    annotation (Evaluate=true,
-    __ctrlFlow(enable=false));
   parameter Buildings.Templates.Components.Types.Chiller typ
     "Type of chiller"
     annotation (Evaluate=true,
-    Dialog(group="Configuration",
-      enable=false));
+    Dialog(group="Configuration", enable=false));
   parameter Modelica.Units.SI.SpecificHeatCapacity cpChiWat_default=
     Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
     "CHW default specific heat capacity"
-    annotation (Dialog(group="Configuration",
-      enable=false));
+    annotation (Dialog(group="Configuration"));
   parameter Modelica.Units.SI.SpecificHeatCapacity cpCon_default=if typ ==
     Buildings.Templates.Components.Types.Chiller.AirCooled then
     Buildings.Utilities.Psychrometrics.Constants.cpAir
     else Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
     "Condenser cooling fluid default specific heat capacity"
-    annotation (Dialog(group="Configuration",
-      enable=false));
+    annotation (Dialog(group="Configuration"));
   parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
-    start=if not use_datDes then per.mEva_flow_nominal else 1E-3,
     final min=0)
     "CHW mass flow rate"
-    annotation (Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal(
-    start=if not use_datDes then per.mCon_flow_nominal elseif
-    typ == Buildings.Templates.Components.Types.Chiller.AirCooled
+    start=if typ == Buildings.Templates.Components.Types.Chiller.WaterCooled
+      then mChiWat_flow_nominal elseif typ == Buildings.Templates.Components.Types.Chiller.AirCooled
       then Buildings.Templates.Data.Defaults.ratMFloAirByCapChi * abs(cap_nominal)
-      else 1E-3,
+      else 0,
     final min=0)
     "Condenser cooling fluid (e.g. CW) mass flow rate"
     annotation (Dialog(group="Nominal condition",
-      enable=typ==Buildings.Templates.Components.Types.Chiller.WaterCooled and use_datDes));
-  parameter Modelica.Units.SI.HeatFlowRate cap_nominal(
-    start=if not use_datDes then abs(per.QEva_flow_nominal) else 1E-3)
+      enable=typ==Buildings.Templates.Components.Types.Chiller.WaterCooled));
+  parameter Modelica.Units.SI.HeatFlowRate cap_nominal
     "Cooling capacity"
-    annotation (Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (Dialog(group="Nominal condition"));
   final parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal(
     final min=0)=abs(cap_nominal) *(1 / COP_nominal + 1)
     "Condenser heat flow rate"
     annotation (Dialog(group="Nominal condition"));
   parameter Real COP_nominal(
-    start=if not use_datDes then per.COP_nominal else Buildings.Templates.Data.Defaults.COPChiAirCoo,
     final min=1,
     final unit="1")
     "Cooling COP"
-    annotation (Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.PressureDifference dpChiWat_nominal(
     final min=0,
-    start=if typ == Buildings.Templates.Components.Types.Chiller.None then 0
-      else Buildings.Templates.Data.Defaults.dpChiWatChi)
+    start=Buildings.Templates.Data.Defaults.dpChiWatChi)
     "CHW pressure drop"
-    annotation (Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None));
+    annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.PressureDifference dpCon_nominal(
     final min=0,
     start=if typ == Buildings.Templates.Components.Types.Chiller.WaterCooled
-      then Buildings.Templates.Data.Defaults.dpConWatChi elseif typ == Buildings.Templates.Components.Types.Chiller.AirCooled
+      then Buildings.Templates.Data.Defaults.dpConWatChi
+      elseif typ == Buildings.Templates.Components.Types.Chiller.AirCooled
       then Buildings.Templates.Data.Defaults.dpAirChi else 0)
     "Condenser cooling fluid pressure drop"
     annotation (Dialog(group="Nominal condition",
       enable=typ==Buildings.Templates.Components.Types.Chiller.WaterCooled));
   parameter Modelica.Units.SI.Temperature TChiWatSup_nominal(
-    start=if not use_datDes then per.TEvaLvg_nominal else Buildings.Templates.Data.Defaults.TChiWatSup,
     final min=260)
     "CHW supply temperature"
-    annotation (Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (Dialog(group="Nominal condition"));
   final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal(
-    final min=260)=if typ == Buildings.Templates.Components.Types.Chiller.None
-    then TChiWatSup_nominal else TChiWatSup_nominal + abs(cap_nominal) /
+    final min=260)=TChiWatSup_nominal + abs(cap_nominal) /
     cpChiWat_default / mChiWat_flow_nominal
     "CHW return temperature"
     annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TChiWatSup_min(
-    start=if not use_datDes then per.TEvaLvgMin else Buildings.Templates.Data.Defaults.TChiWatSup_min)=
-    Buildings.Templates.Data.Defaults.TChiWatSup_min
+  parameter Modelica.Units.SI.Temperature TChiWatSup_min=TChiWatSup_nominal
     "Minimum CHW supply temperature"
-    annotation (Dialog(group="Operating limits",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
-  parameter Modelica.Units.SI.Temperature TChiWatSup_max(
-    start=if not use_datDes then per.TEvaLvgMax else Buildings.Templates.Data.Defaults.TChiWatSup_max)=
+    annotation (Dialog(group="Operating limits"));
+  parameter Modelica.Units.SI.Temperature TChiWatSup_max=
     Buildings.Templates.Data.Defaults.TChiWatSup_max
     "Maximum CHW supply temperature"
-    annotation (Dialog(group="Operating limits",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (Dialog(group="Operating limits"));
   parameter Modelica.Units.SI.Temperature TConEnt_nominal(
-    final min=273.15,
-    start=if not use_datDes then per.TConLvg_nominal - QCon_flow_nominal /
-      mCon_flow_nominal / cpCon_default else Buildings.Templates.Data.Defaults.TConEnt_max)
+    final min=273.15)
     "Condenser entering fluid temperature (CW or air)"
     annotation (Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+      enable=typ<>Buildings.Templates.Components.Types.Chiller.None));
   // The following parameter is not declared as final to allow parameterization
-  // based on leaving CHW temperature.
-  parameter Modelica.Units.SI.Temperature TConLvg_nominal=if not use_datDes then per.TConLvg_nominal
-    else TConEnt_nominal + QCon_flow_nominal / mCon_flow_nominal / cpCon_default
+  // based on leaving CHW temperature. In this case, the user shall compute
+  // TConEnt_nominal from TConLvg_nominal.
+  parameter Modelica.Units.SI.Temperature TConLvg_nominal=
+    TConEnt_nominal + QCon_flow_nominal / mCon_flow_nominal / cpCon_default
     "Condenser leaving fluid temperature (CW or air)"
-    annotation (Dialog(group="Nominal condition",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (Dialog(group="Nominal condition"));
   parameter Modelica.Units.SI.Temperature TConLvg_min(
-    start=if not use_datDes then per.TConLvgMin else Buildings.Templates.Data.Defaults.TConLvg_min,
     final min=273.15)=Buildings.Templates.Data.Defaults.TConLvg_min
     "Minimum condenser leaving fluid temperature (CW or air)"
-    annotation (Dialog(group="Operating limits",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (Dialog(group="Operating limits"));
   parameter Modelica.Units.SI.Temperature TConLvg_max(
-    start=if not use_datDes then per.TConLvgMax else Buildings.Templates.Data.Defaults.TConLvg_max,
     final min=273.15)=Buildings.Templates.Data.Defaults.TConLvg_max
     "Maximum condenser leaving fluid temperature (CW or air)"
-    annotation (Dialog(group="Operating limits",
-      enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (Dialog(group="Operating limits"));
   parameter Real PLRUnl_min(
-    start=if not use_datDes then per.PLRMinUnl else 0,
+    start=0,
     final min=PLR_min,
     final max=1)=PLR_min
-    "Minimum unloading ratio (before engaging hot gas bypass, if any)"
-    annotation (Dialog(enable=typ<>Buildings.Templates.Components.Types.Chiller.None
-      and use_datDes));
+    "Minimum unloading ratio (before engaging hot gas bypass, if any)";
   parameter Real PLR_min(
-    start=if not use_datDes then per.PLRMin else 0,
+    start=0,
     final min=0,
     final max=1)=0.15
-    "Minimum part load ratio before cycling"
-    annotation (Dialog(enable=typ<>Buildings.Templates.Components.Types.Chiller.None
-      and use_datDes));
+    "Minimum part load ratio before cycling";
   replaceable parameter Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.Generic per(
-    COP_nominal=if use_datDes then COP_nominal else 1.1,
-    QEva_flow_nominal=if use_datDes then - abs(cap_nominal) else 1E-3,
-    TConLvg_nominal=if use_datDes then TConLvg_nominal else 273.15,
-    TConLvgMin=if use_datDes then TConLvg_min else 273.15,
-    TConLvgMax=if use_datDes then TConLvg_max else 273.15,
-    TEvaLvg_nominal=if use_datDes then TChiWatSup_nominal else 273.15,
-    TEvaLvgMin=if use_datDes then TChiWatSup_nominal else 273.15,
-    TEvaLvgMax=if use_datDes then TChiWatSup_max else 273.15,
-    PLRMin=if use_datDes then PLR_min else 0,
-    PLRMinUnl=if use_datDes then PLRUnl_min else 0,
+    COP_nominal=COP_nominal,
+    QEva_flow_nominal=- abs(cap_nominal),
+    TConLvg_nominal=TConLvg_nominal,
+    TConLvgMin=TConLvg_min,
+    TConLvgMax=TConLvg_max,
+    TEvaLvg_nominal=TChiWatSup_nominal,
+    TEvaLvgMin=TChiWatSup_nominal,
+    TEvaLvgMax=TChiWatSup_max,
+    PLRMin=PLR_min,
+    PLRMinUnl=PLRUnl_min,
     PLRMax=1.0,
     etaMotor=1.0,
-    mEva_flow_nominal=if use_datDes then mChiWat_flow_nominal else 1E-3,
-    mCon_flow_nominal=if use_datDes then mCon_flow_nominal else 1E-3,
-    capFunT={1, 0, 0, 0, 0, 0},
-    EIRFunT={1, 0, 0, 0, 0, 0},
-    EIRFunPLR={1, 0, 0, 0, 0, 0, 0, 0, 0, 0})
-    constrainedby Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.Generic
+    mEva_flow_nominal=mChiWat_flow_nominal,
+    mCon_flow_nominal=mCon_flow_nominal)
     "Chiller performance data"
-    annotation (choicesAllMatching=true,
-    Dialog(enable=typ<>Buildings.Templates.Components.Types.Chiller.None and use_datDes));
+    annotation (choicesAllMatching=true);
   final parameter Real COPPer_nominal(
     final min=0,
-    final unit="1")=if typ == Buildings.Templates.Components.Types.Chiller.None
-    then per.COP_nominal else per.COP_nominal / Buildings.Utilities.Math.Functions.biquadratic(
-    a=per.EIRFunT,
-    x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
-    x2=Modelica.Units.Conversions.to_degC(TConLvg_nominal)) / Buildings.Utilities.Math.Functions.bicubic(
-    a=per.EIRFunPLR,
-    x1=Modelica.Units.Conversions.to_degC(TConLvg_nominal),
-    x2=1)
+    final unit="1")=per.COP_nominal /
+      Buildings.Utilities.Math.Functions.biquadratic(
+        a=per.EIRFunT,
+        x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
+        x2=Modelica.Units.Conversions.to_degC(TConLvg_nominal)) / Buildings.Utilities.Math.Functions.bicubic(
+        a=per.EIRFunPLR,
+        x1=Modelica.Units.Conversions.to_degC(TConLvg_nominal),
+        x2=1)
     "Cooling COP computed at design conditions from performance record"
     annotation (Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate capPer_flow_nominal=if typ ==
-    Buildings.Templates.Components.Types.Chiller.None then abs(per.QEva_flow_nominal)
-    else abs(per.QEva_flow_nominal) * Buildings.Utilities.Math.Functions.biquadratic(
-    a=per.capFunT,
-    x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
-    x2=Modelica.Units.Conversions.to_degC(TConLvg_nominal))
+  final parameter Modelica.Units.SI.HeatFlowRate capPer_flow_nominal=abs(per.QEva_flow_nominal) *
+    Buildings.Utilities.Math.Functions.biquadratic(
+      a=per.capFunT,
+      x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
+      x2=Modelica.Units.Conversions.to_degC(TConLvg_nominal))
     "Cooling capacity computed at design conditions from performance record"
     annotation (Dialog(group="Nominal condition"));
   final parameter Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.Generic perSca(
@@ -208,21 +170,12 @@ the classes within
 Buildings.Templates.Components.Chillers</a>.
 It is composed of a set of parameters corresponding to the design
 (selection) conditions and a sub-record <code>per</code> corresponding
-to the rating conditions at which the performance curves are calculated.
+to the rating conditions at which the performance curves <code>per.capFunT</code>,
+<code>per.EIRFunT</code> and <code>per.EIRFunPLR</code> are calculated.
 </p>
 <p>
-The record allows two different parameterization logics, depending
-on the value of the parameter <code>use_datDes</code>.
-(The user can refer to the valiation model
-<a href=\"modelica://Buildings.Templates.Components.Chillers.Validation.Compression\">
-Buildings.Templates.Components.Chillers.Validation.Compression</a>
-for an illustration of these two logics.)
-</p>
-<ul>
-<li>
-If <code>use_datDes=true</code> &ndash; default setting that should be
-used in most cases: The performance data specified in the sub-record
-<code>per</code> are \"translated\" so that the capacity and <i>COP</i>
+The performance data specified in the sub-record
+<code>per</code> are \"translated\" so that the capacity and cooling <i>COP</i>
 calculated at design conditions match the design values
 <code>cap_nominal</code> and <code>COP_nominal</code>.
 The performance data that result from this translation are stored in
@@ -233,33 +186,10 @@ Note that the performance data can be specified either by redeclaring
 the sub-record <code>per</code>, or by simply assigning the performance
 curves <code>per.capFunT</code>, <code>per.EIRFunT</code> and <code>per.EIRFunPLR</code>
 in case these curves were calculated based on the design conditions.
-To support the latter, the design conditions are propagated \"down\" to
+To support the former, the design conditions are propagated \"down\" to
 the sub-record <code>per</code> but these bindings do not persist
 after redeclaration so that a record at different rating conditions can
 also be used.
-</li>
-<li>
-If <code>use_datDes=false</code> &ndash; non-default setting that should only be
-used if the rating conditions match the design conditions:
-The rating conditions specified in the sub-record
-<code>per</code> are propagated \"up\" (via the <code>start</code> attribute)
-and used as design conditions.
-The sub-record <code>perSca</code> which is ultimately used by the chiller models within
-<a href=\"modelica://Buildings.Templates.Components.Chillers\">
-Buildings.Templates.Components.Chillers</a>
-is then identical to the sub-record <code>per</code>.
-When using this logic, no assignment shall be made for the design
-parameters, except for the design pressure drops <code>dp*_nominal</code>.
-</li>
-</ul>
-<p>
-Note that placeholders values are assigned to the chiller performance curves
-(<code>per.capFunT</code> , <code>per.EIRFunT</code> and <code>per.EIRFunPLR</code>)
-to avoid assigning these parameters if
-<code>typ=Buildings.Templates.Components.Types.Chiller.None</code>.
-If the chiller type is not <code>None</code> these values are unrealistic
-and must be overwritten, which is always the case when redeclaring or
-reassigning the performance record <code>per</code>.
 </p>
 </html>"));
 end Chiller;
diff --git a/Buildings/Templates/Components/Types.mo b/Buildings/Templates/Components/Types.mo
index 457fcc8ff6a..235c9486ce2 100644
--- a/Buildings/Templates/Components/Types.mo
+++ b/Buildings/Templates/Components/Types.mo
@@ -4,8 +4,6 @@ package Types "Package with type definitions"
   type Chiller = enumeration(
       AirCooled
       "Air-cooled compression chiller",
-      None
-      "No chiller",
       WaterCooled
       "Water-cooled compression chiller")
     "Enumeration to specify the type of chiller";
diff --git a/Buildings/Templates/Plants/Chillers/Components/ChillerGroups/Compression.mo b/Buildings/Templates/Plants/Chillers/Components/ChillerGroups/Compression.mo
index 3e9168888cf..e7459d2ec2a 100644
--- a/Buildings/Templates/Plants/Chillers/Components/ChillerGroups/Compression.mo
+++ b/Buildings/Templates/Plants/Chillers/Components/ChillerGroups/Compression.mo
@@ -1,7 +1,6 @@
 within Buildings.Templates.Plants.Chillers.Components.ChillerGroups;
 model Compression "Group of compression chillers"
-  extends
-    Buildings.Templates.Plants.Chillers.Components.Interfaces.PartialChillerGroup;
+  extends Buildings.Templates.Plants.Chillers.Components.Interfaces.PartialChillerGroup;
 
   Buildings.Templates.Components.Chillers.Compression chi[nChi](
     redeclare each final package MediumChiWat = MediumChiWat,
diff --git a/Buildings/Templates/Plants/Chillers/Components/Data/ChillerGroup.mo b/Buildings/Templates/Plants/Chillers/Components/Data/ChillerGroup.mo
index c65143acae4..06e2ffbecf2 100644
--- a/Buildings/Templates/Plants/Chillers/Components/Data/ChillerGroup.mo
+++ b/Buildings/Templates/Plants/Chillers/Components/Data/ChillerGroup.mo
@@ -120,14 +120,10 @@ record ChillerGroup
     TEvaLvgMax=TChiWatSupChi_max,
     PLRMin=PLRChi_min,
     PLRMinUnl=PLRUnlChi_min,
-    PLRMax=1.0,
-    etaMotor=1.0,
+    each PLRMax=1.0,
+    each etaMotor=1.0,
     mEva_flow_nominal=mChiWatChi_flow_nominal,
-    mCon_flow_nominal=mConChi_flow_nominal,
-    capFunT={1, 0, 0, 0, 0, 0},
-    EIRFunT={1, 0, 0, 0, 0, 0},
-    EIRFunPLR={1, 0, 0, 0, 0, 0, 0, 0, 0, 0})
-    constrainedby Buildings.Fluid.Chillers.Data.ElectricReformulatedEIR.Generic
+    mCon_flow_nominal=mConChi_flow_nominal)
     "Chiller performance data"
     annotation (choicesAllMatching=true);
   annotation (
diff --git a/Buildings/Templates/Plants/Chillers/Components/Data/Controller.mo b/Buildings/Templates/Plants/Chillers/Components/Data/Controller.mo
index 44f3c132122..322ba2385a3 100644
--- a/Buildings/Templates/Plants/Chillers/Components/Data/Controller.mo
+++ b/Buildings/Templates/Plants/Chillers/Components/Data/Controller.mo
@@ -402,7 +402,8 @@ record Controller
     "Cooler fan minimum speed"
     annotation (Dialog(group=
       "Information provided by testing, adjusting, and balancing contractor",
-      enable=typ==Buildings.Templates.Plants.Chillers.Types.Controller.G36 and typChi==Buildings.Templates.Components.Types.Chiller.WaterCooled));
+      enable=typ==Buildings.Templates.Plants.Chillers.Types.Controller.G36
+      and typChi==Buildings.Templates.Components.Types.Chiller.WaterCooled));
   // RFE: The following parameter has the type Real for future capability to specify interchangeable chillers with 0.5.
   parameter Real sta[:, nUniSta](
     each min=0,
@@ -419,14 +420,16 @@ record Controller
   final parameter Integer nSta=size(sta, 1)
     "Number of plant stages"
     annotation (Evaluate=true,
-    Dialog(group="Plant staging"));
+    Dialog(group="Plant staging",
+      enable=typ==Buildings.Templates.Plants.Chillers.Types.Controller.G36));
   parameter Real staCoo[nSta](
     each max=nCoo,
     start=fill(0, nSta))
     "Quantity of enabled cooler units (e.g. cooling tower cells) at each plant Stage"
     annotation (Evaluate=true,
     Dialog(group="Plant staging",
-      enable=typ==Buildings.Templates.Plants.Chillers.Types.Controller.G36 and typChi==Buildings.Templates.Components.Types.Chiller.WaterCooled));
+      enable=typ==Buildings.Templates.Plants.Chillers.Types.Controller.G36
+      and typChi==Buildings.Templates.Components.Types.Chiller.WaterCooled));
   annotation (
     defaultComponentName="datCtl",
     Documentation(
diff --git a/Buildings/Templates/Plants/Chillers/Components/Interfaces/PartialChillerGroup.mo b/Buildings/Templates/Plants/Chillers/Components/Interfaces/PartialChillerGroup.mo
index dc4e1ae0102..aa401b8bb57 100644
--- a/Buildings/Templates/Plants/Chillers/Components/Interfaces/PartialChillerGroup.mo
+++ b/Buildings/Templates/Plants/Chillers/Components/Interfaces/PartialChillerGroup.mo
@@ -7,7 +7,7 @@ partial model PartialChillerGroup "Interface class for chiller group"
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "Medium model for condenser cooling fluid";
 
-  parameter Integer nChi(final min=0)
+  parameter Integer nChi(final min=1)
     "Number of chillers"
     annotation (Evaluate=true, Dialog(group="Configuration"));
   parameter Buildings.Templates.Components.Types.Chiller typ
@@ -136,7 +136,7 @@ partial model PartialChillerGroup "Interface class for chiller group"
     annotation (Evaluate=true, Dialog(group="Configuration"));
 
   parameter Buildings.Templates.Plants.Chillers.Components.Data.ChillerGroup
-    dat(final typ=typ, final nChi=nChi)
+    dat(typ=typ, nChi=nChi)
     "Parameter record for chiller group";
 
   final parameter Buildings.Templates.Components.Data.Chiller datChi[nChi](
diff --git a/Buildings/Templates/Plants/Chillers/Components/Interfaces/PartialController.mo b/Buildings/Templates/Plants/Chillers/Components/Interfaces/PartialController.mo
index 80710e453c1..47cb5ee6e9e 100644
--- a/Buildings/Templates/Plants/Chillers/Components/Interfaces/PartialController.mo
+++ b/Buildings/Templates/Plants/Chillers/Components/Interfaces/PartialController.mo
@@ -68,16 +68,17 @@ partial block PartialController "Interface class for plant controller"
     "Type of WSE"
     annotation (Evaluate=true, Dialog(group="Configuration",
     enable=typChi==Buildings.Templates.Components.Types.Chiller.WaterCooled));
-  parameter Boolean have_valChiWatChiBypPar
+  parameter Boolean have_valChiWatChiBypPar(start=false)
     "Set to true for chiller CHW bypass valve - Parallel chillers with WSE and primary-only distribution"
     annotation (Evaluate=true, Dialog(group="Configuration",
-    enable=typEco<>Buildings.Templates.Plants.Chillers.Types.Economizer.None));
+    enable=typ==Buildings.Templates.Plants.Chillers.Types.Controller.G36 and
+      typEco<>Buildings.Templates.Plants.Chillers.Types.Economizer.None));
   parameter Buildings.Templates.Components.Types.Cooler typCoo(
     start=Buildings.Templates.Components.Types.Cooler.None)
     "Condenser water cooling equipment"
-    annotation(Evaluate=true, Dialog(group="Configuration", enable=typ ==
-          Buildings.Templates.Plants.Chillers.Types.Controller.G36 and typChi
-           == Buildings.Templates.Components.Types.Chiller.WaterCooled));
+    annotation(Evaluate=true, Dialog(group="Configuration",
+      enable=typ == Buildings.Templates.Plants.Chillers.Types.Controller.G36 and
+      typChi == Buildings.Templates.Components.Types.Chiller.WaterCooled));
   parameter Integer nCoo(
     start=1,
     final min=0)=nChi
diff --git a/Buildings/Templates/Plants/Chillers/Components/Validation/RecordChillerGroup.mo b/Buildings/Templates/Plants/Chillers/Components/Validation/RecordChillerGroup.mo
index 042a07bd0d8..35ecc2c4315 100644
--- a/Buildings/Templates/Plants/Chillers/Components/Validation/RecordChillerGroup.mo
+++ b/Buildings/Templates/Plants/Chillers/Components/Validation/RecordChillerGroup.mo
@@ -43,8 +43,8 @@ It illustrates
 </p>
 <ul>
 <li>
-the manual propagation of the nominal value of the condenser cooling
-fluid temperature <code>TConEnt_nominal</code>
+the manual propagation of the nominal value of the condenser leaving temperature 
+<code>TConLvg_nominal</code>
 when redeclaring the performance data record <code>per</code>,
 </li>
 <li>
diff --git a/Buildings/Templates/Plants/Chillers/Components/Validation/RecordChillerGroupStructure.mo b/Buildings/Templates/Plants/Chillers/Components/Validation/RecordChillerGroupStructure.mo
deleted file mode 100644
index 66ac94e54ac..00000000000
--- a/Buildings/Templates/Plants/Chillers/Components/Validation/RecordChillerGroupStructure.mo
+++ /dev/null
@@ -1,78 +0,0 @@
-within Buildings.Templates.Plants.Chillers.Components.Validation;
-model RecordChillerGroupStructure
-  "Validation of chiller group record structure"
-  extends Modelica.Icons.Example;
-
-  record BaseChillerPerformanceData
-    "Simplified base class for performance data record"
-    parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal
-      "CHW mass flow rate";
-    constant Integer nCapFunT "Number of coefficients for capFunT"
-      annotation (Dialog(group="Performance curves"));
-    parameter Real capFunT[nCapFunT] "Biquadratic coefficients for capFunT"
-      annotation (Dialog(group="Performance curves"));
-  end BaseChillerPerformanceData;
-
-  record ChillerXXXPerformanceData
-    "Simplified performance data record"
-    extends BaseChillerPerformanceData(
-      nCapFunT=5,
-      capFunT=fill(1.9, 5),
-      mEva_flow_nominal=1);
-  end ChillerXXXPerformanceData;
-
-  record SingleChillerRecord
-    "Simplified data record for single chiller"
-    parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_nominal=30
-      "CHW mass flow rate - Each chiller";
-    replaceable parameter BaseChillerPerformanceData per
-      constrainedby BaseChillerPerformanceData(
-        mEva_flow_nominal=mChiWatChi_flow_nominal);
-  end SingleChillerRecord;
-
-  record ChillerGroupRecord
-    "Simplified data record for chiller group"
-    parameter Integer nChi=3
-      "Number of chillers";
-    parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_nominal[nChi]=fill(30, nChi)
-      "CHW mass flow rate - Each chiller";
-    replaceable parameter BaseChillerPerformanceData per[nChi]
-      constrainedby BaseChillerPerformanceData(
-        mEva_flow_nominal=mChiWatChi_flow_nominal);
-    final parameter SingleChillerRecord datChi[nChi](
-      final mChiWatChi_flow_nominal=mChiWatChi_flow_nominal,
-      final per=per);
-  end ChillerGroupRecord;
-
-  model ChillerGroup
-    "Simplified model of chiller group"
-    replaceable parameter ChillerGroupRecord rec
-      constrainedby ChillerGroupRecord;
-
-    parameter SingleChillerRecord recSin[rec.nChi](
-      mChiWatChi_flow_nominal=rec.mChiWatChi_flow_nominal,
-      per=rec.per);
-  initial equation
-    Modelica.Utilities.Streams.print("capFunT[5] = " + String(recSin[2].per.capFunT[5]));
-  end ChillerGroup;
-
-  ChillerGroupRecord rec(
-    nChi=2,
-    mChiWatChi_flow_nominal=fill(99, 2),
-    redeclare ChillerXXXPerformanceData per)
-    "Record instance for chiller group";
-
-  ChillerGroup mod(rec=rec)
-    "Model instance using record binding";
-
-  annotation (Documentation(info="<html>
-<p>
-This model validates the parameter structure implemented in
-<a href=\"modelica://Buildings.Templates.Plants.Chillers.Components.Data.ChillerGroup\">
-Buildings.Templates.Plants.Chillers.Components.Data.ChillerGroup</a>
-and used in the chiller group models within
-<a href=\"modelica://Buildings.Templates.Plants.Chillers.Components.ChillerGroups\">
-Buildings.Templates.Plants.Chillers.Components.ChillerGroups</a>.
-</p>
-</html>"));
-end RecordChillerGroupStructure;
diff --git a/Buildings/Templates/Plants/Chillers/Components/Validation/package.order b/Buildings/Templates/Plants/Chillers/Components/Validation/package.order
index 50a6d5c5f5f..2a415e2b6fc 100644
--- a/Buildings/Templates/Plants/Chillers/Components/Validation/package.order
+++ b/Buildings/Templates/Plants/Chillers/Components/Validation/package.order
@@ -5,5 +5,4 @@ ChillersToPrimaryPumpsSeries
 CoolerGroupCoolingTowerOpen
 Economizers
 RecordChillerGroup
-RecordChillerGroupStructure
 StagingMatrixComputation
diff --git a/Buildings/Templates/Plants/Chillers/Validation/WaterCooled.mo b/Buildings/Templates/Plants/Chillers/Validation/WaterCooled.mo
index 8ddc36085d0..78e0ef3ab08 100644
--- a/Buildings/Templates/Plants/Chillers/Validation/WaterCooled.mo
+++ b/Buildings/Templates/Plants/Chillers/Validation/WaterCooled.mo
@@ -63,10 +63,8 @@ model WaterCooled "Validation of water-cooled chiller plant template"
       have_senLevCoo=false))
     "Chiller plant"
     annotation (Placement(transformation(extent={{-80,-118},{-40,-78}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDum(
-    k=293.15,
-    y(final unit="K",
-      displayUnit="degC"))
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TAirSup(k=293.15, y(final
+        unit="K", displayUnit="degC"))
     "Placeholder signal for request generator"
     annotation (Placement(transformation(extent={{-180,150},{-160,170}})));
   Fluid.Sensors.RelativePressure dpChiWatRem[1](
@@ -146,10 +144,10 @@ equation
     annotation (Line(points={{90,-60},{110,-60}},color={0,127,255}));
   connect(loaChiWat.port_a, dpChiWatRem[1].port_a)
     annotation (Line(points={{70,-60},{60,-60},{60,-90}},color={0,127,255}));
-  connect(TDum.y, reqPlaRes.TAirSup)
-    annotation (Line(points={{-158,160},{120,160},{120,146},{112,146}}, color={0,0,127}));
-  connect(TDum.y, reqPlaRes.TAirSupSet)
-    annotation (Line(points={{-158,160},{120,160},{120,141},{112,141}}, color={0,0,127}));
+  connect(TAirSup.y, reqPlaRes.TAirSup) annotation (Line(points={{-158,160},{
+          120,160},{120,146},{112,146}}, color={0,0,127}));
+  connect(TAirSup.y, reqPlaRes.TAirSupSet) annotation (Line(points={{-158,160},
+          {120,160},{120,141},{112,141}}, color={0,0,127}));
   connect(busAirHan, pla.busAirHan[1])
     annotation (Line(points={{-40,140},{-40,-84}},color={255,204,51},thickness=0.5));
   connect(pla.bus, busPla)
diff --git a/Buildings/Templates/Plants/Chillers/Validation/WaterCooledOpenLoop.mo b/Buildings/Templates/Plants/Chillers/Validation/WaterCooledOpenLoop.mo
index cdc29276af8..8b5d8e72aaa 100644
--- a/Buildings/Templates/Plants/Chillers/Validation/WaterCooledOpenLoop.mo
+++ b/Buildings/Templates/Plants/Chillers/Validation/WaterCooledOpenLoop.mo
@@ -9,19 +9,12 @@ model WaterCooledOpenLoop
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "CW medium";
 
-  parameter Integer nChi=2
-    "Number of chillers"
-    annotation (Evaluate=true, Dialog(group="Configuration"));
-
   replaceable parameter
     Buildings.Templates.Plants.Chillers.Validation.UserProject.Data.AllSystemsWaterCooled
     datAll(pla(cfg=pla.cfg))
     "Design and operating parameters"
     annotation (Placement(transformation(extent={{70,70},{90,90}})));
 
-  parameter Modelica.Units.SI.Time tau=10
-    "Time constant at nominal flow"
-    annotation (Dialog(tab="Dynamics", group="Nominal condition"));
   parameter Modelica.Fluid.Types.Dynamics energyDynamics=
     Modelica.Fluid.Types.Dynamics.FixedInitial
     "Type of energy balance: dynamic (3 initialization options) or steady state"
@@ -44,25 +37,23 @@ model WaterCooledOpenLoop
     constrainedby Buildings.Templates.Plants.Chillers.Interfaces.PartialChilledWaterLoop(
       redeclare final package MediumChiWat = MediumChiWat,
       redeclare replaceable package MediumCon = MediumConWat,
+      nChi=2,
       chi(
         have_senTChiWatChiSup_select=true,
         have_senTChiWatChiRet=true,
         have_senTConWatChiSup=true,
         have_senTConWatChiRet_select=true),
-      final nChi=nChi,
       final energyDynamics=energyDynamics,
-      final tau=tau,
-      final dat=datAll.pla)
+      dat=datAll.pla)
     "CHW plant"
     annotation (Placement(transformation(extent={{-60,-30},{-20,10}})));
 
-  Fluid.Sources.Boundary_pT bou(
-    redeclare final package Medium=MediumChiWat,
-    p=200000,
-    T=Buildings.Templates.Data.Defaults.TChiWatRet,
-    nPorts=2)
+  Fluid.Sources.PropertySource_T proSou(use_T_in=true,
+    redeclare final package Medium=MediumChiWat)
     "Boundary conditions for CHW distribution system"
-    annotation (Placement(transformation(extent={{90,-30},{70,-10}})));
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={80,-20})));
 
   Buildings.Fluid.FixedResistances.PressureDrop res(
     redeclare final package Medium = MediumChiWat,
@@ -88,22 +79,26 @@ model WaterCooledOpenLoop
     final m_flow_nominal=sum(datAll.pla.chi.mChiWatChi_flow_nominal))
     "CHW volume flow rate"
     annotation (Placement(transformation(extent={{60,-50},{40,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRetPre(k=pla.TChiWatRet_nominal)
+    "Prescribed CHW return temperatue"
+    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
 equation
-  connect(res.port_b, bou.ports[1])
-    annotation (Line(points={{40,0},{70,0},{70,-21}},      color={0,127,255}));
   connect(weaDat.weaBus,pla. busWea) annotation (Line(
       points={{-70,80},{-40,80},{-40,10}},
       color={255,204,51},
       thickness=0.5));
   connect(pla.port_b, res.port_a)
-    annotation (Line(points={{-19.8,-10},{0,-10},{0,0},{20,0}},
-                                               color={0,127,255}));
+    annotation (Line(points={{-19.8,-10},{0,-10},{0,0},{20,0}}, color={0,127,255}));
   connect(pla.port_a, TChiWatRet.port_b) annotation (Line(points={{-19.8,-20},{
           0,-20},{0,-40},{10,-40}}, color={0,127,255}));
   connect(TChiWatRet.port_a, VChiWat_flow.port_b)
     annotation (Line(points={{30,-40},{40,-40}}, color={0,127,255}));
-  connect(VChiWat_flow.port_a, bou.ports[2])
-    annotation (Line(points={{60,-40},{70,-40},{70,-19}}, color={0,127,255}));
+  connect(res.port_b, proSou.port_a)
+    annotation (Line(points={{40,0},{80,0},{80,-10}}, color={0,127,255}));
+  connect(VChiWat_flow.port_a, proSou.port_b)
+    annotation (Line(points={{60,-40},{80,-40},{80,-30}}, color={0,127,255}));
+  connect(TChiWatRetPre.y, proSou.T_in) annotation (Line(points={{-68,40},{60,40},
+          {60,-16},{68,-16}}, color={0,0,127}));
   annotation (
   experiment(
     StartTime=19612800,