corrected declarations #2555, #2556

lbl-srg · Jun 28, 2021 · fa54349 · fa54349
1 parent dbc2c36
commit fa54349
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"