From fa54349bb288dbf76eb82c178fff88bd22b5c225 Mon Sep 17 00:00:00 2001
From: jayhulbl <JianjunHu@lbl.gov>
Date: Mon, 28 Jun 2021 16:03:23 -0700
Subject: [PATCH] corrected declarations #2555, #2556

---
 .../Constructions/Examples/ExteriorWallTwoWindows.mo         | 5 +++--
 .../Constructions/Examples/ExteriorWallWithWindow.mo         | 2 ++
 .../ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo    | 2 +-
 .../Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo        | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Buildings/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo b/Buildings/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo
index f3178a1a56a..c47cea340aa 100644
--- a/Buildings/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo
+++ b/Buildings/ThermalZones/Detailed/Constructions/Examples/ExteriorWallTwoWindows.mo
@@ -11,6 +11,8 @@ model ExteriorWallTwoWindows
     "Heat transfer area of frame and window";
   parameter Real fFra[:]={0.1, 0.1}
     "Fraction of window frame divided by total window area";
+  final parameter Modelica.SIunits.Area AFra[:]= fFra .* AWin "Frame area";
+  final parameter Modelica.SIunits.Area AGla[:] = AWin .- AFra "Glass area";
 
   parameter Boolean linearizeRadiation = false
     "Set to true to linearize emissive power";
@@ -91,8 +93,7 @@ model ExteriorWallTwoWindows
     annotation (Placement(transformation(extent={{-122,-58},{-102,-38}})));
   Modelica.Blocks.Routing.Replicator replicator(nout=nCon)
     annotation (Placement(transformation(extent={{-160,-42},{-140,-22}})));
-  Modelica.Thermal.HeatTransfer.Components.ThermalCollector theCol3(
-                                                                   m=2)
+  Modelica.Thermal.HeatTransfer.Components.ThermalCollector theCol3(m=2)
     "Thermal collector to link a vector of models to a single model"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
diff --git a/Buildings/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo b/Buildings/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo
index e6bc1cf5303..e3030f634d5 100644
--- a/Buildings/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo
+++ b/Buildings/ThermalZones/Detailed/Constructions/Examples/ExteriorWallWithWindow.mo
@@ -9,6 +9,8 @@ model ExteriorWallWithWindow "Test model for an exterior wall with a window"
     "Heat transfer area of frame and window";
   parameter Real fFra=0.1
     "Fraction of window frame divided by total window area";
+  final parameter Modelica.SIunits.Area AFra = fFra * AWin "Frame area";
+  final parameter Modelica.SIunits.Area AGla = AWin-AFra "Glass area";
   parameter Boolean linearizeRadiation = false
     "Set to true to linearize emissive power";
   parameter HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear glaSys(
diff --git a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo
index 696ebec42eb..9b6b8fee7e9 100644
--- a/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo
+++ b/Buildings/ThermalZones/Detailed/FLEXLAB/Rooms/X3B/Electrical.mo
@@ -25,7 +25,7 @@ model Electrical "Model of the electrical room attached to test cell X3A"
      til = {Buildings.Types.Tilt.Floor},
      azi = {Buildings.Types.Azimuth.N},
      stateAtSurface_a = {false}));
-  replaceable
+  replaceable parameter
     Data.Constructions.OpaqueConstructions.ExteriorConstructions.Construction3
     eleExt "Construction describing the exterior walls in the electrical room"
     annotation (Placement(transformation(extent={{430,-210},{450,-190}})));
diff --git a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo
index 3d24a5d16e1..afce1ad39ae 100644
--- a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo
+++ b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases6xx/Case600FF.mo
@@ -148,7 +148,7 @@ model Case600FF
         d=950,
         nStaRef=nStaRef)}) "Roof"
     annotation (Placement(transformation(extent={{60,84},{74,98}})));
-  Buildings.ThermalZones.Detailed.Validation.BESTEST.Data.Win600 window600(
+  parameter Buildings.ThermalZones.Detailed.Validation.BESTEST.Data.Win600 window600(
     UFra=3,
     haveExteriorShade=false,
     haveInteriorShade=false) "Window"