lbl-srg · mwetter · Apr 21, 2022 · Apr 21, 2022 · Apr 21, 2022 · Apr 21, 2022
diff --git a/...ngs/Obsolete/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo b/...ngs/Obsolete/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo
@@ -25,7 +25,7 @@ model FMUZoneAdapterZones1
     final zoneName="Core_ZN",
     usePrecompiledFMU=true,
     final fmuName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones1.fmu"),
+      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones1.fmu"),
     logLevel=building.logLevel,
     setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)

diff --git a/...ngs/Obsolete/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo b/...ngs/Obsolete/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo
@@ -26,7 +26,7 @@ model FMUZoneAdapterZones2
     final zoneName="Core_ZN",
     usePrecompiledFMU=true,
     final fmuName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
+      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
     setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
@@ -70,7 +70,7 @@ model FMUZoneAdapterZones2
     final zoneName="South_ZN",
     usePrecompiledFMU=true,
     final fmuName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
+      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
     setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)

diff --git a/...ngs/Obsolete/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo b/...ngs/Obsolete/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo
@@ -26,7 +26,7 @@ model FMUZoneAdapterZones3
     final zoneName="Core_ZN",
     usePrecompiledFMU=true,
     final fmuName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
+      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
     setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
@@ -70,7 +70,7 @@ model FMUZoneAdapterZones3
     final zoneName="South_ZN",
     usePrecompiledFMU=true,
     final fmuName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
+      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
     setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
@@ -94,7 +94,7 @@ model FMUZoneAdapterZones3
     final zoneName="North_ZN",
     usePrecompiledFMU=true,
     final fmuName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus/FMUs/Zones3.fmu"),
+      "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
     setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)

diff --git a/Buildings/Obsolete/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo b/Buildings/Obsolete/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo
@@ -395,8 +395,8 @@ equation
           textString="phi"),
         Text(
           extent={{-56,-48},{-20,-68}},
-          textString="rad",
-          textColor={0,0,0}),            Rectangle(
+          textString="rad"),
+        Rectangle(
           extent={{-204,204},{204,-204}},
           lineColor={255,0,0},
           pattern=LinePattern.Dash,
@@ -546,6 +546,10 @@ is not possible.
       revisions="<html>
 <ul>
 <li>
+September 17, 2025, by Michael Wetter:<br/>
+Corrected graphical annotation for <code>Text</code>.
+</li>
+<li>
 March 22, 2024, by Michael Wetter:<br/>
 Changed radiative heat flow rate sent to EnergyPlus to be the average over the last
 synchronization time step rather than the instantaneuous value, and set the initial value by default to zero.

diff --git a/...te/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ZoneSurfaces.mo b/...te/ThermalZones/EnergyPlus_9_6_0/Validation/SurfaceComparison/BaseClasses/ZoneSurfaces.mo
@@ -91,12 +91,6 @@ First implementation.
 </li>
 </ul>
 </html>"),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus/Validation/SurfaceComparison/ZoneSurfaces.mos"
-        "Simulate and Plot", file="../test.mos" "test"),
-    experiment(
-      StopTime=2592000,
-      Tolerance=1e-06),
     Diagram(coordinateSystem(extent={{-100,-100},{100,100}})),
     Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
 end ZoneSurfaces;
diff --git a/Buildings/Resources/C-Sources/EnergyPlus_24_2_0_Wrapper.c b/Buildings/Resources/C-Sources/EnergyPlus_24_2_0_Wrapper.c
@@ -36,14 +36,15 @@ void* allocate_Modelica_EnergyPlus_24_2_0(
   const char* idfVersion,
   const char* idfName,
   const char* epwName,
+  const char* epName,
+  const char* hvacZone,
   int runPeriod_dayOfWeekForStartDay,
   int runPeriod_applyWeekEndHolidayRule,
   int runPeriod_use_weatherFileDaylightSavingPeriod,
   int runPeriod_use_weatherFileHolidaysAndSpecialDays,
   int runPeriod_use_weatherFileRainIndicators,
   int runPeriod_use_weatherFileSnowIndicators,
   double relativeSurfaceTolerance,
-  const char* epName,
   int usePrecompiledFMU,
   const char* fmuName,
   const char* buildingsRootFileLocation,
@@ -88,9 +89,10 @@ void* allocate_Modelica_EnergyPlus_24_2_0(
       idfVersion,
       idfName,
       epwName,
+      epName,
+      hvacZone,
       &runPer,
       relativeSurfaceTolerance,
-      epName,
       usePrecompiledFMU,
       fmuName,
       buildingsRootFileLocation,

diff --git a/Buildings/Resources/C-Sources/EnergyPlus_24_2_0_Wrapper.h b/Buildings/Resources/C-Sources/EnergyPlus_24_2_0_Wrapper.h
@@ -49,9 +49,10 @@ extern void* allocate_Spawn_EnergyPlus_24_2_0(
   const char* idfVersion,
   const char* idfName,
   const char* epwName,
+  const char* epName,
+  const char* hvacZone,
   const runPeriod* runPer,
   double relativeSurfaceTolerance,
-  const char* epName,
   int usePrecompiledFMU,
   const char* fmuName,
   const char* buildingsRootFileLocation,

diff --git a/...Zones/EnergyPlus_24_2_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf b/...Zones/EnergyPlus_24_2_0/Examples/RefBldgSmallOffice/RefBldgSmallOfficeNew2004_Chicago.idf
@@ -4022,9 +4022,9 @@
     Temperature,             !- Schedule Type Limits Name
     Through: 12/31,          !- Field 1
     For: Weekdays SummerDesignDay, !- Field 2
-    Until: 06:00,80.0,       !- Field 3
-    Until: 22:00,80.0,       !- Field 5
-    Until: 24:00,80.0,       !- Field 7
+    Until: 06:00,24.0,       !- Field 3
+    Until: 22:00,24.0,       !- Field 5
+    Until: 24:00,24.0,       !- Field 7
     For: Saturday,           !- Field 9
     Until: 06:00,80.0,       !- Field 10
     Until: 18:00,80.0,       !- Field 12