reverted unnecessary changes

lbl-srg · Nov 10, 2023 · 4ae7004 · 4ae7004
1 parent 1186542
commit 4ae7004
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/Buildings/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo b/Buildings/ThermalZones/Detailed/BaseClasses/PartialSurfaceInterface.mo
@@ -35,7 +35,8 @@ partial model PartialSurfaceInterface
                               annotation (Placement(transformation(extent={{231,
             -230},{251,-210}})));
 protected
-  final parameter Modelica.Units.SI.Area AConExt[NConExt] = datConExt.A
+  final parameter String instanceName = getInstanceName() "Name of the instance";
+  final parameter Modelica.Units.SI.Area AConExt[NConExt]=datConExt.A
     "Areas of exterior constructions";
   final parameter Modelica.Units.SI.Area AConExtWinOpa[NConExtWin]=datConExtWin.AOpa
     "Opaque areas of exterior construction that have a window";
@@ -76,11 +77,11 @@ Check the parameters of the room model.");
     end if;
   end checkSurfaceAreas;
 initial algorithm
-  checkSurfaceAreas(nConExt,    datConExt.A,       "datConExt");
-  checkSurfaceAreas(nConExtWin, datConExtWin.AWin, "datConExtWin");
-  checkSurfaceAreas(nConPar,    datConPar.A,       "datConPar");
-  checkSurfaceAreas(nConBou,    datConBou.A,       "datConBou");
-  checkSurfaceAreas(nSurBou,    surBou.A,          "surBou");
+  checkSurfaceAreas(nConExt,    datConExt.A,       instanceName + ".datConExt");
+  checkSurfaceAreas(nConExtWin, datConExtWin.AWin, instanceName + ".datConExtWin");
+  checkSurfaceAreas(nConPar,    datConPar.A,       instanceName + ".datConPar");
+  checkSurfaceAreas(nConBou,    datConBou.A,       instanceName + ".datConBou");
+  checkSurfaceAreas(nSurBou,    surBou.A,          instanceName + ".surBou");
   annotation (Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-240,
             -240},{240,240}}),
                       graphics), Icon(coordinateSystem(preserveAspectRatio=true,

diff --git a/Buildings/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo b/Buildings/ThermalZones/Detailed/Examples/ElectroChromicWindow.mo
@@ -234,7 +234,7 @@ equation
       extent={{-6,3},{-6,3}}));
   connect(roo.heaPorAir, TRooAir.port)
     annotation (Line(points={{81,4},{94,4},{108,4},{110,4}}, color={191,0,0}));
-  connect(TRooAir.T, conWin.T) annotation (Line(points={{131,4},{134,4},{134,30},
+  connect(TRooAir.T, conWin.T) annotation (Line(points={{130,4},{134,4},{134,30},
           {-10,30},{-10,14},{-1.5,14}}, color={0,0,127}));
   connect(conWin.H, weaBus.HGloHor) annotation (Line(points={{-1.5,6},{-12,6},{-12,
           34},{150,34},{150,20}}, color={0,0,127}));

diff --git a/Buildings/ThermalZones/Detailed/Examples/FFD/NaturalConvectionWithControl.mo b/Buildings/ThermalZones/Detailed/Examples/FFD/NaturalConvectionWithControl.mo
@@ -9,40 +9,39 @@ model NaturalConvectionWithControl
         cfdFilNam = "modelica://Buildings/Resources/Data/ThermalZones/Detailed/Examples/FFD/NaturalConvectionWithControl.ffd",
         massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial));
 
-  HeatTransfer.Sources.PrescribedHeatFlow preHeatFlo "Prescribed heat flow rate"
+  HeatTransfer.Sources.PrescribedHeatFlow preHeatFlo
     annotation (Placement(transformation(extent={{30,-10},{50,10}})));
-  Buildings.Controls.OBC.CDL.Reals.PID conPID(
+  Buildings.Controls.Continuous.LimPID conPID(
     yMin=0,
     Ti=120,
     k=1,
+    yMax=2,
     u_m(final unit="K", displayUnit="degC"),
-    u_s(final unit="K", displayUnit="degC"),
-    yMax=2) "PI controller"
+    u_s(final unit="K", displayUnit="degC"))
     annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
+        extent={{-10,10},{10,-10}},
         rotation=180,
-        origin={-10,60})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSet(
-    k(final unit="K", displayUnit="degC")=275.15) "Temperature set point"
+        origin={50,50})));
+  Modelica.Blocks.Sources.Constant TSet(k(final unit="K", displayUnit="degC")=275.15) "Temperature set point"
     annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
+        extent={{-10,10},{10,-10}},
         rotation=180,
-        origin={-50,60})));
+        origin={90,50})));
 equation
   connect(roo.yCFD[1], conPID.u_m) annotation (Line(
-      points={{101,-26},{110,-26},{110,20},{-10,20},{-10,48}},
+      points={{101,-26},{100,-26},{100,-26},{110,-26},{110,20},{50,20},{50,38}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(TSet.y, conPID.u_s) annotation (Line(
-      points={{-38,60},{-22,60}},
+      points={{79,50},{62,50}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(preHeatFlo.port, roo.heaPorAir) annotation (Line(
       points={{50,0},{76,0},{76,-38},{79,-38}},
       color={191,0,0},
       smooth=Smooth.None));
   connect(conPID.y, preHeatFlo.Q_flow) annotation (Line(
-      points={{2,60},{20,60},{20,0},{30,0}},
+      points={{39,50},{20,50},{20,0},{30,0}},
       color={0,0,127},
       smooth=Smooth.None));
   annotation (