From 1e1f16dc505dce933126393fa362c3f64fa0f255 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Mon, 9 Dec 2024 05:32:04 -0800
Subject: [PATCH] Issue4069 occupants (#4073)

* Refactored Buildings.Occupants

For #4069
---
 .../Validation/BinaryVariableGeneration.mo    | 24 +++++--
 .../ExponentialVariableGeneration.mo          | 22 ++++--
 .../BaseClasses/Validation/Linear1D.mo        | 25 +++++--
 .../BaseClasses/Validation/Logit1D.mo         | 24 +++++--
 .../Validation/Logit1DQuadratic.mo            | 24 +++++--
 .../BaseClasses/Validation/Logit2D.mo         | 25 +++++--
 .../BaseClasses/Validation/Weibull1DOFF.mo    | 25 +++++--
 .../BaseClasses/Validation/Weibull1DON.mo     | 24 +++++--
 .../Validation/WeibullVariableGeneration.mo   | 22 ++++--
 .../BaseClasses/binaryVariableGeneration.mo   | 16 +++--
 .../exponentialVariableGeneration.mo          | 18 +++--
 Buildings/Occupants/BaseClasses/linear1D.mo   | 15 +++-
 Buildings/Occupants/BaseClasses/logit1D.mo    | 15 +++-
 .../Occupants/BaseClasses/logit1DQuadratic.mo | 15 +++-
 Buildings/Occupants/BaseClasses/logit2D.mo    | 15 +++-
 Buildings/Occupants/BaseClasses/package.mo    |  6 +-
 .../Occupants/BaseClasses/weibull1DOFF.mo     | 29 +++++---
 .../Occupants/BaseClasses/weibull1DON.mo      | 33 ++++++---
 .../BaseClasses/weibullVariableGeneration.mo  | 18 +++--
 .../Office/Blinds/Haldi2008BlindsTIn.mo       | 25 +++++--
 .../Office/Blinds/Haldi2008BlindsTOut.mo      | 25 +++++--
 .../Inkarojrit2008BlindsSolarIntensity.mo     | 25 +++++--
 .../Blinds/Newsham1994BlindsSolarIntensity.mo |  6 ++
 .../Blinds/Zhang2012BlindsSolarAltitude.mo    | 32 ++++++---
 .../Blinds/Zhang2012BlindsSolarIntensity.mo   | 33 ++++++---
 .../Office/Lighting/Gunay2016Light.mo         | 27 +++++--
 .../Office/Lighting/Hunt1979Light.mo          | 19 +++--
 .../Office/Lighting/Love1998Light1.mo         | 25 +++++--
 .../Office/Lighting/Love1998Light2.mo         | 27 +++++--
 .../Office/Lighting/Reinhart2003Light.mo      | 27 +++++--
 .../Office/Occupancy/Wang2005Occupancy.mo     | 50 +++++++------
 .../Office/Windows/Haldi2008WindowsTIn.mo     | 39 +++++++----
 .../Office/Windows/Haldi2008WindowsTOut.mo    | 39 +++++++----
 .../Office/Windows/Haldi2009WindowsTInTout.mo | 44 ++++++++----
 .../Herkel2008WindowsCompletelyOpen.mo        | 45 ++++++++----
 .../Office/Windows/Herkel2008WindowsSmall.mo  | 43 ++++++++----
 .../Windows/Herkel2008WindowsTiltedOpen.mo    | 45 ++++++++----
 .../Windows/Rijal2007WindowsTInTOutTComf.mo   | 55 +++++++++------
 .../Office/Windows/Yun2008WindowsTIn.mo       | 39 +++++++----
 .../Office/Windows/Yun2008WindowsTOut.mo      | 40 +++++++----
 .../Office/Windows/Zhang2012WindowsAll.mo     | 39 +++++++----
 .../Office/Windows/Zhang2012WindowsEast.mo    | 39 +++++++----
 .../Office/Windows/Zhang2012WindowsNorth.mo   | 41 +++++++----
 .../Office/Windows/Zhang2012WindowsSouth.mo   | 39 +++++++----
 .../Office/Windows/Zhang2012WindowsWest.mo    | 41 +++++++----
 .../AirConditioning/Ren2014ACBedroom.mo       | 63 +++++++++++------
 .../AirConditioning/Ren2014ACLivingroom.mo    | 63 +++++++++++------
 .../Validation/Ren2014ACBedroom.mo            |  4 +-
 .../Residential/Heating/Nicol2001HeatingEU.mo | 28 ++++++--
 .../Heating/Nicol2001HeatingPakistan.mo       | 27 +++++--
 .../Residential/Heating/Nicol2001HeatingUK.mo | 27 +++++--
 .../Residential/Windows/Nicol2001WindowsEU.mo | 29 ++++++--
 .../Windows/Nicol2001WindowsPakistan.mo       | 29 ++++++--
 .../Residential/Windows/Nicol2001WindowsUK.mo | 29 ++++++--
 ...es_Validation_BinaryVariableGeneration.txt |  4 +-
 ...lidation_ExponentialVariableGeneration.txt |  4 +-
 ...upants_BaseClasses_Validation_Linear1D.txt |  4 +-
 ...cupants_BaseClasses_Validation_Logit1D.txt |  4 +-
 ...aseClasses_Validation_Logit1DQuadratic.txt |  4 +-
 ...cupants_BaseClasses_Validation_Logit2D.txt |  4 +-
 ...ts_BaseClasses_Validation_Weibull1DOFF.txt |  4 +-
 ...nts_BaseClasses_Validation_Weibull1DON.txt |  4 +-
 ...s_Validation_WeibullVariableGeneration.txt |  4 +-
 ...e_Blinds_Validation_Haldi2008BlindsTIn.txt |  8 +--
 ..._Blinds_Validation_Haldi2008BlindsTOut.txt |  8 +--
 ...ion_Inkarojrit2008BlindsSolarIntensity.txt |  8 +--
 ...alidation_Zhang2012BlindsSolarAltitude.txt |  8 +--
 ...lidation_Zhang2012BlindsSolarIntensity.txt | 10 +--
 ...ice_Lighting_Validation_Gunay2016Light.txt |  8 +--
 ...fice_Lighting_Validation_Hunt1979Light.txt |  8 +--
 ..._Lighting_Validation_Reinhart2003Light.txt |  8 +--
 ...Occupancy_Validation_Wang2005Occupancy.txt |  4 +-
 ...Windows_Validation_Haldi2008WindowsTIn.txt |  8 +--
 ...indows_Validation_Haldi2008WindowsTOut.txt |  6 +-
 ...ows_Validation_Haldi2009WindowsTInTout.txt |  6 +-
 ...dation_Herkel2008WindowsCompletelyOpen.txt |  6 +-
 ...dows_Validation_Herkel2008WindowsSmall.txt |  6 +-
 ...Validation_Herkel2008WindowsTiltedOpen.txt |  6 +-
 ...alidation_Rijal2007WindowsTInTOutTComf.txt |  8 +--
 ...e_Windows_Validation_Yun2008WindowsTIn.txt |  8 +--
 ..._Windows_Validation_Yun2008WindowsTOut.txt |  6 +-
 ...Windows_Validation_Zhang2012WindowsAll.txt |  6 +-
 ...indows_Validation_Zhang2012WindowsEast.txt |  6 +-
 ...ndows_Validation_Zhang2012WindowsNorth.txt |  6 +-
 ...ndows_Validation_Zhang2012WindowsSouth.txt |  6 +-
 ...indows_Validation_Zhang2012WindowsWest.txt |  6 +-
 ..._Heating_Validation_Nicol2001HeatingEU.txt |  6 +-
 ..._Heating_Validation_Nicol2001HeatingUK.txt |  6 +-
 ..._Windows_Validation_Nicol2001WindowsEU.txt |  6 +-
 ...ws_Validation_Nicol2001WindowsPakistan.txt |  6 +-
 ..._Windows_Validation_Nicol2001WindowsUK.txt |  6 +-
 .../ConvertBuildings_from_11_to_12.0.0.mos    | 70 +++++++++++++++++++
 .../UsersGuide/ReleaseNotes/Version_12_0_0.mo | 26 +++++++
 93 files changed, 1368 insertions(+), 557 deletions(-)

diff --git a/Buildings/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo b/Buildings/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo
index 4243c54cd0b..d80c900c2d1 100644
--- a/Buildings/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/BinaryVariableGeneration.mo
@@ -2,24 +2,32 @@ within Buildings.Occupants.BaseClasses.Validation;
 model BinaryVariableGeneration "Test model for binary variable generation function"
   extends Modelica.Icons.Example;
 
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   Real p "Time-varying real number as input";
   output Real y "Output";
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean r "Return value of random number generator";
 
 initial equation
   y = 0;
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+  r = false;
 
 equation
   p = time;
   when sample(0, 0.1) then
-    curSeed = seed*1E6*time;
-    if Buildings.Occupants.BaseClasses.binaryVariableGeneration(p, globalSeed=integer(curSeed)) then
+    (r, state) = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p, pre(state));
+    if r then
       y = 1;
     else
       y = 0;
@@ -37,6 +45,12 @@ Buildings.Occupants.BaseClasses.binaryVariableGeneration</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo b/Buildings/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo
index 27e8cb6a8cf..827310d47fb 100644
--- a/Buildings/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/ExponentialVariableGeneration.mo
@@ -2,24 +2,30 @@ within Buildings.Occupants.BaseClasses.Validation;
 model ExponentialVariableGeneration "Test model for exponential variable generation function"
   extends Modelica.Icons.Example;
 
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   Real mu "Time-varying real number as input";
   output Real y "Output";
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
 
 initial equation
   y = 0;
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
 
 equation
   mu = 10*time;
   when sample(0, 0.1) then
-    curSeed = seed*1E6*time;
-    y = Buildings.Occupants.BaseClasses.exponentialVariableGeneration(mu, globalSeed=integer(curSeed));
+    (y, state) = Buildings.Occupants.BaseClasses.exponentialVariableGeneration(mu, pre(state));
   end when;
 
   annotation ( experiment(Tolerance=1e-6, StopTime=1.0),
@@ -33,6 +39,12 @@ Buildings.Occupants.BaseClasses.exponentialVariableGeneration</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/Validation/Linear1D.mo b/Buildings/Occupants/BaseClasses/Validation/Linear1D.mo
index f63279c7256..3b1fb4fd052 100644
--- a/Buildings/Occupants/BaseClasses/Validation/Linear1D.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/Linear1D.mo
@@ -2,7 +2,10 @@ within Buildings.Occupants.BaseClasses.Validation;
 model Linear1D "Test model for 1D binary variable generation function"
   extends Modelica.Icons.Example;
 
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Real A = 0.9 "Parameter A";
   parameter Real B = 0 "Parameter B";
   Real x "Time-varying real number as input";
@@ -10,18 +13,24 @@ model Linear1D "Test model for 1D binary variable generation function"
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean r "Return value of random number generator";
 
 initial equation
   y = 0;
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+  r = false;
+
 
 equation
   x = time;
   when sample(0, 0.1) then
-    curSeed = seed*1E6*time;
-    if Buildings.Occupants.BaseClasses.linear1D(x,A,B,globalSeed=integer(curSeed)) then
+    (r, state) = Buildings.Occupants.BaseClasses.linear1D(x, A, B, pre(state));
+    if r then
       y = 1;
     else
       y = 0;
@@ -39,6 +48,12 @@ Buildings.Occupants.BaseClasses.linear1D</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/Validation/Logit1D.mo b/Buildings/Occupants/BaseClasses/Validation/Logit1D.mo
index 20b778e3b15..65c06df17cb 100644
--- a/Buildings/Occupants/BaseClasses/Validation/Logit1D.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/Logit1D.mo
@@ -2,7 +2,10 @@ within Buildings.Occupants.BaseClasses.Validation;
 model Logit1D "Test model for 1D binary variable generation function"
  extends Modelica.Icons.Example;
 
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Real A = 0.9 "Parameter A";
   parameter Real B = 0 "Parameter B";
   Real x "Time-varying real number as input";
@@ -10,18 +13,23 @@ model Logit1D "Test model for 1D binary variable generation function"
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean r "Return value of random number generator";
 
 initial equation
   y = 0;
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+  r = false;
 
 equation
   x = time;
   when sample(0, 0.1) then
-    curSeed = seed*1E6*time;
-    if Buildings.Occupants.BaseClasses.logit1D(x,A,B,globalSeed=integer(curSeed)) then
+    (r, state) = Buildings.Occupants.BaseClasses.logit1D(x, A, B, pre(state));
+    if r then
       y = 1;
     else
       y = 0;
@@ -39,6 +47,12 @@ Buildings.Occupants.BaseClasses.logit1D</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo b/Buildings/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo
index 251bd99bc59..7f953fea06c 100644
--- a/Buildings/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/Logit1DQuadratic.mo
@@ -2,7 +2,10 @@ within Buildings.Occupants.BaseClasses.Validation;
 model Logit1DQuadratic "Test model for 1D binary variable generation function"
  extends Modelica.Icons.Example;
 
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Real A = 0.1 "Parameter A";
   parameter Real B = 0.5 "Parameter B";
   parameter Real C = 1.3 "Parameter A";
@@ -12,18 +15,23 @@ model Logit1DQuadratic "Test model for 1D binary variable generation function"
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean r "Return value of random number generator";
 
 initial equation
   y = 0;
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+  r = false;
 
 equation
   x = time+1;
   when sample(0, 0.1) then
-    curSeed = seed*1E6*time;
-    if Buildings.Occupants.BaseClasses.logit1DQuadratic(x,A,B,C,D,globalSeed=integer(curSeed)) then
+    (r, state) = Buildings.Occupants.BaseClasses.logit1DQuadratic(x, A, B, C, D, pre(state));
+    if r then
       y = 1;
     else
       y = 0;
@@ -41,6 +49,12 @@ Buildings.Occupants.BaseClasses.logit1DQuadratic</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/Validation/Logit2D.mo b/Buildings/Occupants/BaseClasses/Validation/Logit2D.mo
index c3aea882e87..fbaef1ef39d 100644
--- a/Buildings/Occupants/BaseClasses/Validation/Logit2D.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/Logit2D.mo
@@ -2,7 +2,10 @@ within Buildings.Occupants.BaseClasses.Validation;
 model Logit2D "Test model for 2D binary variable generation function"
     extends Modelica.Icons.Example;
 
-    parameter Integer seed = 5 "Seed for the random number generator";
+    parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
     parameter Real A = 0.9 "Parameter A";
     parameter Real B = 1.3 "Parameter B";
     parameter Real C = 0 "Parameter C";
@@ -12,19 +15,25 @@ model Logit2D "Test model for 2D binary variable generation function"
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-    Real curSeed "Current value for seed as a real-valued variable";
+    Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean r "Return value of random number generator";
 
 initial equation
     y = 0;
     t0 = time;
-    curSeed = t0*seed;
+    state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed);
+    r = false;
+
 
 equation
     x1 = time;
     x2 = 0.7*time;
     when sample(0, 0.1) then
-      curSeed = seed*1E6*time;
-      if Buildings.Occupants.BaseClasses.logit2D(x1,x2,A,B,C,globalSeed=integer(curSeed)) then
+      (r, state) = Buildings.Occupants.BaseClasses.logit2D(x1, x2, A, B, C, pre(state));
+      if r then
         y = 1;
       else
        y = 0;
@@ -42,6 +51,12 @@ Buildings.Occupants.BaseClasses.logit2D</a>.
 </html>",   revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/Validation/Weibull1DOFF.mo b/Buildings/Occupants/BaseClasses/Validation/Weibull1DOFF.mo
index 0e0d3925512..517ac230a82 100644
--- a/Buildings/Occupants/BaseClasses/Validation/Weibull1DOFF.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/Weibull1DOFF.mo
@@ -2,7 +2,10 @@ within Buildings.Occupants.BaseClasses.Validation;
 model Weibull1DOFF "Test model for 1D binary variable generation function"
   extends Modelica.Icons.Example;
 
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Real u=1.0 "Parameter defining the Weibull distribution threshold";
   parameter Real L=0.5 "Parameter defining the Weibull distribution normalization factor";
   parameter Real k=1.0 "Parameter defining the Weibull distribution shape factor";
@@ -13,18 +16,24 @@ model Weibull1DOFF "Test model for 1D binary variable generation function"
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean r "Return value of random number generator";
 
 initial equation
   y = 0;
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+  r = false;
+
 
 equation
   x = time;
   when sample(0, 0.1) then
-    curSeed = seed*1E6*time;
-    if Buildings.Occupants.BaseClasses.weibull1DOFF(x,u,L,k,dt,globalSeed=integer(curSeed)) then
+    (r, state) = Buildings.Occupants.BaseClasses.weibull1DOFF(x, u, L, k, dt, pre(state));
+    if r then
       y = 1;
     else
       y = 0;
@@ -42,6 +51,12 @@ Buildings.Occupants.BaseClasses.weibull1DOFF</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/Validation/Weibull1DON.mo b/Buildings/Occupants/BaseClasses/Validation/Weibull1DON.mo
index e16a08f8152..a9c38c455f5 100644
--- a/Buildings/Occupants/BaseClasses/Validation/Weibull1DON.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/Weibull1DON.mo
@@ -2,7 +2,10 @@ within Buildings.Occupants.BaseClasses.Validation;
 model Weibull1DON "Test model for 1D binary variable generation function"
     extends Modelica.Icons.Example;
 
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Real u=0.2 "Parameter defining the Weibull distribution threshold";
   parameter Real L=0.1 "Parameter defining the Weibull distribution normalization factor";
   parameter Real k=1.0 "Parameter defining the Weibull distribution shape factor";
@@ -13,18 +16,23 @@ model Weibull1DON "Test model for 1D binary variable generation function"
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean r "Return value of random number generator";
 
 initial equation
   y = 0;
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+  r = false;
 
 equation
   x = time;
   when sample(0, 0.1) then
-    curSeed = seed*1E6*time;
-    if Buildings.Occupants.BaseClasses.weibull1DON(x,u,L,k,dt,globalSeed=integer(curSeed)) then
+    (r, state) = Buildings.Occupants.BaseClasses.weibull1DON(x, u, L, k, dt, pre(state));
+    if r then
       y = 1;
     else
       y = 0;
@@ -42,6 +50,12 @@ Buildings.Occupants.BaseClasses.weibull1DON</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo b/Buildings/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo
index b407e06164a..59fb3efb8a9 100644
--- a/Buildings/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo
+++ b/Buildings/Occupants/BaseClasses/Validation/WeibullVariableGeneration.mo
@@ -2,7 +2,10 @@ within Buildings.Occupants.BaseClasses.Validation;
 model WeibullVariableGeneration "Test model for real variable generation function"
   extends Modelica.Icons.Example;
 
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 10
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Real lambda=10 "Time step length";
 
   Real k "Time-varying real number as input";
@@ -11,18 +14,21 @@ model WeibullVariableGeneration "Test model for real variable generation functio
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
 
 initial equation
   y = 0;
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
 
 equation
   k = (time+1);
   when sample(0, 0.1) then
-    curSeed = seed*1E6*time;
-    y = Buildings.Occupants.BaseClasses.weibullVariableGeneration(lambda,k,globalSeed=integer(curSeed));
+    (y, state) = Buildings.Occupants.BaseClasses.weibullVariableGeneration(lambda, k, pre(state));
   end when;
 
   annotation ( experiment(Tolerance=1e-6, StopTime=1.0),
@@ -36,6 +42,12 @@ Buildings.Occupants.BaseClasses.weibullVariableGeneration</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 September 5, 2018 by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/binaryVariableGeneration.mo b/Buildings/Occupants/BaseClasses/binaryVariableGeneration.mo
index 0e2f8fbc581..94e01a4b24c 100644
--- a/Buildings/Occupants/BaseClasses/binaryVariableGeneration.mo
+++ b/Buildings/Occupants/BaseClasses/binaryVariableGeneration.mo
@@ -2,15 +2,15 @@ within Buildings.Occupants.BaseClasses;
 function binaryVariableGeneration "Binary variables random generator"
   extends Modelica.Icons.Function;
   input Real p(min=0, max=1) "Probaility of 1";
-  input Integer globalSeed "Seed for the random number generator";
+  input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
   output Boolean y "Random number";
+  output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "New state of the random number generator";
 protected
-  Integer localSeed = 0 "Local seed";
-  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState];
   Real r(min=0, max=1) "Generated random number";
 algorithm
-  state := Modelica.Math.Random.Generators.Xorshift1024star.initialState(localSeed, globalSeed);
-  (r, state) := Modelica.Math.Random.Generators.Xorshift1024star.random(state);
+  (r, stateOut) := Modelica.Math.Random.Generators.Xorshift1024star.random(stateIn);
   y := r < p;
 
   annotation (
@@ -25,6 +25,12 @@ Higher <code>p</code> indicates a higher chance of generating <code>true</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 October 3, 2023, by Michael Wetter:<br/>
 Initialized <code>localSeed</code>.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3549\">#3549</a>.
diff --git a/Buildings/Occupants/BaseClasses/exponentialVariableGeneration.mo b/Buildings/Occupants/BaseClasses/exponentialVariableGeneration.mo
index 52b31fbb3d0..1a0849c5aab 100644
--- a/Buildings/Occupants/BaseClasses/exponentialVariableGeneration.mo
+++ b/Buildings/Occupants/BaseClasses/exponentialVariableGeneration.mo
@@ -2,15 +2,15 @@ within Buildings.Occupants.BaseClasses;
 function exponentialVariableGeneration "Random variable generator from the exponential distribution"
   extends Modelica.Icons.Function;
     input Real mu  "Mean exponential distribution";
-    input Integer globalSeed "Seed for the random number generator";
-    output Real y "duration of event";
+    input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+      "State of the random number generator";
+    output Real y "Random number";
+    output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+      "New state of the random number generator";
 protected
-    Integer localSeed = 0 "Local seed";
-    Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState];
     Real r "Generated random numberin the range 0 < random ≤ 1";
 algorithm
-    state := Modelica.Math.Random.Generators.Xorshift1024star.initialState(localSeed, globalSeed);
-    (r, state) := Modelica.Math.Random.Generators.Xorshift1024star.random(state);
+    (r, stateOut) := Modelica.Math.Random.Generators.Xorshift1024star.random(stateIn);
     y := -mu * Modelica.Math.log(1 - r);
   annotation (Documentation(info="<html>
 <p>
@@ -25,6 +25,12 @@ chance to generate a larger output <code>y</code>.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 October 3, 2023, by Michael Wetter:<br/>
 Initialized <code>localSeed</code>.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3549\">#3549</a>.
diff --git a/Buildings/Occupants/BaseClasses/linear1D.mo b/Buildings/Occupants/BaseClasses/linear1D.mo
index 243579a0d16..bdecf2581ad 100644
--- a/Buildings/Occupants/BaseClasses/linear1D.mo
+++ b/Buildings/Occupants/BaseClasses/linear1D.mo
@@ -5,11 +5,14 @@ function linear1D "Mapping a continuous input to a binary output through a linea
   input Real x "Continuous variable";
   input Real A=1 "Slope of the linear function";
   input Real B=0 "Intercept of the linear function";
-  input Integer globalSeed "Seed for the random number generator";
+  input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
   output Boolean y "Binary variable";
-
+  output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "New state of the random number generator";
 algorithm
-  y := Buildings.Occupants.BaseClasses.binaryVariableGeneration(max(0, min(1, A*x+B)), globalSeed);
+  (y, stateOut) := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
+    max(0, min(1, A*x+B)), stateIn);
 annotation (
 Documentation(info="<html>
 <p>
@@ -24,6 +27,12 @@ Then a random generator generates the output, which should be a binary variable.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 20, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/logit1D.mo b/Buildings/Occupants/BaseClasses/logit1D.mo
index 6c6ce03f270..83a96260883 100644
--- a/Buildings/Occupants/BaseClasses/logit1D.mo
+++ b/Buildings/Occupants/BaseClasses/logit1D.mo
@@ -5,13 +5,16 @@ function logit1D "Mapping a continuous input to a binary output through a logist
   input Real x "Continuous variable";
   input Real A=1.0 "Logistic relation: Slope";
   input Real B=1.0 "Logistic relation: Intercept";
-  input Integer globalSeed "Seed for the random number generator";
+  input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
   output Boolean y "Binary variable";
+  output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "New state of the random number generator";
 
 algorithm
-  y := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
+  (y, stateOut) := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
     Modelica.Math.exp(A*x+B)/(Modelica.Math.exp(A*x+B)+1),
-    globalSeed);
+    stateIn);
 annotation (
 Documentation(info="<html>
 <p>
@@ -26,6 +29,12 @@ generates the output, which should be a binary variable.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 20, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/logit1DQuadratic.mo b/Buildings/Occupants/BaseClasses/logit1DQuadratic.mo
index 9cfd91c5069..d8f1462a7d2 100644
--- a/Buildings/Occupants/BaseClasses/logit1DQuadratic.mo
+++ b/Buildings/Occupants/BaseClasses/logit1DQuadratic.mo
@@ -7,13 +7,16 @@ function logit1DQuadratic "Mapping a continuous input to a binary output through
   input Real B=1.0 "Parameter defining the quadratic logistic relation";
   input Real C=1.0 "Parameter defining the quadratic logistic relation";
   input Real D=1.0 "Parameter defining the quadratic logistic relation";
-  input Integer globalSeed "Seed for the random number generator";
+  input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
   output Boolean y "Binary variable";
+  output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "New state of the random number generator";
 
 algorithm
-  y := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
+  (y, stateOut) := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
    A + C/(1+ Modelica.Math.exp(-B*(Modelica.Math.log10(x)-D))),
-   globalSeed);
+   stateIn);
 annotation (
 Documentation(info="<html>
 <p>
@@ -29,6 +32,12 @@ generates the output, which should be a binary variable.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 20, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/logit2D.mo b/Buildings/Occupants/BaseClasses/logit2D.mo
index 5422d3ec2a7..3eb96d231cf 100644
--- a/Buildings/Occupants/BaseClasses/logit2D.mo
+++ b/Buildings/Occupants/BaseClasses/logit2D.mo
@@ -7,13 +7,16 @@ function logit2D "Mapping two continuous inputs to a binary output through a 2-d
   input Real A=1.0 "Parameter defining the 2D logistic relation: mutiplier for the first input";
   input Real B=1.0 "Parameter defining the 2D logistic relation: mutiplier for the second input";
   input Real C=1.0 "Parameter defining the 2D logistic relation: intercept";
-  input Integer globalSeed "Seed for the random number generator";
+  input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
   output Boolean y "Binary variable";
+  output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "New state of the random number generator";
 
 algorithm
-  y := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
+  (y, stateOut) := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
     Modelica.Math.exp(A*x1+B*x2+C)/(Modelica.Math.exp(A*x1+B*x2+C)+1),
-    globalSeed);
+    stateIn);
 annotation (
 Documentation(info="<html>
 <p>
@@ -30,6 +33,12 @@ generates the output, which should be a binary variable.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 20, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/package.mo b/Buildings/Occupants/BaseClasses/package.mo
index 2b6e4652cd5..666eb85de22 100644
--- a/Buildings/Occupants/BaseClasses/package.mo
+++ b/Buildings/Occupants/BaseClasses/package.mo
@@ -4,9 +4,9 @@ package BaseClasses "Package with base classes for Buildings.Occupants"
 
 annotation (preferredView="info", Documentation(info="<html>
 <p>
-This package contains base functions which will be used in the Modelica Building Occupancy 
-simulation module. The functions included in this package would map the inputs, for instance the 
-indoor/output temperature, to two kinds of outputs: on/off state or the duration of a specific state. 
+This package contains base functions which will be used in the Modelica Building Occupancy
+simulation module. The functions included in this package would map the inputs, for instance the
+indoor/output temperature, to two kinds of outputs: on/off state or the duration of a specific state.
 </p>
 </html>"));
 end BaseClasses;
diff --git a/Buildings/Occupants/BaseClasses/weibull1DOFF.mo b/Buildings/Occupants/BaseClasses/weibull1DOFF.mo
index 9b8413d8a43..5dd1abcf5c7 100644
--- a/Buildings/Occupants/BaseClasses/weibull1DOFF.mo
+++ b/Buildings/Occupants/BaseClasses/weibull1DOFF.mo
@@ -2,18 +2,21 @@ within Buildings.Occupants.BaseClasses;
 function weibull1DOFF "Mapping a continuous input to a binary output through a Weibull distribution relation"
   extends Modelica.Icons.Function;
 
-    input Real x "Continous variable";
-    input Real u=1.0 "Parameter defining the Weibull distribution threshold";
-    input Real L=1.0 "Parameter defining the Weibull distribution normalization factor";
-    input Real k=1.0 "Parameter defining the Weibull distribution shape factor";
-    input Real dt=60 "Time step length";
-    input Integer globalSeed "Seed for the random number generator";
-    output Boolean y "Binary variable 0/1";
+  input Real x "Continous variable";
+  input Real u=1.0 "Parameter defining the Weibull distribution threshold";
+  input Real L=1.0 "Parameter defining the Weibull distribution normalization factor";
+  input Real k=1.0 "Parameter defining the Weibull distribution shape factor";
+  input Real dt=60 "Time step length";
+  input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  output Boolean y "Binary variable 0/1";
+  output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "New state of the random number generator";
 
 algorithm
-    y := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
-     p = if x <= u then 1 - Modelica.Math.exp(-((u-x)/L)^k*dt) else 0,
-     globalSeed = globalSeed);
+  (y, stateOut) := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
+    p = if x <= u then 1 - Modelica.Math.exp(-((u-x)/L)^k*dt) else 0,
+    stateIn = stateIn);
 annotation (
 Documentation(info="<html>
 <p>
@@ -30,6 +33,12 @@ Then a random generator generates the output, which should be a binary variable.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 20, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/weibull1DON.mo b/Buildings/Occupants/BaseClasses/weibull1DON.mo
index 4fd5a94cedc..766c1fbcb31 100644
--- a/Buildings/Occupants/BaseClasses/weibull1DON.mo
+++ b/Buildings/Occupants/BaseClasses/weibull1DON.mo
@@ -2,18 +2,25 @@ within Buildings.Occupants.BaseClasses;
 function weibull1DON "Mapping a continuous input to a binary output through a Weibull distribution relation"
   extends Modelica.Icons.Function;
 
-    input Real x "Continous variable";
-    input Real u=1.0 "Parameter defining the Weibull distribution threshold";
-    input Real L=1.0 "Parameter defining the Weibull distribution normalization factor";
-    input Real k=1.0 "Parameter defining the Weibull distribution shape factor";
-    input Real dt=60 "Time step length";
-    input Integer globalSeed "Seed for the random number generator";
-    output Boolean y "Binary variable 0/1";
+  input Real x "Continous variable";
+  input Real u=1.0 "Parameter defining the Weibull distribution threshold";
+  input Real L=1.0 "Parameter defining the Weibull distribution normalization factor";
+  input Real k=1.0 "Parameter defining the Weibull distribution shape factor";
+  input Real dt=60 "Time step length";
+  input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  output Boolean y "Binary variable 0/1";
+  output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "New state of the random number generator";
 
 algorithm
-    y := Buildings.Occupants.BaseClasses.binaryVariableGeneration(
-      p = if x >= u then 1- Modelica.Math.exp(-((x-u)/L)^k*dt) else 0,
-      globalSeed = globalSeed);
+  (y, stateOut) := Buildings.Occupants.BaseClasses.weibull1DOFF(
+    x = u,
+    u = x,
+    L = L,
+    k = k,
+    dt = dt,
+    stateIn = stateIn);
 annotation (
 Documentation(info="<html>
 <p>
@@ -30,6 +37,12 @@ a random generator generates the output, which should be a binary variable.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 20, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/BaseClasses/weibullVariableGeneration.mo b/Buildings/Occupants/BaseClasses/weibullVariableGeneration.mo
index f765a5f1abb..28b278fa7e3 100644
--- a/Buildings/Occupants/BaseClasses/weibullVariableGeneration.mo
+++ b/Buildings/Occupants/BaseClasses/weibullVariableGeneration.mo
@@ -4,15 +4,15 @@ function weibullVariableGeneration "Random variable generator from the Weibull d
 
     input Real lambda "Parameter defining the Weibull distribution scale factor";
     input Real k "Parameter defining the Weibull distribution shape factor";
-    input Integer globalSeed "Seed for the random number generator";
+    input Integer stateIn[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+      "State of the random number generator";
     output Real y "Random variable generated from Weibull Distribution";
+    output Integer stateOut[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+      "New state of the random number generator";
 protected
-    Integer localSeed = 0 "Local seed";
-    Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState];
-    Real r "Generated random numberin the range 0 < random ≤ 1";
+    Real r "Generated random number in the range 0 < r ≤ 1";
 algorithm
-    state := Modelica.Math.Random.Generators.Xorshift1024star.initialState(localSeed, globalSeed);
-    (r, state) := Modelica.Math.Random.Generators.Xorshift1024star.random(state);
+    (r, stateOut) := Modelica.Math.Random.Generators.Xorshift1024star.random(stateIn);
     y := lambda*(Modelica.Math.log((1 - r)^(-1)))^(1/k);
   annotation (Documentation(info="<html>
 <p>
@@ -31,6 +31,12 @@ chance to generate a higher output.
 </html>", revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 October 3, 2023, by Michael Wetter:<br/>
 Initialized <code>localSeed</code>.<br/>
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3549\">#3549</a>.
diff --git a/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo b/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo
index bbfbc6981b1..e50df81a122 100644
--- a/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo
+++ b/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTIn.mo
@@ -4,7 +4,10 @@ model Haldi2008BlindsTIn
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A(final unit="1/K") = 0.425 "Slope of indoor temperature";
   parameter Real B(final unit="1") = -11.37 "Intercept";
-  parameter Integer seed = 20 "Seed for the random number generator";
+  parameter Integer localSeed = 1000
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TIn(
@@ -30,21 +33,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean ran "Random number";
 
 initial equation
   t0 = time;
   blindState = 0;
   pDown = 0;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+  ran = false;
+
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pre(pDown), stateIn=pre(state));
     if occ then
       pDown = 1-Modelica.Math.exp(A*(TIn-273.15)+B)/(Modelica.Math.exp(A*(TIn-273.15)+B)+1);
-      if Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pDown, globalSeed=integer(curSeed)) then
+      if ran then
         blindState = 0;
       else
         blindState = 1;
@@ -88,6 +97,12 @@ buildings in 2006.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 August 31, 2018, by Zhe Wang:<br/>
 First revision.
 </li>
diff --git a/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo b/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo
index efd5924fa72..6e2809eb24f 100644
--- a/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo
+++ b/Buildings/Occupants/Office/Blinds/Haldi2008BlindsTOut.mo
@@ -4,7 +4,10 @@ model Haldi2008BlindsTOut
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A(final unit="1/K") = 0.139 "Slope of outdoor temperature";
   parameter Real B(final unit="1") = -3.54 "Intercept";
-  parameter Integer seed = 20 "Seed for the random number generator";
+  parameter Integer localSeed = 1001
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -30,21 +33,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean ran "Random number";
 
 initial equation
   t0 = time;
   blindState = 0;
   pDown = 0;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+  ran = false;
+
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = time*seed;
+    (ran, state) = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pre(pDown), stateIn=pre(state));
     if occ then
       pDown = 1-Modelica.Math.exp(A*(TOut-273.15)+B)/(Modelica.Math.exp(A*(TOut-273.15)+B)+1);
-      if Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pDown, globalSeed=integer(curSeed)) then
+      if ran then
         blindState = 0;
       else
         blindState = 1;
@@ -88,6 +97,12 @@ buildings in 2006.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 24, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo b/Buildings/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo
index 4e88b1cc03c..e51c6dc290d 100644
--- a/Buildings/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo
+++ b/Buildings/Occupants/Office/Blinds/Inkarojrit2008BlindsSolarIntensity.mo
@@ -8,7 +8,10 @@ model Inkarojrit2008BlindsSolarIntensity
     parameter Real LSen =  4 "Self-reported sensitivity to brightness,
   seven-point scale, 1 for least sensitive, 7 for most sensitive"
   annotation(Dialog(tab = "Advanced"));
-    parameter Integer seed = 10 "Seed for the random number generator";
+    parameter Integer localSeed = 1002
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
     Modelica.Blocks.Interfaces.RealInput H(unit="W/m2") "Solar intensity"
@@ -33,22 +36,28 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
     output Boolean sampleTrigger "True, if sample time instant";
-    Real curSeed "Current value for seed as a real-valued variable";
+    Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+    Boolean ran "Random number";
 
 initial equation
     t0 = time;
-    curSeed = t0*seed;
+    state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
     blindState = 0;
     p = 0;
+    ran = false;
 
 equation
     sampleTrigger = sample(t0,samplePeriod);
     when sampleTrigger then
-      curSeed = seed*time;
+      (ran, state) = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p, stateIn=pre(state));
       if occ then
         p = 1 - Modelica.Math.exp(A1*Modelica.Math.log10(H) + A2*LSen + B)/(
           Modelica.Math.exp(A1*Modelica.Math.log10(H) + A2*LSen + B) + 1);
-        if Buildings.Occupants.BaseClasses.binaryVariableGeneration(p, globalSeed=integer(curSeed)) then
+        if ran then
           blindState = 1;
         else
           blindState = 0;
@@ -93,6 +102,12 @@ from 113 naturally ventilated buildings.
   revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 23, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo b/Buildings/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo
index f90f94cf2a6..5c9c737c405 100644
--- a/Buildings/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo
+++ b/Buildings/Occupants/Office/Blinds/Newsham1994BlindsSolarIntensity.mo
@@ -74,6 +74,12 @@ study in an office building in Toronto.
   revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 24, 2018, by Zhe Wang:<br/>
 First implementation.</li>
 <li>
diff --git a/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo b/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo
index ad5fe7f82ee..5a88010940f 100644
--- a/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo
+++ b/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarAltitude.mo
@@ -6,7 +6,10 @@ model Zhang2012BlindsSolarAltitude
   parameter Real ADown = 1.031 "Slope of solar altitude for blinds down";
   parameter Real BUp = -3.446 "Intercept for blinds up";
   parameter Real BDown = -3.424 "Intercept for blinds down";
-  parameter Integer seed = 10 "Seed for the random number generator";
+  parameter Integer localSeed = 1003
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput solarAltitude(
@@ -36,11 +39,16 @@ protected
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
   Boolean isOpen "Blind state as a boolean";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
 
   isOpen = false "Initial state of blinds is deployed";
   blindState = if isOpen then 0.0 else 1.0;
@@ -48,19 +56,21 @@ initial equation
   pUp = 0;
   pDown = 0;
 
+  ran = 0.5;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       if not pre(isOpen) then // blindState is either 0 or 1.
         pUp = 0;
         pDown = Modelica.Math.exp(ADown*solarAltitude+BDown)/(Modelica.Math.exp(ADown*solarAltitude+BDown)+1);
-        isOpen = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pDown,globalSeed=integer(curSeed));
+        isOpen = ran < pDown;
       else
         pUp = Modelica.Math.exp(AUp*solarAltitude+BUp)/(Modelica.Math.exp(AUp*solarAltitude+BUp)+1);
         pDown = 0;
-        isOpen = not Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pUp,globalSeed=integer(curSeed));
+        isOpen = ran >= pUp;
       end if;
     else
       pUp = 0;
@@ -93,9 +103,9 @@ the chance that the blind state will be changed, either being turned on or turne
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012.
+The model is documented by Zhang, Y. and Barrett, P., 2012.
 Factors influencing occupants’ blind-control behaviour in a naturally
-ventilated office building. Building and Environment, 54, pp.137-147.&quot;
+ventilated office building. Building and Environment, 54, pp.137-147.
 </p>
 <p>
 The model parameters are regressed from the field study in an office building
@@ -105,6 +115,12 @@ in Sheffield, England.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 November 30, 2018, by Michael Wetter:<br/>
 Removed equality test on <code>Real</code> which is not allowed
 in Modelica.
diff --git a/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo b/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo
index f1ac9647ef4..cdaf5b55c3d 100644
--- a/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo
+++ b/Buildings/Occupants/Office/Blinds/Zhang2012BlindsSolarIntensity.mo
@@ -6,7 +6,10 @@ model Zhang2012BlindsSolarIntensity
     parameter Real ADown = 0.002 "Slope of solar intensity for blinds down";
     parameter Real BUp = -3.33 "Intercept for blinds up";
     parameter Real BDown = -3.17 "Intercept for blinds down";
-    parameter Integer seed = 10 "Seed for the random number generator";
+    parameter Integer localSeed = 1004
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
     Modelica.Blocks.Interfaces.RealInput H(
@@ -36,10 +39,16 @@ protected
     "First sample time instant";
     output Boolean sampleTrigger "True, if sample time instant";
     Boolean isOpen "Blind state as a boolean";
-    Real curSeed "Current value for seed as a real-valued variable";
+    Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
     t0 = time;
-    curSeed = t0*seed;
+    state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
 
     isOpen = false "Initial state of blinds is deployed";
     blindState = if isOpen then 0.0 else 1.0;
@@ -47,19 +56,21 @@ initial equation
     pUp = 0;
     pDown = 0;
 
+    ran = 0.5;
+
 equation
     sampleTrigger = sample(t0,samplePeriod);
     when sampleTrigger then
-      curSeed = seed*time;
+      (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
       if occ then
         if pre(isOpen) == false then
           pUp = 0;
           pDown = Modelica.Math.exp(ADown*H+BDown)/(Modelica.Math.exp(ADown*H+BDown)+1);
-          isOpen = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pDown,globalSeed=integer(curSeed));
+          isOpen = ran < pDown;
         else
           pUp = Modelica.Math.exp(AUp*H+BUp)/(Modelica.Math.exp(AUp*H+BUp)+1);
           pDown = 0;
-          isOpen = not Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pUp,globalSeed=integer(curSeed));
+          isOpen = ran >= pUp;
         end if;
       else
         pUp = 0;
@@ -91,9 +102,9 @@ the chance that the blind is up.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012.
+The model is documented in hang, Y. and Barrett, P., 2012.
 Factors influencing occupants’ blind-control behaviour in a naturally
-ventilated office building. Building and Environment, 54, pp.137-147.&quot;
+ventilated office building. Building and Environment, 54, pp.137-147.
 </p>
 <p>
 The model parameters are regressed from the field study in an office building
@@ -103,6 +114,12 @@ in Sheffield, England.
   revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 November 30, 2018, by Michael Wetter:<br/>
 Removed equality test on <code>Real</code> which is not allowed
 in Modelica.
diff --git a/Buildings/Occupants/Office/Lighting/Gunay2016Light.mo b/Buildings/Occupants/Office/Lighting/Gunay2016Light.mo
index aa7ba3db958..b594ceb3e7a 100644
--- a/Buildings/Occupants/Office/Lighting/Gunay2016Light.mo
+++ b/Buildings/Occupants/Office/Lighting/Gunay2016Light.mo
@@ -5,7 +5,10 @@ model Gunay2016Light "A model to predict occupants' lighting behavior with illum
   parameter Real BArriv = 1.6 "Intercept of logistic regression arrival";
   parameter Real AInter = -0.002 "Slope of logistic regression intermediate";
   parameter Real BInter = -3.9 "Intercept of logistic regression intermediate";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 2000
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput ill
@@ -31,23 +34,29 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false;
+  ran = 0.5;
 
 equation
   pArriv = Modelica.Math.exp(AArriv*ill + BArriv)/(1+Modelica.Math.exp(AArriv*ill + BArriv));
   pInter = Modelica.Math.exp(AInter*ill + BInter)/(1+Modelica.Math.exp(AInter*ill + BInter));
   sampleTrigger = sample(t0,samplePeriod);
   when {occ, sampleTrigger} then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if sampleTrigger then
       if occ then
         if not pre(on) then
-          on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pInter, globalSeed=integer(curSeed));
+          on = ran < pInter;
         else
           on = true;
         end if;
@@ -55,7 +64,7 @@ equation
         on = false;
       end if;
     else
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pArriv, globalSeed=integer(curSeed));
+      on = ran < pArriv;
     end if;
   end when;
 
@@ -107,6 +116,12 @@ Gunay et al.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 27, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Lighting/Hunt1979Light.mo b/Buildings/Occupants/Office/Lighting/Hunt1979Light.mo
index 00fefc29c91..c80b3e1a34c 100644
--- a/Buildings/Occupants/Office/Lighting/Hunt1979Light.mo
+++ b/Buildings/Occupants/Office/Lighting/Hunt1979Light.mo
@@ -5,7 +5,8 @@ model Hunt1979Light "A model to predict occupants' lighting behavior with illumi
  parameter Real BArriv = -4.0835 "Upon arrival";
  parameter Real CArriv = 1.0361 "Upon arrival";
  parameter Real MArriv = 1.8223 "Upon arrival";
- parameter Integer seed = 30 "Seed for the random number generator";
+ parameter Integer localSeed = 2001 "Local seed for the random number generator";
+  parameter Integer globalSeed = 30129 "Global seed for the random number generator";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
  Modelica.Blocks.Interfaces.RealInput ill "Illuminance on the working planein units of lux" annotation (
@@ -25,13 +26,19 @@ model Hunt1979Light "A model to predict occupants' lighting behavior with illumi
 protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
- output Boolean sampleTrigger "True, if sample time instant";
- Real curSeed "Current value for seed as a real-valued variable";
+  output Boolean sampleTrigger "True, if sample time instant";
+
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
  t0 = time;
- curSeed = t0*seed;
+ state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(localSeed, globalSeed);
+
  on = false;
+ ran = 0.5;
+
 equation
  if ill > 657.7 then
    pArriv =0;
@@ -43,7 +50,7 @@ equation
  end if;
  sampleTrigger = sample(t0, samplePeriod);
  when {occ, sampleTrigger} then
-   curSeed = seed*time;
+   (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
    if sampleTrigger then
      if occ then
        on = pre(on);
@@ -51,7 +58,7 @@ equation
        on = false;
      end if;
    else
-     on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(pArriv, globalSeed=integer(curSeed));
+     on = ran < pArriv;
    end if;
  end when;
  annotation (Icon(graphics={
diff --git a/Buildings/Occupants/Office/Lighting/Love1998Light1.mo b/Buildings/Occupants/Office/Lighting/Love1998Light1.mo
index 0f3d9f783c0..2c1a1ed0137 100644
--- a/Buildings/Occupants/Office/Lighting/Love1998Light1.mo
+++ b/Buildings/Occupants/Office/Lighting/Love1998Light1.mo
@@ -3,7 +3,10 @@ model Love1998Light1 "A model to predict occupants' lighting behavior with illum
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real B = 5.85 "Intercept for logistic regression";
   parameter Real M = -11.9 "Slope for logistic regression";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 2002
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput ill "Daylight illuminance level on the deskin units of lux" annotation (
@@ -24,18 +27,24 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false;
+  ran = 0.5;
 
 equation
   p = Modelica.Math.exp(B+M*Modelica.Math.log10(ill))/(1 - Modelica.Math.exp(B+M*Modelica.Math.log10(ill)))*100;
   sampleTrigger = sample(t0, samplePeriod);
   when {occ, sampleTrigger} then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if sampleTrigger then
       if occ then
         on = pre(on);
@@ -43,7 +52,7 @@ equation
         on = false;
       end if;
     else
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     end if;
   end when;
   annotation (Icon(graphics={
@@ -85,6 +94,12 @@ function illustrated in the paper.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 27, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Lighting/Love1998Light2.mo b/Buildings/Occupants/Office/Lighting/Love1998Light2.mo
index 87ffae0b8b5..a518bdddd19 100644
--- a/Buildings/Occupants/Office/Lighting/Love1998Light2.mo
+++ b/Buildings/Occupants/Office/Lighting/Love1998Light2.mo
@@ -3,7 +3,10 @@ model Love1998Light2 "A model to predict occupants' lighting behavior with illum
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real B = 7.19 "Intercept for logistic regression";
   parameter Real M = -17.06 "Slope for logistic regression";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 2003
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput ill "Daylight illuminance level on the deskin units of lux" annotation (
@@ -24,19 +27,25 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false;
+  ran = 0.5;
 
 equation
   p = Modelica.Math.exp(B+M*Modelica.Math.log10(ill))
     /(1 - Modelica.Math.exp(B+M*Modelica.Math.log10(ill)))*100;
   sampleTrigger = sample(t0, samplePeriod);
   when {occ, sampleTrigger} then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if sampleTrigger then
       if occ then
         on = pre(on);
@@ -44,9 +53,7 @@ equation
         on = false;
       end if;
     else
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(
-        p=p,
-        globalSeed=integer(curSeed));
+      on = ran < p;
     end if;
   end when;
   annotation (Icon(graphics={
@@ -88,6 +95,12 @@ function illustrated in the paper.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 27, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Lighting/Reinhart2003Light.mo b/Buildings/Occupants/Office/Lighting/Reinhart2003Light.mo
index 2f18119e148..dea889aa044 100644
--- a/Buildings/Occupants/Office/Lighting/Reinhart2003Light.mo
+++ b/Buildings/Occupants/Office/Lighting/Reinhart2003Light.mo
@@ -9,7 +9,10 @@ model Reinhart2003Light "A model to predict occupants' lighting behavior with il
   parameter Real BInter = -64.19 "intermediate";
   parameter Real CInter = 0.017 "intermediate";
   parameter Real MInter = 2.41 "intermediate";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 2004
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput ill "Illuminance on the working planein units of lux" annotation (
@@ -34,23 +37,29 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false;
+  ran = 0.5;
 
 equation
   pArriv = AArriv + CArriv/(1+Modelica.Math.exp(-BArriv*(Modelica.Math.log10(ill)-MArriv)));
   pInter = AInter + CInter/(1+Modelica.Math.exp(-BInter*(Modelica.Math.log10(ill)-MInter)));
   sampleTrigger = sample(t0,samplePeriod);
   when {occ, sampleTrigger} then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if sampleTrigger then
       if occ then
         if not pre(on) then
-          on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pInter, globalSeed=integer(curSeed));
+          on = ran < pInter;
         else
           on = true;
         end if;
@@ -58,7 +67,7 @@ equation
         on = false;
       end if;
     else
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pArriv, globalSeed=integer(curSeed));
+      on = ran < pArriv;
     end if;
   end when;
 
@@ -110,6 +119,12 @@ Mar. to Dec. 2000.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 26, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Occupancy/Wang2005Occupancy.mo b/Buildings/Occupants/Office/Occupancy/Wang2005Occupancy.mo
index 8c222621d60..f7d85866051 100644
--- a/Buildings/Occupants/Office/Occupancy/Wang2005Occupancy.mo
+++ b/Buildings/Occupants/Office/Occupancy/Wang2005Occupancy.mo
@@ -7,7 +7,10 @@ model Wang2005Occupancy
     "Mean occupancy duration";
   parameter Modelica.Units.SI.Time zero_mu(displayUnit="min") = 2556
     "Mean vacancy duration";
-  parameter Integer seed = 10 "Seed for the random number generator";
+  parameter Integer localSeed = 2005
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
 
   Modelica.Blocks.Interfaces.BooleanOutput occ(start=true, fixed=true)
     "The State of occupancy, true for occupied"
@@ -15,27 +18,26 @@ model Wang2005Occupancy
 
 protected
   discrete Real mu;
-  discrete Real tNext(start=0, fixed=true);
-  discrete Real hold_time;
-  Real r(min=0, max=1) "Generated random number";
-  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState](
-    each start=0,
-    each fixed=true);
+  discrete Modelica.Units.SI.Time tNext;
+  discrete Modelica.Units.SI.Time hold_time;
+  discrete Real r(min=0, max=1) "Generated random number";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
 
-algorithm
-  when initial() then
-    (r, state) := Modelica.Math.Random.Generators.Xorshift1024star.random(
-      Modelica.Math.Random.Generators.Xorshift1024star.initialState(seed, seed));
-    occ :=false;
-    mu :=if occ then one_mu else zero_mu;
-    hold_time :=-mu*Modelica.Math.log(1 - r);
-    tNext :=time + hold_time;
-   elsewhen time >= pre(tNext) then
-    (r, state) :=Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
-    occ :=not pre(occ);
-    mu :=if occ then one_mu else zero_mu;
-    hold_time :=-mu*Modelica.Math.log(1 - r);
-    tNext :=time + hold_time;
+initial equation
+  (r, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    Modelica.Math.Random.Generators.Xorshift1024star.initialState(localSeed, globalSeed));
+  mu = zero_mu;
+  hold_time = -mu*Modelica.Math.log(1 - r);
+  // Use max of 1 second to avoid cornercase of very tiny sampling
+  tNext = time + max(1, hold_time);
+equation
+  when time >= pre(tNext) then
+    (r, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
+    occ = not pre(occ);
+    mu = if occ then one_mu else zero_mu;
+    hold_time = -mu*Modelica.Math.log(1 - r);
+    tNext = pre(tNext) + max(1, hold_time);
   end when;
 
   annotation (Icon(graphics={
@@ -65,6 +67,12 @@ single person offices at a large office building from 12/29/1998 to 12/20/1999.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 August 16, 2021, by Michael Wetter:<br/>
 Reformulated model so it works also if the simulation does not start at <i>0</i>.<br/>
 To improve efficiency, this reformulation also changes the event triggering function so that
diff --git a/Buildings/Occupants/Office/Windows/Haldi2008WindowsTIn.mo b/Buildings/Occupants/Office/Windows/Haldi2008WindowsTIn.mo
index 8c9c02d3942..825225f047a 100644
--- a/Buildings/Occupants/Office/Windows/Haldi2008WindowsTIn.mo
+++ b/Buildings/Occupants/Office/Windows/Haldi2008WindowsTIn.mo
@@ -3,7 +3,10 @@ model Haldi2008WindowsTIn "A model to predict occupants' window behavior with in
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.22 "Slope of the logistic relation";
   parameter Real B = -5.64 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3001
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TIn(
@@ -25,20 +28,26 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TIn - 273.15)+B)/(Modelica.Math.exp(A*(TIn - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(seed*time));
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TIn - 273.15)+B)/(Modelica.Math.exp(A*(TIn - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -56,29 +65,35 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the window with the indoor air temperature 
+Model predicting the state of the window with the indoor air temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the indoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the indoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Haldi, F. and Robinson, D., 2008. 
-On the behaviour and adaptation of office occupants. Building and environment, 
+The model is documented in the paper &quot;Haldi, F. and Robinson, D., 2008.
+On the behaviour and adaptation of office occupants. Building and environment,
 43(12), pp.2163-2177.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study in eight Swiss office 
+The model parameters are regressed from the field study in eight Swiss office
 buildings in 2006. The indoor air temperature range during the study is 5 ~ 35 degC.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Haldi2008WindowsTOut.mo b/Buildings/Occupants/Office/Windows/Haldi2008WindowsTOut.mo
index 3d5eccffefc..e3c3200cfc0 100644
--- a/Buildings/Occupants/Office/Windows/Haldi2008WindowsTOut.mo
+++ b/Buildings/Occupants/Office/Windows/Haldi2008WindowsTOut.mo
@@ -3,7 +3,10 @@ model Haldi2008WindowsTOut "A model to predict occupants' window behavior with o
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.049 "Slope of the logistic relation";
   parameter Real B = -1.12 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3002
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,19 +28,25 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -55,29 +64,35 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the window with the outdoor air temperature 
+Model predicting the state of the window with the outdoor air temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Haldi, F. and Robinson, D., 2008. 
-On the behaviour and adaptation of office occupants. Building and environment, 
+The model is documented in the paper &quot;Haldi, F. and Robinson, D., 2008.
+On the behaviour and adaptation of office occupants. Building and environment,
 43(12), pp.2163-2177.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study in eight Swiss office 
+The model parameters are regressed from the field study in eight Swiss office
 buildings in 2006. The outdoor air temperature range during the study is 5 ~ 35 degC.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo b/Buildings/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo
index 6ad8b47051f..a98dd8d772d 100644
--- a/Buildings/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo
+++ b/Buildings/Occupants/Office/Windows/Haldi2009WindowsTInTout.mo
@@ -7,7 +7,10 @@ model Haldi2009WindowsTInTout "A model to predict occupants' window behavior wit
   parameter Real ACloseIn = 0.026 "Slope of indoor temp of the logistic relation for the closing probability";
   parameter Real ACloseOut = -0.065 "Slope of outdoor temp of the logistic relation for the closing probability";
   parameter Real BClose = -4.14 "Intercept of the logistic relation for the closing probability";
-  parameter Integer seed = 10 "Seed for the random number generator";
+  parameter Integer localSeed = 3003
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TIn(
@@ -38,26 +41,33 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false;
   pOpen = Modelica.Math.exp(AOpenIn*(TIn - 273.15)+AOpenOut*(TOut - 273.15)+BOpen)/(Modelica.Math.exp(AOpenIn*(TIn - 273.15)+AOpenOut*(TOut - 273.15)+BOpen) + 1);
   pClose = Modelica.Math.exp(ACloseIn*(TIn - 273.15)+ACloseOut*(TOut - 273.15)+BClose)/(Modelica.Math.exp(ACloseIn*(TIn - 273.15)+ACloseOut*(TOut - 273.15)+BClose) + 1);
 
+  ran = 0.5;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       pOpen = Modelica.Math.exp(AOpenIn*(TIn - 273.15)+AOpenOut*(TOut - 273.15)+BOpen)/(Modelica.Math.exp(AOpenIn*(TIn - 273.15)+AOpenOut*(TOut - 273.15)+BOpen) + 1);
       pClose = Modelica.Math.exp(ACloseIn*(TIn - 273.15)+ACloseOut*(TOut - 273.15)+BClose)/(Modelica.Math.exp(ACloseIn*(TIn - 273.15)+ACloseOut*(TOut - 273.15)+BClose) + 1);
       if pre(on) then
-        on = not Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pClose, globalSeed=integer(curSeed));
+        on = not ran < pClose;
       else
-        on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pOpen, globalSeed=integer(curSeed));
+        on = ran < pOpen;
       end if;
     else
       pOpen = 0;
@@ -77,32 +87,38 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the window with the indoor, outdoor air temperature 
+Model predicting the state of the window with the indoor, outdoor air temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, Markov method was utilized to determine the state 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, Markov method was utilized to determine the state
 of the window. The probability of opening and closing the window
 depends on both the indoor and outdoor temperature.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Haldi, F. and Robinson, D., 
-2009. Interactions with window openings by office occupants. Building 
+The model is documented in the paper &quot;Haldi, F. and Robinson, D.,
+2009. Interactions with window openings by office occupants. Building
 and Environment, 44(12), pp.2378-2395.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study in the Solar 
-Energy and Building Physics Laboratory (LESO-PB) experimental building, 
-located in the suburb of Lausanne, Switzerland for a period covering 
+The model parameters are regressed from the field study in the Solar
+Energy and Building Physics Laboratory (LESO-PB) experimental building,
+located in the suburb of Lausanne, Switzerland for a period covering
 19 December 2001–15 November 2008.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo b/Buildings/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo
index b95d70601fe..73d5ec4f1ce 100644
--- a/Buildings/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo
+++ b/Buildings/Occupants/Office/Windows/Herkel2008WindowsCompletelyOpen.mo
@@ -1,10 +1,13 @@
 within Buildings.Occupants.Office.Windows;
-model Herkel2008WindowsCompletelyOpen "A model to predict occupants' window behavior with outdoor temperature for completely-open 
+model Herkel2008WindowsCompletelyOpen "A model to predict occupants' window behavior with outdoor temperature for completely-open
 large windows"
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.08 "Slope of the logistic relation";
   parameter Real B = -4.05 "Intercept of the logistic relation";
-  parameter Integer seed = 3 "Seed for the random number generator";
+  parameter Integer localSeed = 3004
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -26,19 +29,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -56,31 +67,37 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the small window with the outdoor air temperature 
-and occupancy. The definition of large windows was not clearly presented in the 
+Model predicting the state of the small window with the outdoor air temperature
+and occupancy. The definition of large windows was not clearly presented in the
 original paper.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Herkel, S., Knapp, U. and Pfafferott, J., 
-2008. Towards a model of user behaviour regarding the manual control of windows in 
+The model is documented in the paper &quot;Herkel, S., Knapp, U. and Pfafferott, J.,
+2008. Towards a model of user behaviour regarding the manual control of windows in
 office buildings. Building and environment, 43(4), pp.588-600.&quot;
 </p>
 <p>
 The model parameters are regressed from the field study in 21 individual offices within
-the Fraunhofer Institute’s building in Freiburg, Germany, from July 2002 to July 2003. 
+the Fraunhofer Institute’s building in Freiburg, Germany, from July 2002 to July 2003.
 The outdoor air temperature during the study is majorly in the range of -5 ~ 30 degC.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Herkel2008WindowsSmall.mo b/Buildings/Occupants/Office/Windows/Herkel2008WindowsSmall.mo
index c8a854ec895..e942db2232c 100644
--- a/Buildings/Occupants/Office/Windows/Herkel2008WindowsSmall.mo
+++ b/Buildings/Occupants/Office/Windows/Herkel2008WindowsSmall.mo
@@ -3,7 +3,10 @@ model Herkel2008WindowsSmall "A model to predict occupants' window behavior with
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.16 "Slope of the logistic relation";
   parameter Real B = -2.99 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3005
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,19 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -55,31 +66,37 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the small window with the outdoor air temperature 
-and occupancy. The definition of small windows was not clearly presented in the 
+Model predicting the state of the small window with the outdoor air temperature
+and occupancy. The definition of small windows was not clearly presented in the
 original paper.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Herkel, S., Knapp, U. and Pfafferott, J., 
-2008. Towards a model of user behaviour regarding the manual control of windows in 
+The model is documented in the paper &quot;Herkel, S., Knapp, U. and Pfafferott, J.,
+2008. Towards a model of user behaviour regarding the manual control of windows in
 office buildings. Building and environment, 43(4), pp.588-600.&quot;
 </p>
 <p>
 The model parameters are regressed from the field study in 21 individual offices within
-the Fraunhofer Institute’s building in Freiburg, Germany, from July 2002 to July 2003. 
+the Fraunhofer Institute’s building in Freiburg, Germany, from July 2002 to July 2003.
 The outdoor air temperature during the study is majorly in the range of -5 ~ 30 degC.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo b/Buildings/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo
index f0aacf5574a..32afa6dc597 100644
--- a/Buildings/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo
+++ b/Buildings/Occupants/Office/Windows/Herkel2008WindowsTiltedOpen.mo
@@ -1,10 +1,13 @@
 within Buildings.Occupants.Office.Windows;
-model Herkel2008WindowsTiltedOpen "A model to predict occupants' window behavior with outdoor temperature for tilted-open 
+model Herkel2008WindowsTiltedOpen "A model to predict occupants' window behavior with outdoor temperature for tilted-open
 large windows"
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.08 "Slope of the logistic relation";
   parameter Real B = -3.13 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3006
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -26,19 +29,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -56,31 +67,37 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the small window with the outdoor air temperature 
-and occupancy. The definition of large windows was not clearly presented in the 
+Model predicting the state of the small window with the outdoor air temperature
+and occupancy. The definition of large windows was not clearly presented in the
 original paper.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Herkel, S., Knapp, U. and Pfafferott, J., 
-2008. Towards a model of user behaviour regarding the manual control of windows in 
+The model is documented in the paper &quot;Herkel, S., Knapp, U. and Pfafferott, J.,
+2008. Towards a model of user behaviour regarding the manual control of windows in
 office buildings. Building and environment, 43(4), pp.588-600.&quot;
 </p>
 <p>
 The model parameters are regressed from the field study in 21 individual offices within
-the Fraunhofer Institute’s building in Freiburg, Germany, from July 2002 to July 2003. 
+the Fraunhofer Institute’s building in Freiburg, Germany, from July 2002 to July 2003.
 The outdoor air temperature during the study is majorly in the range of -5 ~ 30 degC.
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo b/Buildings/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo
index c59c63ad5ee..11dec374270 100644
--- a/Buildings/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo
+++ b/Buildings/Occupants/Office/Windows/Rijal2007WindowsTInTOutTComf.mo
@@ -4,7 +4,10 @@ model Rijal2007WindowsTInTOutTComf "A model to predict occupants' window behavio
   parameter Real AIn = 0.171 "Slope of the indoor temperature in the logistic relation";
   parameter Real AOut = 0.166 "Slope of the outdoor temperature in the logistic relation";
   parameter Real B = -6.4 "Intercept of the logistic relation";
-  parameter Integer seed = 3 "Seed for the random number generator";
+  parameter Integer localSeed = 3007
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TIn(
@@ -37,23 +40,29 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   p = Modelica.Math.exp(AIn*(TIn - 273.15)+AOut*(TOut - 273.15)+B)/(Modelica.Math.exp(AIn*(TIn - 273.15)+AOut*(TOut - 273.15)+B) + 1);
   on = false;
+  ran = 0.5;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       if TIn > TComf+2 then
         if not pre(on) then
           p = Modelica.Math.exp(AIn*(TIn - 273.15)+AOut*(TOut - 273.15)+B)/(Modelica.Math.exp(AIn*(TIn - 273.15)+AOut*(TOut - 273.15)+B) + 1);
-          on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+          on = ran < p;
         else
           p = -0.3;
           on = true;
@@ -61,7 +70,7 @@ equation
       elseif TIn < TComf-2 then
         if pre(on) then
           p = Modelica.Math.exp(AIn*(TIn - 273.15)+AOut*(TOut - 273.15)+B)/(Modelica.Math.exp(AIn*(TIn - 273.15)+AOut*(TOut - 273.15)+B) + 1);
-          on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+          on = ran < p;
         else
           p = -0.5;
           on = false;
@@ -87,12 +96,12 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the window with the indoor, outdoor and comfort temperature 
+Model predicting the state of the window with the indoor, outdoor and comfort temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
+When the space is unoccupied, the window is always closed. When the
 space is occupied, the window state is determined by the indoor, outdoor
 and comfort temperature.
 </p>
@@ -101,35 +110,41 @@ When the indoor temperature is within the comfort temperature plus and minus
 2 degC, the window state will not be changed.
 </p>
 <p>
-When the indoor temperature is above the comfort temperature plus 2 degC, 
+When the indoor temperature is above the comfort temperature plus 2 degC,
 if the window is open, it would be kept open; if the window is closed, it might
-be opened, the probability to open the window is determined by the indoor and 
+be opened, the probability to open the window is determined by the indoor and
 outdoor temperature.
 </p>
 <p>
-When the indoor temperature is below the comfort temperature minus 2 degC, 
+When the indoor temperature is below the comfort temperature minus 2 degC,
 if the window is closed, it would be kept closed; if the window is open, it might
-be closed, the probability to close the window is determined by the indoor and 
+be closed, the probability to close the window is determined by the indoor and
 outdoor temperature.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Rijal, H.B., Tuohy, P., Humphreys, 
-M.A., Nicol, J.F., Samuel, A. and Clarke, J., 2007. Using results from field 
-surveys to predict the effect of open windows on thermal comfort and energy 
+The model is documented in the paper &quot;Rijal, H.B., Tuohy, P., Humphreys,
+M.A., Nicol, J.F., Samuel, A. and Clarke, J., 2007. Using results from field
+surveys to predict the effect of open windows on thermal comfort and energy
 use in buildings. Energy and buildings, 39(7), pp.823-836.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study conducted in 15 office 
-buildings in UK between March 1996 and September 1997. Nine of the buildings 
-were in the Oxford area in the central south of England (seven naturally 
-ventilated (NV) and two air conditioned (AC)). Six of the buildings were in 
-Aberdeen on the north-east coast of Scotland (three NV and three AC). 
+The model parameters are regressed from the field study conducted in 15 office
+buildings in UK between March 1996 and September 1997. Nine of the buildings
+were in the Oxford area in the central south of England (seven naturally
+ventilated (NV) and two air conditioned (AC)). Six of the buildings were in
+Aberdeen on the north-east coast of Scotland (three NV and three AC).
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Yun2008WindowsTIn.mo b/Buildings/Occupants/Office/Windows/Yun2008WindowsTIn.mo
index c3f7c3dd13c..7bc39302b26 100644
--- a/Buildings/Occupants/Office/Windows/Yun2008WindowsTIn.mo
+++ b/Buildings/Occupants/Office/Windows/Yun2008WindowsTIn.mo
@@ -5,7 +5,10 @@ model Yun2008WindowsTIn "A model to predict occupants' window behavior with indo
   parameter Real BOpen = -0.629 "Intercept of the logistic relation for opening the window";
   parameter Real AClose = -0.007 "Slope of the logistic relation for closing the window";
   parameter Real BClose = -0.209 "Intercept of the logistic relation for closing the window";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3008
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TIn(
@@ -31,26 +34,32 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false;
   pOpen = Modelica.Math.exp(AOpen*(TIn - 273.15)+BOpen)/(Modelica.Math.exp(AOpen*(TIn - 273.15)+BOpen) + 1);
   pClose = Modelica.Math.exp(AClose*(TIn - 273.15)+BClose)/(Modelica.Math.exp(AClose*(TIn - 273.15)+BClose) + 1);
+  ran = 0.5;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       pOpen = Modelica.Math.exp(AOpen*(TIn - 273.15)+BOpen)/(Modelica.Math.exp(AOpen*(TIn - 273.15)+BOpen) + 1);
       pClose = Modelica.Math.exp(AClose*(TIn - 273.15)+BClose)/(Modelica.Math.exp(AClose*(TIn - 273.15)+BClose) + 1);
       if pre(on) == true and TIn < 303.15 then
-        on = not Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pClose, globalSeed=integer(curSeed));
+        on = not ran < pClose;
       elseif pre(on) == false and TIn > 293.15 then
-        on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pOpen, globalSeed=integer(curSeed));
+        on = ran < pOpen;
       else
         on = pre(on);
       end if;
@@ -72,30 +81,36 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the window with the indoor air temperature 
+Model predicting the state of the window with the indoor air temperature
 and occupancy through Markov approach.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the Probability of closing or opening the window 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the Probability of closing or opening the window
 depends on the indoor air temperature.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Yun, G.Y. and Steemers, K., 
-2008. Time-dependent occupant behaviour models of window control in 
+The model is documented in the paper &quot;Yun, G.Y. and Steemers, K.,
+2008. Time-dependent occupant behaviour models of window control in
 summer. Building and Environment, 43(9), pp.1471-1482.&quot;
 </p>
 <p>
 The model parameters are regressed from the field study in offices without
-night ventilation, located in Cambridge, UK in summer time (13 Jun. to 15 
+night ventilation, located in Cambridge, UK in summer time (13 Jun. to 15
 Sep., 2006).
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 26, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Yun2008WindowsTOut.mo b/Buildings/Occupants/Office/Windows/Yun2008WindowsTOut.mo
index 896fe3ecd6d..32fec607a98 100644
--- a/Buildings/Occupants/Office/Windows/Yun2008WindowsTOut.mo
+++ b/Buildings/Occupants/Office/Windows/Yun2008WindowsTOut.mo
@@ -5,7 +5,10 @@ model Yun2008WindowsTOut "A model to predict occupants' window behavior with out
   parameter Real BOpen = -0.115 "Intercept of the logistic relation for opening the window";
   parameter Real AClose = 0 "Slope of the logistic relation for closing the window";
   parameter Real BClose = -0.040 "Intercept of the logistic relation for closing the window";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3009
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -31,25 +34,32 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false;
   pOpen = Modelica.Math.exp(AOpen*(TOut - 273.15)+BOpen)/(Modelica.Math.exp(AOpen*(TOut - 273.15)+BOpen) + 1);
   pClose = Modelica.Math.exp(AClose*(TOut - 273.15)+BClose)/(Modelica.Math.exp(AClose*(TOut - 273.15)+BClose) + 1);
+  ran = 0.5;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       pOpen = Modelica.Math.exp(AOpen*(TOut - 273.15)+BOpen)/(Modelica.Math.exp(AOpen*(TOut - 273.15)+BOpen) + 1);
       pClose = Modelica.Math.exp(AClose*(TOut - 273.15)+BClose)/(Modelica.Math.exp(AClose*(TOut - 273.15)+BClose) + 1);
       if pre(on) then
-        on = not Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pClose, globalSeed=integer(curSeed));
+        on = not ran < pClose;
       elseif pre(on) == false and TOut > 288.15 then
-        on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=pOpen, globalSeed=integer(curSeed));
+        on = ran < pOpen;
       else
         on = pre(on);
       end if;
@@ -71,30 +81,36 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the window with the outdoor air temperature 
+Model predicting the state of the window with the outdoor air temperature
 and occupancy through Markov approach.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the Probability of closing or opening the window 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the Probability of closing or opening the window
 depends on the outdoor air temperature.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Yun, G.Y. and Steemers, K., 
-2008. Time-dependent occupant behaviour models of window control in 
+The model is documented in the paper &quot;Yun, G.Y. and Steemers, K.,
+2008. Time-dependent occupant behaviour models of window control in
 summer. Building and Environment, 43(9), pp.1471-1482.&quot;
 </p>
 <p>
 The model parameters are regressed from the field study in offices without
-night ventilation, located in Cambridge, UK in summer time (13 Jun. to 15 
+night ventilation, located in Cambridge, UK in summer time (13 Jun. to 15
 Sep., 2006).
 </p>
 </html>",
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 26, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsAll.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsAll.mo
index 0c8c1de07fb..fead16f3f62 100644
--- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsAll.mo
+++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsAll.mo
@@ -3,7 +3,10 @@ model Zhang2012WindowsAll "A model to predict occupants' window behavior with ou
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.10 "Slope of the logistic relation";
   parameter Real B = -4.01 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3010
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,21 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -57,23 +66,23 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the window with the outdoor air temperature 
+Model predicting the state of the window with the outdoor air temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012. 
-Factors influencing the occupants’ window opening behaviour in a naturally 
+The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012.
+Factors influencing the occupants’ window opening behaviour in a naturally
 ventilated office building. Building and Environment, 50, pp.125-134.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study in a naturally 
+The model parameters are regressed from the field study in a naturally
 ventilated office building in Sheffield, UK in 2005/2006. The outdoor air
 temperature range during the study is 0 ~ 30 degC.
 </p>
@@ -81,6 +90,12 @@ temperature range during the study is 0 ~ 30 degC.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsEast.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsEast.mo
index 804d7d86496..7736c570705 100644
--- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsEast.mo
+++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsEast.mo
@@ -3,7 +3,10 @@ model Zhang2012WindowsEast "A model to predict occupants' window behavior with o
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.09 "Slope of the logistic relation";
   parameter Real B = -3.72 "Intercept of the logistic relation";
-  parameter Integer seed = 50 "Seed for the random number generator";
+  parameter Integer localSeed = 3011
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,21 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -57,23 +66,23 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the East-oriented windows with the outdoor air temperature 
+Model predicting the state of the East-oriented windows with the outdoor air temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012. 
-Factors influencing the occupants’ window opening behaviour in a naturally 
+The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012.
+Factors influencing the occupants’ window opening behaviour in a naturally
 ventilated office building. Building and Environment, 50, pp.125-134.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study in a naturally 
+The model parameters are regressed from the field study in a naturally
 ventilated office building in Sheffield, UK in 2005/2006. The outdoor air
 temperature range during the study is 0 ~ 30 degC.
 </p>
@@ -81,6 +90,12 @@ temperature range during the study is 0 ~ 30 degC.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsNorth.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsNorth.mo
index a461cb6e4cd..5ada38ccea1 100644
--- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsNorth.mo
+++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsNorth.mo
@@ -3,7 +3,10 @@ model Zhang2012WindowsNorth "A model to predict occupants' window behavior with
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.12 "Slope of the logistic relation";
   parameter Real B = -4.38 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3012
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,19 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -55,23 +66,23 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the North-oriented window with the outdoor air temperature 
+Model predicting the state of the North-oriented window with the outdoor air temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012. 
-Factors influencing the occupants’ window opening behaviour in a naturally 
+The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012.
+Factors influencing the occupants’ window opening behaviour in a naturally
 ventilated office building. Building and Environment, 50, pp.125-134.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study in a naturally 
+The model parameters are regressed from the field study in a naturally
 ventilated office building in Sheffield, UK in 2005/2006. The outdoor air
 temperature range during the study is 0 ~ 30 degC.
 </p>
@@ -79,6 +90,12 @@ temperature range during the study is 0 ~ 30 degC.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsSouth.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsSouth.mo
index e55242177d4..62bdfcd97d3 100644
--- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsSouth.mo
+++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsSouth.mo
@@ -3,7 +3,10 @@ model Zhang2012WindowsSouth "A model to predict occupants' window behavior with
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.10 "Slope of the logistic relation";
   parameter Real B = -3.64 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 3013
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,21 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -57,23 +66,23 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the South-oriented window with the outdoor air temperature 
+Model predicting the state of the South-oriented window with the outdoor air temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012. 
-Factors influencing the occupants’ window opening behaviour in a naturally 
+The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012.
+Factors influencing the occupants’ window opening behaviour in a naturally
 ventilated office building. Building and Environment, 50, pp.125-134.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study in a naturally 
+The model parameters are regressed from the field study in a naturally
 ventilated office building in Sheffield, UK in 2005/2006. The outdoor air
 temperature range during the study is 0 ~ 30 degC.
 </p>
@@ -81,6 +90,12 @@ temperature range during the study is 0 ~ 30 degC.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Office/Windows/Zhang2012WindowsWest.mo b/Buildings/Occupants/Office/Windows/Zhang2012WindowsWest.mo
index f64e8a8d56b..b0d2c3ef724 100644
--- a/Buildings/Occupants/Office/Windows/Zhang2012WindowsWest.mo
+++ b/Buildings/Occupants/Office/Windows/Zhang2012WindowsWest.mo
@@ -3,7 +3,10 @@ model Zhang2012WindowsWest "A model to predict occupants' window behavior with o
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A = 0.12 "Slope of the logistic relation";
   parameter Real B = -4.77 "Intercept of the logistic relation";
-  parameter Integer seed = 50 "Seed for the random number generator";
+  parameter Integer localSeed = 3014
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,19 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -55,23 +66,23 @@ equation
 defaultComponentName="win",
 Documentation(info="<html>
 <p>
-Model predicting the state of the West-oriented window with the outdoor air temperature 
+Model predicting the state of the West-oriented window with the outdoor air temperature
 and occupancy.
 </p>
 <h4>Dynamics</h4>
 <p>
-When the space is unoccupied, the window is always closed. When the 
-space is occupied, the lower the outdoor temperature is, the lower 
+When the space is unoccupied, the window is always closed. When the
+space is occupied, the lower the outdoor temperature is, the lower
 the chance to open the window.
 </p>
 <h4>References</h4>
 <p>
-The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012. 
-Factors influencing the occupants’ window opening behaviour in a naturally 
+The model is documented in the paper &quot;Zhang, Y. and Barrett, P., 2012.
+Factors influencing the occupants’ window opening behaviour in a naturally
 ventilated office building. Building and Environment, 50, pp.125-134.&quot;
 </p>
 <p>
-The model parameters are regressed from the field study in a naturally 
+The model parameters are regressed from the field study in a naturally
 ventilated office building in Sheffield, UK in 2005/2006. The outdoor air
 temperature range during the study is 0 ~ 30 degC.
 </p>
@@ -79,6 +90,12 @@ temperature range during the study is 0 ~ 30 degC.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo b/Buildings/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo
index 0f806789d5a..1fd24df4277 100644
--- a/Buildings/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo
+++ b/Buildings/Occupants/Residential/AirConditioning/Ren2014ACBedroom.mo
@@ -2,14 +2,21 @@ within Buildings.Occupants.Residential.AirConditioning;
 model Ren2014ACBedroom
   "A model to predict occupants' AC behavior in bedroom with indoor temperature"
   extends Modelica.Blocks.Icons.DiscreteBlock;
-  parameter Real u1 = 304.40 "Threshold for turning off the AC of the Weibull Distribution";
-  parameter Real u2 = 301.90 "Threshold for turning on the AC of the Weibull Distribution";
-  parameter Real L1 = 13.34 "Normalization factor for turning off the AC of the Weibull Distribution";
-  parameter Real L2 = 42.86 "Normalization factor for turning on the AC of the Weibull Distribution";
+  parameter Modelica.Units.SI.Temperature u1 = 304.40
+    "Threshold for turning off the AC of the Weibull Distribution";
+  parameter Modelica.Units.SI.Temperature u2 = 301.90
+    "Threshold for turning on the AC of the Weibull Distribution";
+  parameter Modelica.Units.SI.TemperatureDifference L1 = 13.34
+    "Normalization factor for turning off the AC of the Weibull Distribution";
+  parameter Modelica.Units.SI.TemperatureDifference L2 = 42.86
+    "Normalization factor for turning on the AC of the Weibull Distribution";
   parameter Real k1 = 1.73 "Shape factor for turning off the AC of the Weibull Distribution";
   parameter Real k2 = 1.80 "Shape factor for turning on the AC of the Weibull Distribution";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
-  parameter Integer seed = 10 "Seed for random number generator";
+  parameter Integer localSeed = 4000
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
 
   Modelica.Blocks.Interfaces.RealInput TIn(
     final unit="K",
@@ -36,38 +43,44 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean dummy
+    "Dummy variable for state of the heater (used as random number has two return arguments, and hence negation in the call is not possible)";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false "The initial state of AC is off";
+  dummy = true;
   pOn = 0;
   pOff = 0;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
     pOff = if TIn <= u1 then 1 - Modelica.Math.exp(-((u1-TIn)/L1)^k1*samplePeriod) else 0;
     pOn = if TIn >= u2 then 1 - Modelica.Math.exp(-((TIn-u2)/L2)^k2*samplePeriod) else 0;
+
+    // Call only weibull1DOff, but swap arguments if pre(on) == false, which effectively
+    // renders a call to weibull1DON.
+    // This is done to have only one state for the random number generator.
+    (dummy, state) = Buildings.Occupants.BaseClasses.weibull1DOFF(
+      x=if pre(on) then TIn else u2,
+      u=if pre(on) then u1 else TIn,
+      L=if pre(on) then L1 else L2,
+      k=if pre(on) then k1 else k2,
+      dt=samplePeriod,
+      stateIn=pre(state));
+
     if occ then
       if pre(on) then
-        on = not Buildings.Occupants.BaseClasses.weibull1DOFF(
-          x=TIn,
-          u=u1,
-          L=L1,
-          k=k1,
-          dt=samplePeriod,
-          globalSeed=integer(curSeed));
+        on = not dummy;
       else
-        on = Buildings.Occupants.BaseClasses.weibull1DON(
-          x=TIn,
-          u=u2,
-          L=L2,
-          k=k2,
-          dt=samplePeriod,
-          globalSeed=integer(curSeed));
+        on = dummy;
       end if;
     else
       on = false;
@@ -107,6 +120,12 @@ The model parameters are regressed from the field study in China in 2014.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 23, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo b/Buildings/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo
index 73320264f8b..b91b0bc399e 100644
--- a/Buildings/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo
+++ b/Buildings/Occupants/Residential/AirConditioning/Ren2014ACLivingroom.mo
@@ -2,14 +2,21 @@ within Buildings.Occupants.Residential.AirConditioning;
 model Ren2014ACLivingroom
   "A model to predict occupants' AC behavior in Livingroom with indoor temperature"
   extends Modelica.Blocks.Icons.DiscreteBlock;
-  parameter Real u1 = 303.40 "Threshold for turning off the AC of the Weibull Distribution";
-  parameter Real u2 = 300.90 "Threshold for turning on the AC of the Weibull Distribution";
-  parameter Real L1 = 152.88 "Normalization factor for turning off the AC of the Weibull Distribution";
-  parameter Real L2 = 15.87 "Normalization factor for turning on the AC of the Weibull Distribution";
+  parameter Modelica.Units.SI.Temperature u1 = 303.40
+    "Threshold for turning off the AC of the Weibull Distribution";
+  parameter Modelica.Units.SI.Temperature u2 = 300.90
+    "Threshold for turning on the AC of the Weibull Distribution";
+  parameter Modelica.Units.SI.TemperatureDifference L1 = 152.88
+    "Normalization factor for turning off the AC of the Weibull Distribution";
+  parameter Modelica.Units.SI.TemperatureDifference L2 = 15.87
+    "Normalization factor for turning on the AC of the Weibull Distribution";
   parameter Real k1 = 1.30 "Shape factor for turning off the AC of the Weibull Distribution";
   parameter Real k2 = 2.22 "Shape factor for turning on the AC of the Weibull Distribution";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
-  parameter Integer seed = 10 "Seed for random number generator";
+  parameter Integer localSeed = 4001
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
 
   Modelica.Blocks.Interfaces.RealInput TIn(
     final unit="K",
@@ -35,38 +42,44 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  Boolean dummy
+    "Dummy variable for the state of the heater (used as random number has two return arguments, and hence negation in the call is not possible)";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
+  state = Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+    localSeed = localSeed,
+    globalSeed = globalSeed);
+
   on = false "The initial state of AC is off";
+  dummy = true;
   pOn = 0;
   pOff = 0;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
     pOff = if TIn <= u1 then 1 - Modelica.Math.exp(-((u1-TIn)/L1)^k1*samplePeriod) else 0;
     pOn = if TIn >= u2 then 1 - Modelica.Math.exp(-((TIn-u2)/L2)^k2*samplePeriod) else 0;
+
+    // Call only weibull1DOff, but swap arguments if pre(on) == false, which effectively
+    // renders a call to weibull1DON.
+    // This is done to have only one state for the random number generator.
+    (dummy, state) = Buildings.Occupants.BaseClasses.weibull1DOFF(
+      x=if pre(on) then TIn else u2,
+      u=if pre(on) then u1 else TIn,
+      L=if pre(on) then L1 else L2,
+      k=if pre(on) then k1 else k2,
+      dt=samplePeriod,
+      stateIn=pre(state));
+
     if occ then
       if pre(on) then
-        on = not Buildings.Occupants.BaseClasses.weibull1DOFF(
-          x=TIn,
-          u=u1,
-          L=L1,
-          k=k1,
-          dt=samplePeriod,
-          globalSeed=integer(curSeed));
+        on = not dummy;
       else
-        on = Buildings.Occupants.BaseClasses.weibull1DON(
-          x=TIn,
-          u=u2,
-          L=L2,
-          k=k2,
-          dt=samplePeriod,
-          globalSeed=integer(curSeed));
+        on = dummy;
       end if;
     else
       on = false;
@@ -106,6 +119,12 @@ The model parameters are regressed from the field study in China in 2014.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 23, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo b/Buildings/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo
index e21a25c3f26..e9bb6204d2a 100644
--- a/Buildings/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo
+++ b/Buildings/Occupants/Residential/AirConditioning/Validation/Ren2014ACBedroom.mo
@@ -7,7 +7,7 @@ model Ren2014ACBedroom "Validating the model for AC behaviors"
     annotation (Placement(transformation(extent={{-80,6},{-60,26}})));
   Modelica.Blocks.Sources.Sine Tin(
     amplitude=10,
-    offset=303,
+    offset= 303,
     f=0.001,
     y(unit="K", displayUnit="degC")) "Indoor air temperature"
     annotation (Placement(transformation(extent={{-80,-26},{-60,-6}})));
@@ -46,4 +46,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end Ren2014ACBedroom;
+end Ren2014ACBedroom;
\ No newline at end of file
diff --git a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingEU.mo b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingEU.mo
index 52df7c51349..1c8d5838100 100644
--- a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingEU.mo
+++ b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingEU.mo
@@ -3,7 +3,10 @@ model Nicol2001HeatingEU "A model to predict occupants' heating behavior with ou
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A(final unit="1/K") = -0.32 "Slope of the logistic relation";
   parameter Real B(final unit="1") = 2.72 "Intercept of the logistic relation";
-  parameter Integer seed = 10 "Seed for the random number generator";
+  parameter Integer localSeed = 5000
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,21 +28,28 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -81,6 +91,12 @@ The model parameters are regressed from the field study in the EU in
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 23, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo
index ef6572a26e6..6dfe9d954b4 100644
--- a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo
+++ b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingPakistan.mo
@@ -3,7 +3,10 @@ model Nicol2001HeatingPakistan "A model to predict occupants' heating behavior w
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A(final unit="1/K") = -0.345 "Slope of the logistic relation";
   parameter Real B(final unit="1") = 2.73 "Intercept of the logistic relation";
-  parameter Integer seed = 10 "Seed for the random number generator";
+  parameter Integer localSeed = 5001
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -26,21 +29,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -81,6 +90,12 @@ The model parameters are regressed from the field study in Pakistan in 1999.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 23, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingUK.mo b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingUK.mo
index 228740be0eb..a2d93a54507 100644
--- a/Buildings/Occupants/Residential/Heating/Nicol2001HeatingUK.mo
+++ b/Buildings/Occupants/Residential/Heating/Nicol2001HeatingUK.mo
@@ -3,7 +3,10 @@ model Nicol2001HeatingUK "A model to predict occupants' heating behavior with ou
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A(final unit="1/K") = -0.514 "Slope of the logistic relation";
   parameter Real B(final unit="1") = 5.28 "Intercept of the logistic relation";
-  parameter Integer seed = 10 "Seed for the random number generator";
+  parameter Integer localSeed = 5002
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -26,21 +29,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
 
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
 
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*( TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -82,6 +91,12 @@ The model parameters are regressed from the field study in the UK in
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 20, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsEU.mo b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsEU.mo
index 1dd6f91ab10..b61ae6f3466 100644
--- a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsEU.mo
+++ b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsEU.mo
@@ -3,7 +3,10 @@ model Nicol2001WindowsEU "A model to predict occupants' window behavior with out
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A(final unit="1/K") = 0.104 "Slope of the logistic relation";
   parameter Real B(final unit="1") = -2.31 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 6000
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,19 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -80,6 +91,12 @@ European countries - Sweden, UK, France, Portugal and Greece.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo
index dffbd0787d6..586390cfe66 100644
--- a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo
+++ b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsPakistan.mo
@@ -3,7 +3,10 @@ model Nicol2001WindowsPakistan "A model to predict occupants' window behavior wi
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A(final unit="1/K") = 0.118 "Slope of the logistic relation";
   parameter Real B(final unit="1") = -3.73 "Intercept of the logistic relation";
-  parameter Integer seed = 5 "Seed for the random number generator";
+  parameter Integer localSeed = 6001
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,19 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -80,6 +91,12 @@ ventilated buildings in Pakistan.
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsUK.mo b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsUK.mo
index 93b4a3e3855..fc361f88365 100644
--- a/Buildings/Occupants/Residential/Windows/Nicol2001WindowsUK.mo
+++ b/Buildings/Occupants/Residential/Windows/Nicol2001WindowsUK.mo
@@ -3,7 +3,10 @@ model Nicol2001WindowsUK "A model to predict occupants' window behavior with out
   extends Modelica.Blocks.Icons.DiscreteBlock;
   parameter Real A(final unit="1/K") = 0.169 "Slope of the logistic relation";
   parameter Real B(final unit="1") = -2.65 "Intercept of the logistic relation";
-  parameter Integer seed = 30 "Seed for the random number generator";
+  parameter Integer localSeed = 6002
+    "Local seed to be used to generate the initial state of the random number generator";
+  parameter Integer globalSeed = 30129
+    "Global seed to be combined with the local seed";
   parameter Modelica.Units.SI.Time samplePeriod=120 "Sample period";
 
   Modelica.Blocks.Interfaces.RealInput TOut(
@@ -25,19 +28,27 @@ protected
   parameter Modelica.Units.SI.Time t0(final fixed=false)
     "First sample time instant";
   output Boolean sampleTrigger "True, if sample time instant";
-  Real curSeed "Current value for seed as a real-valued variable";
+  Integer state[Modelica.Math.Random.Generators.Xorshift1024star.nState]
+    "State of the random number generator";
+  discrete Real ran(min=0, max=1) "Random number";
+
 initial equation
   t0 = time;
-  curSeed = t0*seed;
   p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-  on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+
+  (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(
+    stateIn=Modelica.Math.Random.Generators.Xorshift1024star.initialState(
+      localSeed = localSeed,
+      globalSeed = globalSeed));
+  on = ran < p;
+
 equation
   sampleTrigger = sample(t0,samplePeriod);
   when sampleTrigger then
-    curSeed = seed*time;
+    (ran, state) = Modelica.Math.Random.Generators.Xorshift1024star.random(pre(state));
     if occ then
       p = Modelica.Math.exp(A*(TOut - 273.15)+B)/(Modelica.Math.exp(A*(TOut - 273.15)+B) + 1);
-      on = Buildings.Occupants.BaseClasses.binaryVariableGeneration(p=p, globalSeed=integer(curSeed));
+      on = ran < p;
     else
       p = 0;
       on = false;
@@ -80,6 +91,12 @@ The model parameters are regressed from the field study in the UK in
 revisions="<html>
 <ul>
 <li>
+December 6, 2024, by Michael Wetter:<br/>
+Refactored implementation of random number calculations, transfering the local state of
+the random number generator from one call to the next.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4069\">#4069</a>.
+</li>
+<li>
 July 25, 2018, by Zhe Wang:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_BinaryVariableGeneration.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_BinaryVariableGeneration.txt
index 3d53a9d5f4b..a83e5897aa4 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_BinaryVariableGeneration.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_BinaryVariableGeneration.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.192072717545907e-05, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 time=[0e+00, 1e+00]
+y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_ExponentialVariableGeneration.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_ExponentialVariableGeneration.txt
index f6066371ae7..c5c62448d3b 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_ExponentialVariableGeneration.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_ExponentialVariableGeneration.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.676160097122192e+00, 3.676160097122192e+00, 3.676160097122192e+00, 3.676160097122192e+00, 3.676160097122192e+00, 3.676160097122192e+00, 3.676160097122192e+00, 3.676160097122192e+00, 3.676160097122192e+00, 3.676160097122192e+00, 5.464980602264404e-01, 5.464980602264404e-01, 5.464980602264404e-01, 5.464980602264404e-01, 5.464980602264404e-01, 5.464980602264404e-01, 5.464980602264404e-01, 5.464980602264404e-01, 5.464980602264404e-01, 5.464980602264404e-01, 2.294508934020996e+00, 2.294508934020996e+00, 2.294508934020996e+00, 2.294508934020996e+00, 2.294508934020996e+00, 2.294508934020996e+00, 2.294508934020996e+00, 2.294508934020996e+00, 2.294508934020996e+00, 2.294508934020996e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.760837435722351e+00, 1.914939641952515e+00, 1.914939641952515e+00, 1.914939641952515e+00, 1.914939641952515e+00, 1.914939641952515e+00, 1.914939641952515e+00, 1.914939641952515e+00, 1.914939641952515e+00, 1.914939641952515e+00, 1.914939641952515e+00, 4.063043296337128e-01, 4.063043296337128e-01, 4.063043296337128e-01, 4.063043296337128e-01, 4.063043296337128e-01, 4.063043296337128e-01, 4.063043296337128e-01, 4.063043296337128e-01, 4.063043296337128e-01, 4.063229295116426e-01, 3.526898860931396e+00, 3.526898860931396e+00, 3.526898860931396e+00, 3.526898860931396e+00, 3.526898860931396e+00, 3.526898860931396e+00, 3.526898860931396e+00, 3.526898860931396e+00, 3.526898860931396e+00, 3.526898860931396e+00, 1.419326114654541e+01, 1.419326114654541e+01, 1.419326114654541e+01, 1.419326114654541e+01, 1.419326114654541e+01, 1.419326114654541e+01, 1.419326114654541e+01, 1.419326114654541e+01, 1.419326114654541e+01, 1.41932323513619e+01, 1.177770519256592e+01, 1.177770519256592e+01, 1.177770519256592e+01, 1.177770519256592e+01, 1.177770519256592e+01, 1.177770519256592e+01, 1.177770519256592e+01, 1.177770519256592e+01, 1.177770519256592e+01, 1.177770519256592e+01]
 time=[0e+00, 1e+00]
+y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.480116724967957e-01, 8.480116724967957e-01, 8.480116724967957e-01, 8.480116724967957e-01, 8.480116724967957e-01, 8.480116724967957e-01, 8.480116724967957e-01, 8.480116724967957e-01, 8.480116724967957e-01, 8.480116724967957e-01, 8.57283890247345e-01, 8.57283890247345e-01, 8.57283890247345e-01, 8.57283890247345e-01, 8.57283890247345e-01, 8.57283890247345e-01, 8.57283890247345e-01, 8.57283890247345e-01, 8.57283890247345e-01, 8.57283890247345e-01, 3.561156034469604e+00, 3.561156034469604e+00, 3.561156034469604e+00, 3.561156034469604e+00, 3.561156034469604e+00, 3.561156034469604e+00, 3.561156034469604e+00, 3.561156034469604e+00, 3.561156034469604e+00, 3.561156034469604e+00, 4.566150531172752e-02, 4.566150531172752e-02, 4.566150531172752e-02, 4.566150531172752e-02, 4.566150531172752e-02, 4.566150531172752e-02, 4.566150531172752e-02, 4.566150531172752e-02, 4.566150531172752e-02, 4.566150531172752e-02, 5.435731887817383e+00, 5.435731887817383e+00, 5.435731887817383e+00, 5.435731887817383e+00, 5.435731887817383e+00, 5.435731887817383e+00, 5.435731887817383e+00, 5.435731887817383e+00, 5.435731887817383e+00, 5.435731887817383e+00, 3.011641263961792e+00, 3.011641263961792e+00, 3.011641263961792e+00, 3.011641263961792e+00, 3.011641263961792e+00, 3.011641263961792e+00, 3.011641263961792e+00, 3.011641263961792e+00, 3.011641263961792e+00, 3.011666079586313e+00, 7.175082683563232e+00, 7.175082683563232e+00, 7.175082683563232e+00, 7.175082683563232e+00, 7.175082683563232e+00, 7.175082683563232e+00, 7.175082683563232e+00, 7.175082683563232e+00, 7.175082683563232e+00, 7.175082683563232e+00, 5.656979084014893e-01, 5.656979084014893e-01, 5.656979084014893e-01, 5.656979084014893e-01, 5.656979084014893e-01, 5.656979084014893e-01, 5.656979084014893e-01, 5.656979084014893e-01, 5.656979084014893e-01, 5.657987333655924e-01, 9.023652076721191e+00, 9.023652076721191e+00, 9.023652076721191e+00, 9.023652076721191e+00, 9.023652076721191e+00, 9.023652076721191e+00, 9.023652076721191e+00, 9.023652076721191e+00, 9.023652076721191e+00, 9.023652076721191e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Linear1D.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Linear1D.txt
index 3d53a9d5f4b..3886646640d 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Linear1D.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Linear1D.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.192072717545907e-05, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 time=[0e+00, 1e+00]
+y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999940396364401e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit1D.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit1D.txt
index 8ee3db68664..ea971eda34e 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit1D.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit1D.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-20
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 time=[0e+00, 1e+00]
+y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit1DQuadratic.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit1DQuadratic.txt
index 143d71ba3c0..13afc7cedfc 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit1DQuadratic.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit1DQuadratic.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-20
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 time=[0e+00, 1e+00]
+y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999940396364401e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999880792728245e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit2D.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit2D.txt
index a275bff3aed..e7f017d9908 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit2D.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Logit2D.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-20
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.192072717545907e-05, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 time=[0e+00, 1e+00]
+y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Weibull1DOFF.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Weibull1DOFF.txt
index 853d04aac7e..a82eefac5be 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Weibull1DOFF.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Weibull1DOFF.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-20
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999940396364401e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 time=[0e+00, 1e+00]
+y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999880792728245e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Weibull1DON.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Weibull1DON.txt
index e0f3ff82f90..3886646640d 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Weibull1DON.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_Weibull1DON.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-20
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.192072717545907e-05, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 time=[0e+00, 1e+00]
+y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999940396364401e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_WeibullVariableGeneration.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_WeibullVariableGeneration.txt
index 0eb6d5a2b24..d588bf15d81 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_WeibullVariableGeneration.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_BaseClasses_Validation_WeibullVariableGeneration.txt
@@ -1,9 +1,9 @@
-last-generated=2018-09-20
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-y=[3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.058866024017334e+00, 3.265840148925781e+01, 3.265840148925781e+01, 3.265840148925781e+01, 3.265840148925781e+01, 3.265840148925781e+01, 3.265840148925781e+01, 3.265840148925781e+01, 3.265840148925781e+01, 3.265840148925781e+01, 3.265840148925781e+01, 3.392075538635254e+00, 3.392075538635254e+00, 3.392075538635254e+00, 3.392075538635254e+00, 3.392075538635254e+00, 3.392075538635254e+00, 3.392075538635254e+00, 3.392075538635254e+00, 3.392075538635254e+00, 3.392075538635254e+00, 8.136493682861328e+00, 8.136493682861328e+00, 8.136493682861328e+00, 8.136493682861328e+00, 8.136493682861328e+00, 8.136493682861328e+00, 8.136493682861328e+00, 8.136493682861328e+00, 8.136493682861328e+00, 8.136493682861328e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.565073490142822e+00, 5.273796558380127e+00, 5.273796558380127e+00, 5.273796558380127e+00, 5.273796558380127e+00, 5.273796558380127e+00, 5.273796558380127e+00, 5.273796558380127e+00, 5.273796558380127e+00, 5.273796558380127e+00, 5.273796558380127e+00, 1.858607292175293e+00, 1.858607292175293e+00, 1.858607292175293e+00, 1.858607292175293e+00, 1.858607292175293e+00, 1.858607292175293e+00, 1.858607292175293e+00, 1.858607292175293e+00, 1.858607292175293e+00, 1.858636038866364e+00, 6.681583404541016e+00, 6.681583404541016e+00, 6.681583404541016e+00, 6.681583404541016e+00, 6.681583404541016e+00, 6.681583404541016e+00, 6.681583404541016e+00, 6.681583404541016e+00, 6.681583404541016e+00, 6.681583404541016e+00, 1.375083255767822e+01, 1.375083255767822e+01, 1.375083255767822e+01, 1.375083255767822e+01, 1.375083255767822e+01, 1.375083255767822e+01, 1.375083255767822e+01, 1.375083255767822e+01, 1.375083255767822e+01, 1.375080597425745e+01, 1.15208158493042e+01, 1.15208158493042e+01, 1.15208158493042e+01, 1.15208158493042e+01, 1.15208158493042e+01, 1.15208158493042e+01, 1.15208158493042e+01, 1.15208158493042e+01, 1.15208158493042e+01, 1.15208158493042e+01]
 time=[0e+00, 1e+00]
+y=[2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 2.817572593688965e+00, 8.608168601989746e+00, 8.608168601989746e+00, 8.608168601989746e+00, 8.608168601989746e+00, 8.608168601989746e+00, 8.608168601989746e+00, 8.608168601989746e+00, 8.608168601989746e+00, 8.608168601989746e+00, 8.608168601989746e+00, 4.936421394348145e+00, 4.936421394348145e+00, 4.936421394348145e+00, 4.936421394348145e+00, 4.936421394348145e+00, 4.936421394348145e+00, 4.936421394348145e+00, 4.936421394348145e+00, 4.936421394348145e+00, 4.936421394348145e+00, 1.140996837615967e+01, 1.140996837615967e+01, 1.140996837615967e+01, 1.140996837615967e+01, 1.140996837615967e+01, 1.140996837615967e+01, 1.140996837615967e+01, 1.140996837615967e+01, 1.140996837615967e+01, 1.140996837615967e+01, 4.097255170345306e-01, 4.097255170345306e-01, 4.097255170345306e-01, 4.097255170345306e-01, 4.097255170345306e-01, 4.097255170345306e-01, 4.097255170345306e-01, 4.097255170345306e-01, 4.097255170345306e-01, 4.097255170345306e-01, 1.057284832000732e+01, 1.057284832000732e+01, 1.057284832000732e+01, 1.057284832000732e+01, 1.057284832000732e+01, 1.057284832000732e+01, 1.057284832000732e+01, 1.057284832000732e+01, 1.057284832000732e+01, 1.057284832000732e+01, 6.499912261962891e+00, 6.499912261962891e+00, 6.499912261962891e+00, 6.499912261962891e+00, 6.499912261962891e+00, 6.499912261962891e+00, 6.499912261962891e+00, 6.499912261962891e+00, 6.499912261962891e+00, 6.499933996233165e+00, 1.01463794708252e+01, 1.01463794708252e+01, 1.01463794708252e+01, 1.01463794708252e+01, 1.01463794708252e+01, 1.01463794708252e+01, 1.01463794708252e+01, 1.01463794708252e+01, 1.01463794708252e+01, 1.01463794708252e+01, 2.295251846313477e+00, 2.295251846313477e+00, 2.295251846313477e+00, 2.295251846313477e+00, 2.295251846313477e+00, 2.295251846313477e+00, 2.295251846313477e+00, 2.295251846313477e+00, 2.295251846313477e+00, 2.295343857289086e+00, 1.001382255554199e+01, 1.001382255554199e+01, 1.001382255554199e+01, 1.001382255554199e+01, 1.001382255554199e+01, 1.001382255554199e+01, 1.001382255554199e+01, 1.001382255554199e+01, 1.001382255554199e+01, 1.001382255554199e+01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Haldi2008BlindsTIn.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Haldi2008BlindsTIn.txt
index 3f54e83a64f..0e71aa68122 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Haldi2008BlindsTIn.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Haldi2008BlindsTIn.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-bli.TIn=[2.93e+02, 2.963640747070312e+02, 2.995567321777344e+02, 3.024153747558594e+02, 3.047943115234375e+02, 3.065724182128906e+02, 3.076590270996094e+02, 3.079988098144531e+02, 3.07574462890625e+02, 3.064076232910156e+02, 3.045577087402344e+02, 3.021189575195312e+02, 2.992156372070312e+02, 2.959956359863281e+02, 2.92623046875e+02, 2.892696533203125e+02, 2.861062927246094e+02, 2.832941589355469e+02, 2.809765014648438e+02, 2.792713928222656e+02, 2.782656860351562e+02, 2.780106506347656e+02, 2.78519287109375e+02, 2.79765625e+02, 2.816862182617188e+02, 2.841832275390625e+02, 2.8712939453125e+02, 2.903746643066406e+02, 2.93753662109375e+02, 2.970942687988281e+02, 3.00226318359375e+02, 3.029901733398438e+02, 3.052450866699219e+02, 3.068761596679688e+02, 3.0780029296875e+02, 3.079703979492188e+02, 3.073778381347656e+02, 3.060527648925781e+02, 3.040626831054688e+02, 3.01509033203125e+02, 2.985218811035156e+02, 2.952533874511719e+02, 2.918700866699219e+02, 2.885443725585938e+02, 2.854456481933594e+02, 2.827317810058594e+02, 2.805410766601562e+02, 2.789850769042969e+02, 2.7814306640625e+02, 2.780579833984375e+02, 2.787341613769531e+02, 2.801370849609375e+02, 2.821953735351562e+02, 2.848040771484375e+02, 2.878303527832031e+02, 2.911199951171875e+02, 2.945054321289062e+02, 2.978141479492188e+02, 3.008776245117188e+02, 3.035397644042969e+02, 3.056649169921875e+02, 3.071448669433594e+02, 3.079041748046875e+02, 3.079041748046875e+02, 3.071448669433594e+02, 3.056649169921875e+02, 3.035397644042969e+02, 3.008776245117188e+02, 2.978141479492188e+02, 2.945054321289062e+02, 2.911199951171875e+02, 2.878303527832031e+02, 2.848040771484375e+02, 2.821953735351562e+02, 2.801370849609375e+02, 2.787341613769531e+02, 2.780579833984375e+02, 2.7814306640625e+02, 2.789850769042969e+02, 2.805410766601562e+02, 2.827317810058594e+02, 2.854456481933594e+02, 2.885443725585938e+02, 2.918700866699219e+02, 2.952533874511719e+02, 2.985218811035156e+02, 3.01509033203125e+02, 3.040626831054688e+02, 3.060527648925781e+02, 3.073778381347656e+02, 3.079703979492188e+02, 3.0780029296875e+02, 3.068761596679688e+02, 3.052450866699219e+02, 3.029901733398438e+02, 3.00226318359375e+02, 2.970942687988281e+02, 2.93753662109375e+02, 2.903746643066406e+02, 2.8712939453125e+02, 2.841832275390625e+02]
 time=[0e+00, 3.6e+03]
-bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+bli.TIn=[2.93e+02, 2.963640747070312e+02, 2.995567321777344e+02, 3.024153747558594e+02, 3.047943115234375e+02, 3.065724182128906e+02, 3.076590270996094e+02, 3.079988098144531e+02, 3.07574462890625e+02, 3.064076232910156e+02, 3.045577087402344e+02, 3.021189575195312e+02, 2.992156372070312e+02, 2.959956359863281e+02, 2.92623046875e+02, 2.892696533203125e+02, 2.861062927246094e+02, 2.832941589355469e+02, 2.809765014648438e+02, 2.792713928222656e+02, 2.782656860351562e+02, 2.780106506347656e+02, 2.78519287109375e+02, 2.79765625e+02, 2.816862182617188e+02, 2.841832275390625e+02, 2.8712939453125e+02, 2.903746643066406e+02, 2.93753662109375e+02, 2.970942687988281e+02, 3.00226318359375e+02, 3.029901733398438e+02, 3.052450866699219e+02, 3.068761596679688e+02, 3.0780029296875e+02, 3.079703979492188e+02, 3.073778381347656e+02, 3.060527648925781e+02, 3.040626831054688e+02, 3.01509033203125e+02, 2.985218811035156e+02, 2.952533874511719e+02, 2.918700866699219e+02, 2.885443725585938e+02, 2.854456481933594e+02, 2.827317810058594e+02, 2.805410766601562e+02, 2.789850769042969e+02, 2.7814306640625e+02, 2.780579833984375e+02, 2.787341613769531e+02, 2.801370849609375e+02, 2.821953735351562e+02, 2.848040771484375e+02, 2.878303527832031e+02, 2.911199951171875e+02, 2.945054321289062e+02, 2.978141479492188e+02, 3.008776245117188e+02, 3.035397644042969e+02, 3.056649169921875e+02, 3.071448669433594e+02, 3.079041748046875e+02, 3.079041748046875e+02, 3.071448669433594e+02, 3.056649169921875e+02, 3.035397644042969e+02, 3.008776245117188e+02, 2.978141479492188e+02, 2.945054321289062e+02, 2.911199951171875e+02, 2.878303527832031e+02, 2.848040771484375e+02, 2.821953735351562e+02, 2.801370849609375e+02, 2.787341613769531e+02, 2.780579833984375e+02, 2.7814306640625e+02, 2.789850769042969e+02, 2.805410766601562e+02, 2.827317810058594e+02, 2.854456481933594e+02, 2.885443725585938e+02, 2.918700866699219e+02, 2.952533874511719e+02, 2.985218811035156e+02, 3.01509033203125e+02, 3.040626831054688e+02, 3.060527648925781e+02, 3.073778381347656e+02, 3.079703979492188e+02, 3.0780029296875e+02, 3.068761596679688e+02, 3.052450866699219e+02, 3.029901733398438e+02, 3.00226318359375e+02, 2.970942687988281e+02, 2.93753662109375e+02, 2.903746643066406e+02, 2.8712939453125e+02, 2.841832275390625e+02]
+bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 bli.pDown=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.998762011528015e-01, 9.998762011528015e-01, 9.998762011528015e-01, 9.975395202636719e-01, 9.975395202636719e-01, 9.975395202636719e-01, 7.938600778579712e-01, 7.938600778579712e-01, 7.938600778579712e-01, 7.938600778579712e-01, 7.952337712049484e-02, 7.952337712049484e-02, 7.952337712049484e-02, 3.461194783449173e-02, 3.461194783449173e-02, 3.461194783449173e-02, 3.071705102920532e-01, 3.071705102920532e-01, 3.071705102920532e-01, 3.071705102920532e-01, 9.766321778297424e-01, 9.766321778297424e-01, 9.766321778297424e-01, 9.996087551116943e-01, 9.996087551116943e-01, 9.996087551116943e-01, 9.999082088470459e-01, 9.999082088470459e-01, 9.999082088470459e-01, 9.999082088470459e-01, 9.993233680725098e-01, 9.993233680725098e-01, 9.993233680725098e-01, 9.494898319244385e-01, 9.494898319244385e-01, 9.494898319244385e-01, 1.930616348981857e-01, 1.930616348981857e-01, 1.930616348981857e-01, 1.930616348981857e-01, 3.141136094927788e-02, 3.141136094927788e-02, 3.141136094927788e-02, 1.215031743049622e-01, 1.215031743049622e-01, 1.215031743049622e-01, 8.942351341247559e-01, 8.942351341247559e-01, 8.942351341247559e-01, 8.942351341247559e-01]
+bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Haldi2008BlindsTOut.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Haldi2008BlindsTOut.txt
index 2d9a1ddc416..1b43f9ffd07 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Haldi2008BlindsTOut.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Haldi2008BlindsTOut.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-20
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-bli.TOut=[2.93e+02, 2.963640747070312e+02, 2.995567321777344e+02, 3.024153747558594e+02, 3.047943115234375e+02, 3.065724182128906e+02, 3.076590270996094e+02, 3.079988098144531e+02, 3.07574462890625e+02, 3.064076232910156e+02, 3.045577087402344e+02, 3.021189575195312e+02, 2.992156372070312e+02, 2.959956359863281e+02, 2.92623046875e+02, 2.892696533203125e+02, 2.861062927246094e+02, 2.832941589355469e+02, 2.809765014648438e+02, 2.792713928222656e+02, 2.782656860351562e+02, 2.780106506347656e+02, 2.78519287109375e+02, 2.79765625e+02, 2.816862182617188e+02, 2.841832275390625e+02, 2.8712939453125e+02, 2.903746643066406e+02, 2.93753662109375e+02, 2.970942687988281e+02, 3.00226318359375e+02, 3.029901733398438e+02, 3.052450866699219e+02, 3.068761596679688e+02, 3.0780029296875e+02, 3.079703979492188e+02, 3.073778381347656e+02, 3.060527648925781e+02, 3.040626831054688e+02, 3.01509033203125e+02, 2.985218811035156e+02, 2.952533874511719e+02, 2.918700866699219e+02, 2.885443725585938e+02, 2.854456481933594e+02, 2.827317810058594e+02, 2.805410766601562e+02, 2.789850769042969e+02, 2.7814306640625e+02, 2.780579833984375e+02, 2.787341613769531e+02, 2.801370849609375e+02, 2.821953735351562e+02, 2.848040771484375e+02, 2.878303527832031e+02, 2.911199951171875e+02, 2.945054321289062e+02, 2.978141479492188e+02, 3.008776245117188e+02, 3.035397644042969e+02, 3.056649169921875e+02, 3.071448669433594e+02, 3.079041748046875e+02, 3.079041748046875e+02, 3.071448669433594e+02, 3.056649169921875e+02, 3.035397644042969e+02, 3.008776245117188e+02, 2.978141479492188e+02, 2.945054321289062e+02, 2.911199951171875e+02, 2.878303527832031e+02, 2.848040771484375e+02, 2.821953735351562e+02, 2.801370849609375e+02, 2.787341613769531e+02, 2.780579833984375e+02, 2.7814306640625e+02, 2.789850769042969e+02, 2.805410766601562e+02, 2.827317810058594e+02, 2.854456481933594e+02, 2.885443725585938e+02, 2.918700866699219e+02, 2.952533874511719e+02, 2.985218811035156e+02, 3.01509033203125e+02, 3.040626831054688e+02, 3.060527648925781e+02, 3.073778381347656e+02, 3.079703979492188e+02, 3.0780029296875e+02, 3.068761596679688e+02, 3.052450866699219e+02, 3.029901733398438e+02, 3.00226318359375e+02, 2.970942687988281e+02, 2.93753662109375e+02, 2.903746643066406e+02, 2.8712939453125e+02, 2.841832275390625e+02]
 time=[0e+00, 3.6e+03]
-bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+bli.TOut=[2.93e+02, 2.963640747070312e+02, 2.995567321777344e+02, 3.024153747558594e+02, 3.047943115234375e+02, 3.065724182128906e+02, 3.076590270996094e+02, 3.079988098144531e+02, 3.07574462890625e+02, 3.064076232910156e+02, 3.045577087402344e+02, 3.021189575195312e+02, 2.992156372070312e+02, 2.959956359863281e+02, 2.92623046875e+02, 2.892696533203125e+02, 2.861062927246094e+02, 2.832941589355469e+02, 2.809765014648438e+02, 2.792713928222656e+02, 2.782656860351562e+02, 2.780106506347656e+02, 2.78519287109375e+02, 2.79765625e+02, 2.816862182617188e+02, 2.841832275390625e+02, 2.8712939453125e+02, 2.903746643066406e+02, 2.93753662109375e+02, 2.970942687988281e+02, 3.00226318359375e+02, 3.029901733398438e+02, 3.052450866699219e+02, 3.068761596679688e+02, 3.0780029296875e+02, 3.079703979492188e+02, 3.073778381347656e+02, 3.060527648925781e+02, 3.040626831054688e+02, 3.01509033203125e+02, 2.985218811035156e+02, 2.952533874511719e+02, 2.918700866699219e+02, 2.885443725585938e+02, 2.854456481933594e+02, 2.827317810058594e+02, 2.805410766601562e+02, 2.789850769042969e+02, 2.7814306640625e+02, 2.780579833984375e+02, 2.787341613769531e+02, 2.801370849609375e+02, 2.821953735351562e+02, 2.848040771484375e+02, 2.878303527832031e+02, 2.911199951171875e+02, 2.945054321289062e+02, 2.978141479492188e+02, 3.008776245117188e+02, 3.035397644042969e+02, 3.056649169921875e+02, 3.071448669433594e+02, 3.079041748046875e+02, 3.079041748046875e+02, 3.071448669433594e+02, 3.056649169921875e+02, 3.035397644042969e+02, 3.008776245117188e+02, 2.978141479492188e+02, 2.945054321289062e+02, 2.911199951171875e+02, 2.878303527832031e+02, 2.848040771484375e+02, 2.821953735351562e+02, 2.801370849609375e+02, 2.787341613769531e+02, 2.780579833984375e+02, 2.7814306640625e+02, 2.789850769042969e+02, 2.805410766601562e+02, 2.827317810058594e+02, 2.854456481933594e+02, 2.885443725585938e+02, 2.918700866699219e+02, 2.952533874511719e+02, 2.985218811035156e+02, 3.01509033203125e+02, 3.040626831054688e+02, 3.060527648925781e+02, 3.073778381347656e+02, 3.079703979492188e+02, 3.0780029296875e+02, 3.068761596679688e+02, 3.052450866699219e+02, 3.029901733398438e+02, 3.00226318359375e+02, 2.970942687988281e+02, 2.93753662109375e+02, 2.903746643066406e+02, 2.8712939453125e+02, 2.841832275390625e+02]
+bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 bli.pDown=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.406881928443909e-01, 9.406881928443909e-01, 9.406881928443909e-01, 8.56350839138031e-01, 8.56350839138031e-01, 8.56350839138031e-01, 5.652093887329102e-01, 5.652093887329102e-01, 5.652093887329102e-01, 5.652093887329102e-01, 2.729763686656952e-01, 2.729763686656952e-01, 2.729763686656952e-01, 2.197337001562119e-01, 2.197337001562119e-01, 2.197337001562119e-01, 3.906258642673492e-01, 3.906258642673492e-01, 3.906258642673492e-01, 3.906258642673492e-01, 7.3926842212677e-01, 7.3926842212677e-01, 7.3926842212677e-01, 9.158591032028198e-01, 9.158591032028198e-01, 9.158591032028198e-01, 9.459221363067627e-01, 9.459221363067627e-01, 9.459221363067627e-01, 9.459221363067627e-01, 9.009772539138794e-01, 9.009772539138794e-01, 9.009772539138794e-01, 6.858632564544678e-01, 6.858632564544678e-01, 6.858632564544678e-01, 3.437943160533905e-01, 3.437943160533905e-01, 3.437943160533905e-01, 3.437943160533905e-01, 2.141589969396591e-01, 2.141589969396591e-01, 2.141589969396591e-01, 3.045613765716553e-01, 3.045613765716553e-01, 3.045613765716553e-01, 6.270378828048706e-01, 6.270378828048706e-01, 6.270378828048706e-01, 6.270378828048706e-01]
+bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Inkarojrit2008BlindsSolarIntensity.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Inkarojrit2008BlindsSolarIntensity.txt
index 0a187241ca4..b471adaa086 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Inkarojrit2008BlindsSolarIntensity.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Inkarojrit2008BlindsSolarIntensity.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-bli.H=[3e+02, 3.560676879882812e+02, 4.092789306640625e+02, 4.569228515625e+02, 4.965721130371094e+02, 5.26206787109375e+02, 5.443170166015625e+02, 5.499802856445312e+02, 5.42907958984375e+02, 5.234603271484375e+02, 4.926282958984375e+02, 4.519825744628906e+02, 4.035939025878906e+02, 3.49927490234375e+02, 2.937174682617186e+02, 2.378275299072266e+02, 1.851050415039062e+02, 1.382360076904297e+02, 9.960825347900391e+01, 7.118970489501953e+01, 5.442818832397461e+01, 5.017763137817383e+01, 5.865459060668945e+01, 7.942719268798828e+01, 1.114371566772461e+02, 1.530536804199219e+02, 2.021565856933594e+02, 2.562442321777345e+02, 3.125610656738283e+02, 3.682379760742188e+02, 4.204384155273438e+02, 4.665029602050781e+02, 5.040848083496094e+02, 5.31269287109375e+02, 5.466715087890625e+02, 5.495066528320312e+02, 5.396304321289062e+02, 5.175459594726562e+02, 4.843782653808594e+02, 4.418172302246094e+02, 3.920311279296875e+02, 3.37556396484375e+02, 2.811683044433594e+02, 2.257396087646484e+02, 1.740941925048828e+02, 1.288632202148438e+02, 9.235102844238281e+01, 6.641776275634766e+01, 5.23846435546875e+01, 5.096659851074219e+01, 6.223587036132812e+01, 8.561833953857422e+01, 1.199227447509766e+02, 1.634014129638672e+02, 2.13839263916016e+02, 2.686666870117191e+02, 3.250904235839847e+02, 3.802359008789062e+02, 4.312936706542969e+02, 4.756625061035156e+02, 5.110819702148438e+02, 5.357476196289062e+02, 5.4840283203125e+02, 5.4840283203125e+02, 5.357476196289062e+02, 5.110819702148438e+02, 4.756625061035156e+02, 4.312936706542969e+02, 3.802359008789062e+02, 3.250904235839844e+02, 2.686666870117188e+02, 2.138392639160156e+02, 1.634014129638672e+02, 1.199227447509766e+02, 8.561833953857422e+01, 6.223587036132812e+01, 5.096659851074219e+01, 5.23846435546875e+01, 6.641776275634766e+01, 9.235102844238281e+01, 1.288632202148438e+02, 1.740941925048828e+02, 2.257396087646484e+02, 2.811683044433594e+02, 3.37556396484375e+02, 3.920311279296875e+02, 4.418172302246094e+02, 4.843782653808594e+02, 5.175459594726562e+02, 5.396304321289062e+02, 5.495066528320312e+02, 5.466715087890625e+02, 5.31269287109375e+02, 5.040848083496094e+02, 4.665029602050781e+02, 4.204384155273438e+02, 3.682379760742188e+02, 3.125610656738281e+02, 2.562442321777344e+02, 2.021565856933594e+02, 1.530536804199219e+02]
 time=[0e+00, 3.6e+03]
-bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bli.H=[3e+02, 3.560676879882812e+02, 4.092789306640625e+02, 4.569228515625e+02, 4.965721130371094e+02, 5.26206787109375e+02, 5.443170166015625e+02, 5.499802856445312e+02, 5.42907958984375e+02, 5.234603271484375e+02, 4.926282958984375e+02, 4.519825744628906e+02, 4.035939025878906e+02, 3.49927490234375e+02, 2.937174682617186e+02, 2.378275299072266e+02, 1.851050415039062e+02, 1.382360076904297e+02, 9.960825347900391e+01, 7.118970489501953e+01, 5.442818832397461e+01, 5.017763137817383e+01, 5.865459060668945e+01, 7.942719268798828e+01, 1.114371566772461e+02, 1.530536804199219e+02, 2.021565856933594e+02, 2.562442321777345e+02, 3.125610656738283e+02, 3.682379760742188e+02, 4.204384155273438e+02, 4.665029602050781e+02, 5.040848083496094e+02, 5.31269287109375e+02, 5.466715087890625e+02, 5.495066528320312e+02, 5.396304321289062e+02, 5.175459594726562e+02, 4.843782653808594e+02, 4.418172302246094e+02, 3.920311279296875e+02, 3.37556396484375e+02, 2.811683044433594e+02, 2.257396087646484e+02, 1.740941925048828e+02, 1.288632202148438e+02, 9.235102844238281e+01, 6.641776275634766e+01, 5.23846435546875e+01, 5.096659851074219e+01, 6.223587036132812e+01, 8.561833953857422e+01, 1.199227447509766e+02, 1.634014129638672e+02, 2.13839263916016e+02, 2.686666870117191e+02, 3.250904235839847e+02, 3.802359008789062e+02, 4.312936706542969e+02, 4.756625061035156e+02, 5.110819702148438e+02, 5.357476196289062e+02, 5.4840283203125e+02, 5.4840283203125e+02, 5.357476196289062e+02, 5.110819702148438e+02, 4.756625061035156e+02, 4.312936706542969e+02, 3.802359008789062e+02, 3.250904235839844e+02, 2.686666870117188e+02, 2.138392639160156e+02, 1.634014129638672e+02, 1.199227447509766e+02, 8.561833953857422e+01, 6.223587036132812e+01, 5.096659851074219e+01, 5.23846435546875e+01, 6.641776275634766e+01, 9.235102844238281e+01, 1.288632202148438e+02, 1.740941925048828e+02, 2.257396087646484e+02, 2.811683044433594e+02, 3.37556396484375e+02, 3.920311279296875e+02, 4.418172302246094e+02, 4.843782653808594e+02, 5.175459594726562e+02, 5.396304321289062e+02, 5.495066528320312e+02, 5.466715087890625e+02, 5.31269287109375e+02, 5.040848083496094e+02, 4.665029602050781e+02, 4.204384155273438e+02, 3.682379760742188e+02, 3.125610656738281e+02, 2.562442321777344e+02, 2.021565856933594e+02, 1.530536804199219e+02]
+bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 bli.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.747020363807678e-01, 8.747020363807678e-01, 8.747020363807678e-01, 6.133540272712708e-01, 6.133540272712708e-01, 6.133540272712708e-01, 3.729205727577209e-01, 3.729205727577209e-01, 3.729205727577209e-01, 3.729205727577209e-01, 2.686781287193298e-01, 2.686781287193298e-01, 2.686781287193298e-01, 2.511171102523804e-01, 2.511171102523804e-01, 2.511171102523804e-01, 3.070766031742096e-01, 3.070766031742096e-01, 3.070766031742096e-01, 3.070766031742096e-01, 4.745050072669983e-01, 4.745050072669983e-01, 4.745050072669983e-01, 7.650439739227295e-01, 7.650439739227295e-01, 7.650439739227295e-01, 9.034000039100647e-01, 9.034000039100647e-01, 9.034000039100647e-01, 9.034000039100647e-01, 7.161380052566528e-01, 7.161380052566528e-01, 7.161380052566528e-01, 4.362659752368927e-01, 4.362659752368927e-01, 4.362659752368927e-01, 2.916191220283508e-01, 2.916191220283508e-01, 2.916191220283508e-01, 2.916191220283508e-01, 2.492319047451019e-01, 2.492319047451019e-01, 2.492319047451019e-01, 2.789024412631989e-01, 2.789024412631989e-01, 2.789024412631989e-01, 4.024532437324524e-01, 4.024532437324524e-01, 4.024532437324524e-01, 4.024532437324524e-01]
+bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Zhang2012BlindsSolarAltitude.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Zhang2012BlindsSolarAltitude.txt
index 2753c3d12e0..ecb3bacbecc 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Zhang2012BlindsSolarAltitude.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Zhang2012BlindsSolarAltitude.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-21
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 bli.solarAltitude=[6.108646988868713e-01, 7.282925248146057e-01, 8.397378325462341e-01, 9.395228624343872e-01, 1.022564053535461e+00, 1.084630608558655e+00, 1.122560739517212e+00, 1.134421706199646e+00, 1.119609475135803e+00, 1.07887864112854e+00, 1.014304161071777e+00, 9.291760325431824e-01, 8.278310894966125e-01, 7.154325246810913e-01, 5.977066755294798e-01, 4.806511104106903e-01, 3.702294826507568e-01, 2.720673084259033e-01, 1.911655813455582e-01, 1.316459625959396e-01, 9.654075652360916e-02, 8.763842284679413e-02, 1.053925082087517e-01, 1.488985121250153e-01, 2.159399539232254e-01, 3.031013309955597e-01, 4.059421122074127e-01, 5.192229151725772e-01, 6.371725797653202e-01, 7.537819147109985e-01, 8.631101250648499e-01, 9.595874547958374e-01, 1.038298606872559e+00, 1.095233559608459e+00, 1.12749183177948e+00, 1.133429884910583e+00, 1.11274516582489e+00, 1.066491484642029e+00, 9.970253705978394e-01, 9.078857898712158e-01, 8.036141395568848e-01, 6.895225644111633e-01, 5.714237093925476e-01, 4.553342461585999e-01, 3.471684455871582e-01, 2.524369955062866e-01, 1.759660989046097e-01, 1.216516420245171e-01, 9.226077049970627e-02, 8.929082751274109e-02, 1.128931120038033e-01, 1.618651896715164e-01, 2.337121218442917e-01, 3.247735500335693e-01, 4.304102659225471e-01, 5.452404618263252e-01, 6.634139418601998e-01, 7.789102792739868e-01, 8.858453035354614e-01, 9.787710905075073e-01, 1.052953362464905e+00, 1.104612946510315e+00, 1.131117939949036e+00, 1.131117939949036e+00, 1.104612946510315e+00, 1.052953362464905e+00, 9.787710905075073e-01, 8.858453035354614e-01, 7.789102792739868e-01, 6.63413941860199e-01, 5.452404618263245e-01, 4.304102659225464e-01, 3.247735500335693e-01, 2.337121218442917e-01, 1.618651896715164e-01, 1.128931120038033e-01, 8.929082751274109e-02, 9.226077049970627e-02, 1.216516420245171e-01, 1.759660989046097e-01, 2.524369955062866e-01, 3.471684455871582e-01, 4.553342461585999e-01, 5.714237093925476e-01, 6.895225644111633e-01, 8.036141395568848e-01, 9.078857898712158e-01, 9.970253705978394e-01, 1.066491484642029e+00, 1.11274516582489e+00, 1.133429884910583e+00, 1.12749183177948e+00, 1.095233559608459e+00, 1.038298606872559e+00, 9.595874547958374e-01, 8.631101250648499e-01, 7.537819147109985e-01, 6.371725797653198e-01, 5.192229151725769e-01, 4.059421122074127e-01, 3.031013309955597e-01]
 bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
-bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-bli.pUp=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.870518743991852e-02, 9.870518743991852e-02, 9.870518743991852e-02, 8.774995803833008e-02, 8.774995803833008e-02, 8.774995803833008e-02, 0e+00, 0e+00, 0e+00, 0e+00]
+bli.pUp=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Zhang2012BlindsSolarIntensity.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Zhang2012BlindsSolarIntensity.txt
index e641c3344a2..496229feb27 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Zhang2012BlindsSolarIntensity.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Blinds_Validation_Zhang2012BlindsSolarIntensity.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-bli.H=[3e+02, 3.560676879882812e+02, 4.092789306640625e+02, 4.569228515625e+02, 4.965721130371094e+02, 5.26206787109375e+02, 5.443170166015625e+02, 5.499802856445312e+02, 5.42907958984375e+02, 5.234603271484375e+02, 4.926282958984375e+02, 4.519825744628906e+02, 4.035939025878906e+02, 3.49927490234375e+02, 2.937174682617186e+02, 2.378275299072266e+02, 1.851050415039062e+02, 1.382360076904297e+02, 9.960825347900391e+01, 7.118970489501953e+01, 5.442818832397461e+01, 5.017763137817383e+01, 5.865459060668945e+01, 7.942719268798828e+01, 1.114371566772461e+02, 1.530536804199219e+02, 2.021565856933594e+02, 2.562442321777345e+02, 3.125610656738283e+02, 3.682379760742188e+02, 4.204384155273438e+02, 4.665029602050781e+02, 5.040848083496094e+02, 5.31269287109375e+02, 5.466715087890625e+02, 5.495066528320312e+02, 5.396304321289062e+02, 5.175459594726562e+02, 4.843782653808594e+02, 4.418172302246094e+02, 3.920311279296875e+02, 3.37556396484375e+02, 2.811683044433594e+02, 2.257396087646484e+02, 1.740941925048828e+02, 1.288632202148438e+02, 9.235102844238281e+01, 6.641776275634766e+01, 5.23846435546875e+01, 5.096659851074219e+01, 6.223587036132812e+01, 8.561833953857422e+01, 1.199227447509766e+02, 1.634014129638672e+02, 2.13839263916016e+02, 2.686666870117191e+02, 3.250904235839847e+02, 3.802359008789062e+02, 4.312936706542969e+02, 4.756625061035156e+02, 5.110819702148438e+02, 5.357476196289062e+02, 5.4840283203125e+02, 5.4840283203125e+02, 5.357476196289062e+02, 5.110819702148438e+02, 4.756625061035156e+02, 4.312936706542969e+02, 3.802359008789062e+02, 3.250904235839844e+02, 2.686666870117188e+02, 2.138392639160156e+02, 1.634014129638672e+02, 1.199227447509766e+02, 8.561833953857422e+01, 6.223587036132812e+01, 5.096659851074219e+01, 5.23846435546875e+01, 6.641776275634766e+01, 9.235102844238281e+01, 1.288632202148438e+02, 1.740941925048828e+02, 2.257396087646484e+02, 2.811683044433594e+02, 3.37556396484375e+02, 3.920311279296875e+02, 4.418172302246094e+02, 4.843782653808594e+02, 5.175459594726562e+02, 5.396304321289062e+02, 5.495066528320312e+02, 5.466715087890625e+02, 5.31269287109375e+02, 5.040848083496094e+02, 4.665029602050781e+02, 4.204384155273438e+02, 3.682379760742188e+02, 3.125610656738281e+02, 2.562442321777344e+02, 2.021565856933594e+02, 1.530536804199219e+02]
 time=[0e+00, 3.6e+03]
-bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-bli.pUp=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.568996012210846e-01, 1.568996012210846e-01, 1.568996012210846e-01, 1.356247514486313e-01, 1.356247514486313e-01, 1.356247514486313e-01, 0e+00, 0e+00, 0e+00, 0e+00]
+bli.H=[3e+02, 3.560676879882812e+02, 4.092789306640625e+02, 4.569228515625e+02, 4.965721130371094e+02, 5.26206787109375e+02, 5.443170166015625e+02, 5.499802856445312e+02, 5.42907958984375e+02, 5.234603271484375e+02, 4.926282958984375e+02, 4.519825744628906e+02, 4.035939025878906e+02, 3.49927490234375e+02, 2.937174682617186e+02, 2.378275299072266e+02, 1.851050415039062e+02, 1.382360076904297e+02, 9.960825347900391e+01, 7.118970489501953e+01, 5.442818832397461e+01, 5.017763137817383e+01, 5.865459060668945e+01, 7.942719268798828e+01, 1.114371566772461e+02, 1.530536804199219e+02, 2.021565856933594e+02, 2.562442321777345e+02, 3.125610656738283e+02, 3.682379760742188e+02, 4.204384155273438e+02, 4.665029602050781e+02, 5.040848083496094e+02, 5.31269287109375e+02, 5.466715087890625e+02, 5.495066528320312e+02, 5.396304321289062e+02, 5.175459594726562e+02, 4.843782653808594e+02, 4.418172302246094e+02, 3.920311279296875e+02, 3.37556396484375e+02, 2.811683044433594e+02, 2.257396087646484e+02, 1.740941925048828e+02, 1.288632202148438e+02, 9.235102844238281e+01, 6.641776275634766e+01, 5.23846435546875e+01, 5.096659851074219e+01, 6.223587036132812e+01, 8.561833953857422e+01, 1.199227447509766e+02, 1.634014129638672e+02, 2.13839263916016e+02, 2.686666870117191e+02, 3.250904235839847e+02, 3.802359008789062e+02, 4.312936706542969e+02, 4.756625061035156e+02, 5.110819702148438e+02, 5.357476196289062e+02, 5.4840283203125e+02, 5.4840283203125e+02, 5.357476196289062e+02, 5.110819702148438e+02, 4.756625061035156e+02, 4.312936706542969e+02, 3.802359008789062e+02, 3.250904235839844e+02, 2.686666870117188e+02, 2.138392639160156e+02, 1.634014129638672e+02, 1.199227447509766e+02, 8.561833953857422e+01, 6.223587036132812e+01, 5.096659851074219e+01, 5.23846435546875e+01, 6.641776275634766e+01, 9.235102844238281e+01, 1.288632202148438e+02, 1.740941925048828e+02, 2.257396087646484e+02, 2.811683044433594e+02, 3.37556396484375e+02, 3.920311279296875e+02, 4.418172302246094e+02, 4.843782653808594e+02, 5.175459594726562e+02, 5.396304321289062e+02, 5.495066528320312e+02, 5.466715087890625e+02, 5.31269287109375e+02, 5.040848083496094e+02, 4.665029602050781e+02, 4.204384155273438e+02, 3.682379760742188e+02, 3.125610656738281e+02, 2.562442321777344e+02, 2.021565856933594e+02, 1.530536804199219e+02]
+bli.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+bli.pUp=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.553443819284439e-01, 1.553443819284439e-01, 1.553443819284439e-01, 1.203456446528435e-01, 1.203456446528435e-01, 1.203456446528435e-01, 1.203456446528435e-01, 7.419273257255554e-02, 7.419273257255554e-02, 7.419273257255554e-02, 4.707092791795731e-02, 4.707092791795731e-02, 4.707092791795731e-02, 3.998210281133652e-02, 3.998210281133652e-02, 3.998210281133652e-02, 3.998210281133652e-02, 5.004888400435448e-02, 5.004888400435448e-02, 5.004888400435448e-02, 8.091346919536591e-02, 8.091346919536591e-02, 8.091346919536591e-02, 1.282423436641693e-01, 1.282423436641693e-01, 1.282423436641693e-01, 1.282423436641693e-01, 1.568996012210846e-01, 1.568996012210846e-01, 1.568996012210846e-01, 1.356247514486313e-01, 1.356247514486313e-01, 1.356247514486313e-01, 8.818501234054565e-02, 8.818501234054565e-02, 8.818501234054565e-02, 8.818501234054565e-02]
+bli.blindState=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Gunay2016Light.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Gunay2016Light.txt
index 9ba2888ccee..cf515b7a4e2 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Gunay2016Light.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Gunay2016Light.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-lig.occ=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-lig.ill=[2.5e+02, 2.948541564941406e+02, 3.374231567382812e+02, 3.755382690429688e+02, 4.072576904296875e+02, 4.309654235839844e+02, 4.4545361328125e+02, 4.499842224121094e+02, 4.443263549804688e+02, 4.287682800292969e+02, 4.041026611328125e+02, 3.715860595703125e+02, 3.328751220703125e+02, 2.899419860839844e+02, 2.449739837646484e+02, 2.002620239257812e+02, 1.580840301513672e+02, 1.205888061523438e+02, 8.968659973144531e+01, 6.695176696777344e+01, 5.354254913330078e+01, 5.014210510253906e+01, 5.692367172241211e+01, 7.354175567626953e+01, 9.914972686767578e+01, 1.324429473876953e+02, 1.717252655029297e+02, 2.149953918457033e+02, 2.600488586425783e+02, 3.045903930664062e+02, 3.463507385253906e+02, 3.832023620605469e+02, 4.132678527832031e+02, 4.350154418945312e+02, 4.473371887207031e+02, 4.496053466796875e+02, 4.41704345703125e+02, 4.240367431640625e+02, 3.975026245117188e+02, 3.634537963867188e+02, 3.236249084472656e+02, 2.800451049804688e+02, 2.349346313476562e+02, 1.905916900634766e+02, 1.492753601074219e+02, 1.13090576171875e+02, 8.388082122802734e+01, 6.313421249389648e+01, 5.190771484375e+01, 5.077327728271484e+01, 5.97886962890625e+01, 7.849466705322266e+01, 1.059381942749023e+02, 1.407211303710938e+02, 1.810714111328128e+02, 2.249333496093753e+02, 2.700723571777347e+02, 3.14188720703125e+02, 3.55034912109375e+02, 3.905299987792969e+02, 4.188655700683594e+02, 4.385981140136719e+02, 4.487222595214844e+02, 4.487222595214844e+02, 4.385981140136719e+02, 4.188655700683594e+02, 3.905299987792969e+02, 3.55034912109375e+02, 3.14188720703125e+02, 2.700723571777344e+02, 2.24933349609375e+02, 1.810714111328125e+02, 1.407211303710938e+02, 1.059381942749023e+02, 7.849466705322266e+01, 5.97886962890625e+01, 5.077327728271484e+01, 5.190771484375e+01, 6.313421249389648e+01, 8.388082122802734e+01, 1.13090576171875e+02, 1.492753601074219e+02, 1.905916900634766e+02, 2.349346313476562e+02, 2.800451049804688e+02, 3.236249084472656e+02, 3.634537963867188e+02, 3.975026245117188e+02, 4.240367431640625e+02, 4.41704345703125e+02, 4.496053466796875e+02, 4.473371887207031e+02, 4.350154418945312e+02, 4.132678527832031e+02, 3.832023620605469e+02, 3.463507385253906e+02, 3.045903930664062e+02, 2.600488586425781e+02, 2.149953918457031e+02, 1.717252655029297e+02, 1.324429473876953e+02]
 time=[0e+00, 3.6e+03]
+lig.ill=[2.5e+02, 2.948541564941406e+02, 3.374231567382812e+02, 3.755382690429688e+02, 4.072576904296875e+02, 4.309654235839844e+02, 4.4545361328125e+02, 4.499842224121094e+02, 4.443263549804688e+02, 4.287682800292969e+02, 4.041026611328125e+02, 3.715860595703125e+02, 3.328751220703125e+02, 2.899419860839844e+02, 2.449739837646484e+02, 2.002620239257812e+02, 1.580840301513672e+02, 1.205888061523438e+02, 8.968659973144531e+01, 6.695176696777344e+01, 5.354254913330078e+01, 5.014210510253906e+01, 5.692367172241211e+01, 7.354175567626953e+01, 9.914972686767578e+01, 1.324429473876953e+02, 1.717252655029297e+02, 2.149953918457033e+02, 2.600488586425783e+02, 3.045903930664062e+02, 3.463507385253906e+02, 3.832023620605469e+02, 4.132678527832031e+02, 4.350154418945312e+02, 4.473371887207031e+02, 4.496053466796875e+02, 4.41704345703125e+02, 4.240367431640625e+02, 3.975026245117188e+02, 3.634537963867188e+02, 3.236249084472656e+02, 2.800451049804688e+02, 2.349346313476562e+02, 1.905916900634766e+02, 1.492753601074219e+02, 1.13090576171875e+02, 8.388082122802734e+01, 6.313421249389648e+01, 5.190771484375e+01, 5.077327728271484e+01, 5.97886962890625e+01, 7.849466705322266e+01, 1.059381942749023e+02, 1.407211303710938e+02, 1.810714111328128e+02, 2.249333496093753e+02, 2.700723571777347e+02, 3.14188720703125e+02, 3.55034912109375e+02, 3.905299987792969e+02, 4.188655700683594e+02, 4.385981140136719e+02, 4.487222595214844e+02, 4.487222595214844e+02, 4.385981140136719e+02, 4.188655700683594e+02, 3.905299987792969e+02, 3.55034912109375e+02, 3.14188720703125e+02, 2.700723571777344e+02, 2.24933349609375e+02, 1.810714111328125e+02, 1.407211303710938e+02, 1.059381942749023e+02, 7.849466705322266e+01, 5.97886962890625e+01, 5.077327728271484e+01, 5.190771484375e+01, 6.313421249389648e+01, 8.388082122802734e+01, 1.13090576171875e+02, 1.492753601074219e+02, 1.905916900634766e+02, 2.349346313476562e+02, 2.800451049804688e+02, 3.236249084472656e+02, 3.634537963867188e+02, 3.975026245117188e+02, 4.240367431640625e+02, 4.41704345703125e+02, 4.496053466796875e+02, 4.473371887207031e+02, 4.350154418945312e+02, 4.132678527832031e+02, 3.832023620605469e+02, 3.463507385253906e+02, 3.045903930664062e+02, 2.600488586425781e+02, 2.149953918457031e+02, 1.717252655029297e+02, 1.324429473876953e+02]
+lig.occ=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 lig.pArriv=[3.429895341396332e-01, 2.585176527500153e-01, 1.920400708913803e-01, 1.443223357200623e-01, 1.125135943293571e-01, 9.290339797735214e-02, 8.24827179312706e-02, 7.944894582033157e-02, 8.325378596782684e-02, 9.458328038454056e-02, 1.153803393244743e-01, 1.48770809173584e-01, 1.98471337556839e-01, 2.670820355415344e-01, 3.532541096210481e-01, 4.495823681354523e-01, 5.44195294380188e-01, 6.259077787399292e-01, 6.884366273880005e-01, 7.305538058280945e-01, 7.53639280796051e-01, 7.592772245407104e-01, 7.479459047317505e-01, 7.187206149101257e-01, 6.698822379112244e-01, 6.006114482879639e-01, 5.136147737503052e-01, 4.170346260070797e-01, 3.229079842567441e-01, 2.420792877674103e-01, 1.798806041479111e-01, 1.360113471746445e-01, 1.072244718670845e-01, 8.987689763307571e-02, 8.120884001255035e-02, 7.969868183135986e-02, 8.507263660430908e-02, 9.829353541135788e-02, 1.21583066880703e-01, 1.58279687166214e-01, 2.120480537414551e-01, 2.848751544952393e-01, 3.741598725318909e-01, 4.712006151676178e-01, 5.637810826301575e-01, 6.41569972038269e-01, 6.995325088500977e-01, 7.372632026672363e-01, 7.563608884811401e-01, 7.582374215126038e-01, 7.430537939071655e-01, 7.09621787071228e-01, 6.562340259552002e-01, 5.826131105422974e-01, 4.925898611545557e-01, 3.954643011093134e-01, 3.035074174404139e-01, 2.265844941139221e-01, 1.686375141143799e-01, 1.284459233283997e-01, 1.02496325969696e-01, 8.727401494979858e-02, 8.028357475996017e-02, 8.028357475996017e-02, 8.727401494979858e-02, 1.02496325969696e-01, 1.284459233283997e-01, 1.686375141143799e-01, 2.265844941139221e-01, 3.035074174404144e-01, 3.95464301109314e-01, 4.925898611545563e-01, 5.826131105422974e-01, 6.562340259552002e-01, 7.09621787071228e-01, 7.430537939071655e-01, 7.582374215126038e-01, 7.563608884811401e-01, 7.372632026672363e-01, 6.995325088500977e-01, 6.41569972038269e-01, 5.637810826301575e-01, 4.712006151676178e-01, 3.741598725318909e-01, 2.848751544952393e-01, 2.120480537414551e-01, 1.58279687166214e-01, 1.21583066880703e-01, 9.829353541135788e-02, 8.507263660430908e-02, 7.969868183135986e-02, 8.120884001255035e-02, 8.987689763307571e-02, 1.072244718670845e-01, 1.360113471746445e-01, 1.798806041479111e-01, 2.420792877674103e-01, 3.229079842567444e-01, 4.170346260070801e-01, 5.136147737503052e-01, 6.006114482879639e-01]
-lig.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+lig.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Hunt1979Light.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Hunt1979Light.txt
index 08a27ed35fd..938751ff657 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Hunt1979Light.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Hunt1979Light.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-lig.occ=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-lig.ill=[2.5e+02, 2.948541564941406e+02, 3.374231567382812e+02, 3.755382690429688e+02, 4.072576904296875e+02, 4.309654235839844e+02, 4.4545361328125e+02, 4.499842224121094e+02, 4.443263549804688e+02, 4.287682800292969e+02, 4.041026611328125e+02, 3.715860595703125e+02, 3.328751220703125e+02, 2.899419860839844e+02, 2.449739837646484e+02, 2.002620239257812e+02, 1.580840301513672e+02, 1.205888061523438e+02, 8.968659973144531e+01, 6.695176696777344e+01, 5.354254913330078e+01, 5.014210510253906e+01, 5.692367172241211e+01, 7.354175567626953e+01, 9.914972686767578e+01, 1.324429473876953e+02, 1.717252655029297e+02, 2.149953918457033e+02, 2.600488586425783e+02, 3.045903930664062e+02, 3.463507385253906e+02, 3.832023620605469e+02, 4.132678527832031e+02, 4.350154418945312e+02, 4.473371887207031e+02, 4.496053466796875e+02, 4.41704345703125e+02, 4.240367431640625e+02, 3.975026245117188e+02, 3.634537963867188e+02, 3.236249084472656e+02, 2.800451049804688e+02, 2.349346313476562e+02, 1.905916900634766e+02, 1.492753601074219e+02, 1.13090576171875e+02, 8.388082122802734e+01, 6.313421249389648e+01, 5.190771484375e+01, 5.077327728271484e+01, 5.97886962890625e+01, 7.849466705322266e+01, 1.059381942749023e+02, 1.407211303710938e+02, 1.810714111328128e+02, 2.249333496093753e+02, 2.700723571777347e+02, 3.14188720703125e+02, 3.55034912109375e+02, 3.905299987792969e+02, 4.188655700683594e+02, 4.385981140136719e+02, 4.487222595214844e+02, 4.487222595214844e+02, 4.385981140136719e+02, 4.188655700683594e+02, 3.905299987792969e+02, 3.55034912109375e+02, 3.14188720703125e+02, 2.700723571777344e+02, 2.24933349609375e+02, 1.810714111328125e+02, 1.407211303710938e+02, 1.059381942749023e+02, 7.849466705322266e+01, 5.97886962890625e+01, 5.077327728271484e+01, 5.190771484375e+01, 6.313421249389648e+01, 8.388082122802734e+01, 1.13090576171875e+02, 1.492753601074219e+02, 1.905916900634766e+02, 2.349346313476562e+02, 2.800451049804688e+02, 3.236249084472656e+02, 3.634537963867188e+02, 3.975026245117188e+02, 4.240367431640625e+02, 4.41704345703125e+02, 4.496053466796875e+02, 4.473371887207031e+02, 4.350154418945312e+02, 4.132678527832031e+02, 3.832023620605469e+02, 3.463507385253906e+02, 3.045903930664062e+02, 2.600488586425781e+02, 2.149953918457031e+02, 1.717252655029297e+02, 1.324429473876953e+02]
 time=[0e+00, 3.6e+03]
+lig.ill=[2.5e+02, 2.948541564941406e+02, 3.374231567382812e+02, 3.755382690429688e+02, 4.072576904296875e+02, 4.309654235839844e+02, 4.4545361328125e+02, 4.499842224121094e+02, 4.443263549804688e+02, 4.287682800292969e+02, 4.041026611328125e+02, 3.715860595703125e+02, 3.328751220703125e+02, 2.899419860839844e+02, 2.449739837646484e+02, 2.002620239257812e+02, 1.580840301513672e+02, 1.205888061523438e+02, 8.968659973144531e+01, 6.695176696777344e+01, 5.354254913330078e+01, 5.014210510253906e+01, 5.692367172241211e+01, 7.354175567626953e+01, 9.914972686767578e+01, 1.324429473876953e+02, 1.717252655029297e+02, 2.149953918457033e+02, 2.600488586425783e+02, 3.045903930664062e+02, 3.463507385253906e+02, 3.832023620605469e+02, 4.132678527832031e+02, 4.350154418945312e+02, 4.473371887207031e+02, 4.496053466796875e+02, 4.41704345703125e+02, 4.240367431640625e+02, 3.975026245117188e+02, 3.634537963867188e+02, 3.236249084472656e+02, 2.800451049804688e+02, 2.349346313476562e+02, 1.905916900634766e+02, 1.492753601074219e+02, 1.13090576171875e+02, 8.388082122802734e+01, 6.313421249389648e+01, 5.190771484375e+01, 5.077327728271484e+01, 5.97886962890625e+01, 7.849466705322266e+01, 1.059381942749023e+02, 1.407211303710938e+02, 1.810714111328128e+02, 2.249333496093753e+02, 2.700723571777347e+02, 3.14188720703125e+02, 3.55034912109375e+02, 3.905299987792969e+02, 4.188655700683594e+02, 4.385981140136719e+02, 4.487222595214844e+02, 4.487222595214844e+02, 4.385981140136719e+02, 4.188655700683594e+02, 3.905299987792969e+02, 3.55034912109375e+02, 3.14188720703125e+02, 2.700723571777344e+02, 2.24933349609375e+02, 1.810714111328125e+02, 1.407211303710938e+02, 1.059381942749023e+02, 7.849466705322266e+01, 5.97886962890625e+01, 5.077327728271484e+01, 5.190771484375e+01, 6.313421249389648e+01, 8.388082122802734e+01, 1.13090576171875e+02, 1.492753601074219e+02, 1.905916900634766e+02, 2.349346313476562e+02, 2.800451049804688e+02, 3.236249084472656e+02, 3.634537963867188e+02, 3.975026245117188e+02, 4.240367431640625e+02, 4.41704345703125e+02, 4.496053466796875e+02, 4.473371887207031e+02, 4.350154418945312e+02, 4.132678527832031e+02, 3.832023620605469e+02, 3.463507385253906e+02, 3.045903930664062e+02, 2.600488586425781e+02, 2.149953918457031e+02, 1.717252655029297e+02, 1.324429473876953e+02]
+lig.occ=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 lig.pArriv=[7.265730947256088e-02, 5.130165815353394e-02, 3.744279965758324e-02, 2.836507000029087e-02, 2.245883457362652e-02, 1.877737790346146e-02, 1.677962206304073e-02, 1.618974842131138e-02, 1.692887768149376e-02, 1.909603737294674e-02, 2.2992093116045e-02, 2.919460274279118e-02, 3.870850428938866e-02, 5.324029549956322e-02, 7.566635310649876e-02, 1.107367277145386e-01, 1.657402366399765e-01, 2.495628893375397e-01, 3.657642304897308e-01, 4.968881607055664e-01, 5.983664393424988e-01, 6.270855069160461e-01, 5.709863901138306e-01, 4.538892507553101e-01, 3.238841891288757e-01, 2.179468274116516e-01, 1.446387767791748e-01, 9.724712371826161e-02, 6.706819683313363e-02, 4.769211634993553e-02, 3.508250415325165e-02, 2.681992761790752e-02, 2.147259749472141e-02, 1.820112764835358e-02, 1.653245650231838e-02, 1.623847149312496e-02, 1.727995648980141e-02, 1.979716308414936e-02, 2.414382807910442e-02, 3.097604401409626e-02, 4.142533615231514e-02, 5.74093870818615e-02, 8.215286582708359e-02, 1.209294348955154e-01, 1.815836578607559e-01, 2.727452218532562e-01, 3.948407471179962e-01, 5.238415598869324e-01, 6.120287775993347e-01, 6.216676235198975e-01, 5.487284064292908e-01, 4.24378365278244e-01, 2.975581288337708e-01, 1.989593505859375e-01, 1.321957707405087e-01, 8.932144194841364e-02, 6.200303137302385e-02, 4.441051930189133e-02, 3.293314203619957e-02, 2.541651576757431e-02, 2.058749087154865e-02, 1.770310290157795e-02, 1.635246351361275e-02, 1.635246351361275e-02, 1.770310290157795e-02, 2.058749087154865e-02, 2.541651576757431e-02, 3.293314203619957e-02, 4.441051930189133e-02, 6.200303137302399e-02, 8.932144194841385e-02, 1.32195770740509e-01, 1.989593505859375e-01, 2.975581288337708e-01, 4.24378365278244e-01, 5.487284064292908e-01, 6.216676235198975e-01, 6.120287775993347e-01, 5.238415598869324e-01, 3.948407471179962e-01, 2.727452218532562e-01, 1.815836578607559e-01, 1.209294348955154e-01, 8.215286582708359e-02, 5.74093870818615e-02, 4.142533615231514e-02, 3.097604401409626e-02, 2.414382807910442e-02, 1.979716308414936e-02, 1.727995648980141e-02, 1.623847149312496e-02, 1.653245650231838e-02, 1.820112764835358e-02, 2.147259749472141e-02, 2.681992761790752e-02, 3.508250415325165e-02, 4.769211634993553e-02, 6.70681968331337e-02, 9.724712371826172e-02, 1.446387767791748e-01, 2.179468274116516e-01]
-lig.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+lig.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Reinhart2003Light.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Reinhart2003Light.txt
index 408023f292b..961c41a88c3 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Reinhart2003Light.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Lighting_Validation_Reinhart2003Light.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-lig.occ=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-lig.ill=[2.5e+02, 2.948541564941406e+02, 3.374231567382812e+02, 3.755382690429688e+02, 4.072576904296875e+02, 4.309654235839844e+02, 4.4545361328125e+02, 4.499842224121094e+02, 4.443263549804688e+02, 4.287682800292969e+02, 4.041026611328125e+02, 3.715860595703125e+02, 3.328751220703125e+02, 2.899419860839844e+02, 2.449739837646484e+02, 2.002620239257812e+02, 1.580840301513672e+02, 1.205888061523438e+02, 8.968659973144531e+01, 6.695176696777344e+01, 5.354254913330078e+01, 5.014210510253906e+01, 5.692367172241211e+01, 7.354175567626953e+01, 9.914972686767578e+01, 1.324429473876953e+02, 1.717252655029297e+02, 2.149953918457033e+02, 2.600488586425783e+02, 3.045903930664062e+02, 3.463507385253906e+02, 3.832023620605469e+02, 4.132678527832031e+02, 4.350154418945312e+02, 4.473371887207031e+02, 4.496053466796875e+02, 4.41704345703125e+02, 4.240367431640625e+02, 3.975026245117188e+02, 3.634537963867188e+02, 3.236249084472656e+02, 2.800451049804688e+02, 2.349346313476562e+02, 1.905916900634766e+02, 1.492753601074219e+02, 1.13090576171875e+02, 8.388082122802734e+01, 6.313421249389648e+01, 5.190771484375e+01, 5.077327728271484e+01, 5.97886962890625e+01, 7.849466705322266e+01, 1.059381942749023e+02, 1.407211303710938e+02, 1.810714111328128e+02, 2.249333496093753e+02, 2.700723571777347e+02, 3.14188720703125e+02, 3.55034912109375e+02, 3.905299987792969e+02, 4.188655700683594e+02, 4.385981140136719e+02, 4.487222595214844e+02, 4.487222595214844e+02, 4.385981140136719e+02, 4.188655700683594e+02, 3.905299987792969e+02, 3.55034912109375e+02, 3.14188720703125e+02, 2.700723571777344e+02, 2.24933349609375e+02, 1.810714111328125e+02, 1.407211303710938e+02, 1.059381942749023e+02, 7.849466705322266e+01, 5.97886962890625e+01, 5.077327728271484e+01, 5.190771484375e+01, 6.313421249389648e+01, 8.388082122802734e+01, 1.13090576171875e+02, 1.492753601074219e+02, 1.905916900634766e+02, 2.349346313476562e+02, 2.800451049804688e+02, 3.236249084472656e+02, 3.634537963867188e+02, 3.975026245117188e+02, 4.240367431640625e+02, 4.41704345703125e+02, 4.496053466796875e+02, 4.473371887207031e+02, 4.350154418945312e+02, 4.132678527832031e+02, 3.832023620605469e+02, 3.463507385253906e+02, 3.045903930664062e+02, 2.600488586425781e+02, 2.149953918457031e+02, 1.717252655029297e+02, 1.324429473876953e+02]
 time=[0e+00, 3.6e+03]
+lig.ill=[2.5e+02, 2.948541564941406e+02, 3.374231567382812e+02, 3.755382690429688e+02, 4.072576904296875e+02, 4.309654235839844e+02, 4.4545361328125e+02, 4.499842224121094e+02, 4.443263549804688e+02, 4.287682800292969e+02, 4.041026611328125e+02, 3.715860595703125e+02, 3.328751220703125e+02, 2.899419860839844e+02, 2.449739837646484e+02, 2.002620239257812e+02, 1.580840301513672e+02, 1.205888061523438e+02, 8.968659973144531e+01, 6.695176696777344e+01, 5.354254913330078e+01, 5.014210510253906e+01, 5.692367172241211e+01, 7.354175567626953e+01, 9.914972686767578e+01, 1.324429473876953e+02, 1.717252655029297e+02, 2.149953918457033e+02, 2.600488586425783e+02, 3.045903930664062e+02, 3.463507385253906e+02, 3.832023620605469e+02, 4.132678527832031e+02, 4.350154418945312e+02, 4.473371887207031e+02, 4.496053466796875e+02, 4.41704345703125e+02, 4.240367431640625e+02, 3.975026245117188e+02, 3.634537963867188e+02, 3.236249084472656e+02, 2.800451049804688e+02, 2.349346313476562e+02, 1.905916900634766e+02, 1.492753601074219e+02, 1.13090576171875e+02, 8.388082122802734e+01, 6.313421249389648e+01, 5.190771484375e+01, 5.077327728271484e+01, 5.97886962890625e+01, 7.849466705322266e+01, 1.059381942749023e+02, 1.407211303710938e+02, 1.810714111328128e+02, 2.249333496093753e+02, 2.700723571777347e+02, 3.14188720703125e+02, 3.55034912109375e+02, 3.905299987792969e+02, 4.188655700683594e+02, 4.385981140136719e+02, 4.487222595214844e+02, 4.487222595214844e+02, 4.385981140136719e+02, 4.188655700683594e+02, 3.905299987792969e+02, 3.55034912109375e+02, 3.14188720703125e+02, 2.700723571777344e+02, 2.24933349609375e+02, 1.810714111328125e+02, 1.407211303710938e+02, 1.059381942749023e+02, 7.849466705322266e+01, 5.97886962890625e+01, 5.077327728271484e+01, 5.190771484375e+01, 6.313421249389648e+01, 8.388082122802734e+01, 1.13090576171875e+02, 1.492753601074219e+02, 1.905916900634766e+02, 2.349346313476562e+02, 2.800451049804688e+02, 3.236249084472656e+02, 3.634537963867188e+02, 3.975026245117188e+02, 4.240367431640625e+02, 4.41704345703125e+02, 4.496053466796875e+02, 4.473371887207031e+02, 4.350154418945312e+02, 4.132678527832031e+02, 3.832023620605469e+02, 3.463507385253906e+02, 3.045903930664062e+02, 2.600488586425781e+02, 2.149953918457031e+02, 1.717252655029297e+02, 1.324429473876953e+02]
+lig.occ=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 lig.pArriv=[1.564369946718216e-01, 1.289152204990387e-01, 1.095380634069443e-01, 9.598884731531143e-02, 8.671794831752777e-02, 8.072405308485031e-02, 7.739357650279999e-02, 7.639896869659424e-02, 7.764441519975662e-02, 8.125004172325134e-02, 8.757173269987106e-02, 9.726014733314514e-02, 1.113684102892876e-01, 1.315197646617889e-01, 1.601307094097138e-01, 2.006083726882935e-01, 2.571904957294464e-01, 3.334953486919403e-01, 4.281343519687653e-01, 5.273448824882507e-01, 6.02470874786377e-01, 6.238654255867004e-01, 5.821753740310669e-01, 4.953016340732574e-01, 3.95065039396286e-01, 3.057768046855927e-01, 2.362727373838425e-01, 1.855456084012984e-01, 1.494649201631545e-01, 1.240010038018227e-01, 1.06088362634182e-01, 9.360142797231674e-02, 8.512956649065018e-02, 7.976926863193512e-02, 7.697746157646179e-02, 7.648131996393204e-02, 7.823313027620316e-02, 8.240242302417755e-02, 8.940393477678299e-02, 9.996652603149414e-02, 1.152532696723938e-01, 1.370430737733841e-01, 1.6796013712883e-01, 2.116350382566452e-01, 2.723679542541504e-01, 3.531789481639862e-01, 4.505962729454041e-01, 5.473113059997559e-01, 6.126315593719482e-01, 6.198182106018066e-01, 5.657134652137756e-01, 4.730877280235291e-01, 3.737401366233826e-01, 2.885602712631226e-01, 2.235072702169415e-01, 1.76416218280792e-01, 1.430129855871199e-01, 1.19455948472023e-01, 1.029038280248642e-01, 9.141033142805099e-02, 8.369345963001251e-02, 7.894029468297958e-02, 7.667385041713715e-02, 7.667385041713715e-02, 7.894029468297958e-02, 8.369345963001251e-02, 9.141033142805099e-02, 1.029038280248642e-01, 1.19455948472023e-01, 1.430129855871201e-01, 1.764162182807922e-01, 2.235072702169418e-01, 2.885602712631226e-01, 3.737401366233826e-01, 4.730877280235291e-01, 5.657134652137756e-01, 6.198182106018066e-01, 6.126315593719482e-01, 5.473113059997559e-01, 4.505962729454041e-01, 3.531789481639862e-01, 2.723679542541504e-01, 2.116350382566452e-01, 1.6796013712883e-01, 1.370430737733841e-01, 1.152532696723938e-01, 9.996652603149414e-02, 8.940393477678299e-02, 8.240242302417755e-02, 7.823313027620316e-02, 7.648131996393204e-02, 7.697746157646179e-02, 7.976926863193512e-02, 8.512956649065018e-02, 9.360142797231674e-02, 1.06088362634182e-01, 1.240010038018227e-01, 1.494649201631546e-01, 1.855456084012985e-01, 2.362727373838425e-01, 3.057768046855927e-01]
-lig.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+lig.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Occupancy_Validation_Wang2005Occupancy.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Occupancy_Validation_Wang2005Occupancy.txt
index c24923e2ab7..c08ffa864ef 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Occupancy_Validation_Wang2005Occupancy.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Occupancy_Validation_Wang2005Occupancy.txt
@@ -1,4 +1,4 @@
-last-generated=2021-08-16
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
@@ -6,4 +6,4 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.6e+04]
-occ.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+occ.occ=[1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2008WindowsTIn.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2008WindowsTIn.txt
index 45e8f833e75..b2958370489 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2008WindowsTIn.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2008WindowsTIn.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-win.TIn=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 time=[0e+00, 3.6e+03]
+win.TIn=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
+win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.0238406509161e-03, 4.0238406509161e-03, 4.0238406509161e-03, 1.865541562438011e-02, 1.865541562438011e-02, 1.865541562438011e-02, 1.74750953912735e-01, 1.74750953912735e-01, 1.74750953912735e-01, 1.74750953912735e-01, 6.018745899200439e-01, 6.018745899200439e-01, 6.018745899200439e-01, 7.044434547424316e-01, 7.044434547424316e-01, 7.044434547424316e-01, 3.933365345001221e-01, 3.933365345001221e-01, 3.933365345001221e-01, 3.933365345001221e-01, 5.805261433124542e-02, 5.805261433124542e-02, 5.805261433124542e-02, 7.277283817529678e-03, 7.277283817529678e-03, 7.277283817529678e-03, 3.448064438998699e-03, 3.448064438998699e-03, 3.448064438998699e-03, 3.448064438998699e-03, 9.641354903578758e-03, 9.641354903578758e-03, 9.641354903578758e-03, 8.525488525629044e-02, 8.525488525629044e-02, 8.525488525629044e-02, 4.715321958065033e-01, 4.715321958065033e-01, 4.715321958065033e-01, 4.715321958065033e-01, 7.151415944099426e-01, 7.151415944099426e-01, 7.151415944099426e-01, 5.423219203948975e-01, 5.423219203948975e-01, 5.423219203948975e-01, 1.235319599509239e-01, 1.235319599509239e-01, 1.235319599509239e-01, 1.235319599509239e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2008WindowsTOut.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2008WindowsTOut.txt
index 8afc3d190af..7443545ea28 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2008WindowsTOut.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2008WindowsTOut.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.513591647148132e-01, 2.513591647148132e-01, 2.513591647148132e-01, 3.215977251529694e-01, 3.215977251529694e-01, 3.215977251529694e-01, 4.478001594543457e-01, 4.478001594543457e-01, 4.478001594543457e-01, 4.478001594543457e-01, 5.568113923072815e-01, 5.568113923072815e-01, 5.568113923072815e-01, 5.816696286201477e-01, 5.816696286201477e-01, 5.816696286201477e-01, 5.099167227745056e-01, 5.099167227745056e-01, 5.099167227745056e-01, 5.099167227745056e-01, 3.811971843242645e-01, 3.811971843242645e-01, 3.811971843242645e-01, 2.77143120765686e-01, 2.77143120765686e-01, 2.77143120765686e-01, 2.449185997247696e-01, 2.449185997247696e-01, 2.449185997247696e-01, 2.449185997247696e-01, 2.899777591228485e-01, 2.899777591228485e-01, 2.899777591228485e-01, 4.031517207622528e-01, 4.031517207622528e-01, 4.031517207622528e-01, 5.276697278022766e-01, 5.276697278022766e-01, 5.276697278022766e-01, 5.276697278022766e-01, 5.844818949699402e-01, 5.844818949699402e-01, 5.844818949699402e-01, 5.433849096298218e-01, 5.433849096298218e-01, 5.433849096298218e-01, 4.255012273788452e-01, 4.255012273788452e-01, 4.255012273788452e-01, 4.255012273788452e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2009WindowsTInTout.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2009WindowsTInTout.txt
index 19262dfe6fe..ba90886a55b 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2009WindowsTInTout.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Haldi2009WindowsTInTout.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.98e+02, 3.006912536621094e+02, 3.032453918457031e+02, 3.055322875976562e+02, 3.074354553222656e+02, 3.0885791015625e+02, 3.097272033691406e+02, 3.099990539550781e+02, 3.096595764160156e+02, 3.087261047363281e+02, 3.072461547851562e+02, 3.05295166015625e+02, 3.029725036621094e+02, 3.003965148925781e+02, 2.976984252929688e+02, 2.950157165527344e+02, 2.924850463867188e+02, 2.902353210449219e+02, 2.883811950683594e+02, 2.870171203613281e+02, 2.862125549316406e+02, 2.860085144042969e+02, 2.864154052734375e+02, 2.874125061035156e+02, 2.88948974609375e+02, 2.909465637207031e+02, 2.933035278320312e+02, 2.958997192382812e+02, 2.986029357910156e+02, 3.012754211425781e+02, 3.037810363769531e+02, 3.059921569824219e+02, 3.077960815429688e+02, 3.091009216308594e+02, 3.098402404785156e+02, 3.09976318359375e+02, 3.095022583007812e+02, 3.084421997070312e+02, 3.068501586914062e+02, 3.048072204589844e+02, 3.0241748046875e+02, 2.998027038574219e+02, 2.970960693359375e+02, 2.944354858398438e+02, 2.919565124511719e+02, 2.897854309082031e+02, 2.880328369140625e+02, 2.867880554199219e+02, 2.861144714355469e+02, 2.8604638671875e+02, 2.865873107910156e+02, 2.877096862792969e+02, 2.893562927246094e+02, 2.914432678222656e+02, 2.938642883300781e+02, 2.964960021972656e+02, 2.99204345703125e+02, 3.01851318359375e+02, 3.043020935058594e+02, 3.064317932128906e+02, 3.081319274902344e+02, 3.093158874511719e+02, 3.0992333984375e+02, 3.0992333984375e+02, 3.093158874511719e+02, 3.081319274902344e+02, 3.064317932128906e+02, 3.043020935058594e+02, 3.01851318359375e+02, 2.99204345703125e+02, 2.964960021972656e+02, 2.938642883300781e+02, 2.914432678222656e+02, 2.893562927246094e+02, 2.877096862792969e+02, 2.865873107910156e+02, 2.8604638671875e+02, 2.861144714355469e+02, 2.867880554199219e+02, 2.880328369140625e+02, 2.897854309082031e+02, 2.919565124511719e+02, 2.944354858398438e+02, 2.970960693359375e+02, 2.998027038574219e+02, 3.0241748046875e+02, 3.048072204589844e+02, 3.068501586914062e+02, 3.084421997070312e+02, 3.095022583007812e+02, 3.09976318359375e+02, 3.098402404785156e+02, 3.091009216308594e+02, 3.077960815429688e+02, 3.059921569824219e+02, 3.037810363769531e+02, 3.012754211425781e+02, 2.986029357910156e+02, 2.958997192382812e+02, 2.933035278320312e+02, 2.909465637207031e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.pOpen=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.214614952914417e-03, 1.214614952914417e-03, 1.214614952914417e-03, 1.214614952914417e-03, 1.256747636944056e-03, 1.256747636944056e-03, 1.256747636944056e-03, 2.350467024371028e-03, 2.350467024371028e-03, 2.350467024371028e-03, 6.302190013229847e-03, 6.302190013229847e-03, 6.302190013229847e-03, 6.302190013229847e-03, 1.850792020559311e-02, 1.850792020559311e-02, 1.850792020559311e-02, 4.695085063576698e-02, 4.695085063576698e-02, 4.695085063576698e-02, 8.722836524248123e-02, 8.722836524248123e-02, 8.722836524248123e-02, 8.722836524248123e-02, 1.095267608761787e-01, 1.095267608761787e-01, 1.095267608761787e-01, 8.978249877691269e-02, 8.978249877691269e-02, 8.978249877691269e-02, 4.700755327939987e-02, 4.700755327939987e-02, 4.700755327939987e-02, 4.700755327939987e-02, 1.665476337075233e-02, 1.665476337075233e-02, 1.665476337075233e-02, 4.929839167743921e-03, 4.929839167743921e-03, 4.929839167743921e-03, 1.692403689958155e-03, 1.692403689958155e-03, 1.692403689958155e-03, 1.692403689958155e-03, 9.541001636534929e-04, 9.541001636534929e-04, 9.541001636534929e-04, 1.131733413785696e-03, 1.131733413785696e-03, 1.131733413785696e-03, 2.92309676297009e-03, 2.92309676297009e-03, 2.92309676297009e-03, 2.92309676297009e-03, 1.297441311180592e-02, 1.297441311180592e-02, 1.297441311180592e-02, 6.125923246145248e-02, 6.125923246145248e-02, 6.125923246145248e-02, 1.753973513841629e-01, 1.753973513841629e-01, 1.753973513841629e-01, 1.753973513841629e-01, 2.323612868785858e-01, 2.323612868785858e-01, 2.323612868785858e-01, 1.410521417856216e-01, 1.410521417856216e-01, 1.410521417856216e-01, 3.964526206254959e-02, 3.964526206254959e-02, 3.964526206254959e-02, 3.964526206254959e-02]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsCompletelyOpen.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsCompletelyOpen.txt
index 9f19a0cc364..d17423243f3 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsCompletelyOpen.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsCompletelyOpen.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.79285816848278e-02, 1.79285816848278e-02, 1.79285816848278e-02, 3.106534108519554e-02, 3.106534108519554e-02, 3.106534108519554e-02, 7.151997089385986e-02, 7.151997089385986e-02, 7.151997089385986e-02, 7.151997089385986e-02, 1.360130906105042e-01, 1.360130906105042e-01, 1.360130906105042e-01, 1.566648930311203e-01, 1.566648930311203e-01, 1.566648930311203e-01, 1.03710725903511e-01, 1.03710725903511e-01, 1.03710725903511e-01, 1.03710725903511e-01, 4.686881974339485e-02, 4.686881974339485e-02, 4.686881974339485e-02, 2.21695639193058e-02, 2.21695639193058e-02, 2.21695639193058e-02, 1.696266978979111e-02, 1.696266978979111e-02, 1.696266978979111e-02, 1.696266978979111e-02, 2.451961860060692e-02, 2.451961860060692e-02, 2.451961860060692e-02, 5.406432598829269e-02, 5.406432598829269e-02, 5.406432598829269e-02, 1.150114014744759e-01, 1.150114014744759e-01, 1.150114014744759e-01, 1.150114014744759e-01, 1.591765284538269e-01, 1.591765284538269e-01, 1.591765284538269e-01, 1.259355247020721e-01, 1.259355247020721e-01, 1.259355247020721e-01, 6.229231879115105e-02, 6.229231879115105e-02, 6.229231879115105e-02, 6.229231879115105e-02]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsSmall.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsSmall.txt
index 93c977df42f..4938e886ef3 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsSmall.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsSmall.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.232508480548859e-02, 5.232508480548859e-02, 5.232508480548859e-02, 1.455163657665253e-01, 1.455163657665253e-01, 1.455163657665253e-01, 4.957140386104584e-01, 4.957140386104584e-01, 4.957140386104584e-01, 4.957140386104584e-01, 8.0414217710495e-01, 8.0414217710495e-01, 8.0414217710495e-01, 8.511297702789307e-01, 8.511297702789307e-01, 8.511297702789307e-01, 6.892648339271545e-01, 6.892648339271545e-01, 6.892648339271545e-01, 6.892648339271545e-01, 2.860186696052551e-01, 2.860186696052551e-01, 2.860186696052551e-01, 7.847630232572556e-02, 7.847630232572556e-02, 7.847630232572556e-02, 4.700909927487373e-02, 4.700909927487373e-02, 4.700909927487373e-02, 4.700909927487373e-02, 9.475482255220413e-02, 9.475482255220413e-02, 9.475482255220413e-02, 3.511472940444946e-01, 3.511472940444946e-01, 3.511472940444946e-01, 7.367051243782043e-01, 7.367051243782043e-01, 7.367051243782043e-01, 7.367051243782043e-01, 8.558529019355774e-01, 8.558529019355774e-01, 8.558529019355774e-01, 7.747329473495483e-01, 7.747329473495483e-01, 7.747329473495483e-01, 4.223337769508362e-01, 4.223337769508362e-01, 4.223337769508362e-01, 4.223337769508362e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsTiltedOpen.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsTiltedOpen.txt
index cdf8b25f4a6..d36d49f0fba 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsTiltedOpen.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Herkel2008WindowsTiltedOpen.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.380274191498756e-02, 4.380274191498756e-02, 4.380274191498756e-02, 7.446075230836868e-02, 7.446075230836868e-02, 7.446075230836868e-02, 1.619795858860016e-01, 1.619795858860016e-01, 1.619795858860016e-01, 1.619795858860016e-01, 2.83166915178299e-01, 2.83166915178299e-01, 2.83166915178299e-01, 3.179399371147156e-01, 3.179399371147156e-01, 3.179399371147156e-01, 2.250182926654816e-01, 2.250182926654816e-01, 2.250182926654816e-01, 2.250182926654816e-01, 1.098377108573914e-01, 1.098377108573914e-01, 1.098377108573914e-01, 5.382874980568886e-02, 5.382874980568886e-02, 5.382874980568886e-02, 4.150175303220749e-02, 4.150175303220749e-02, 4.150175303220749e-02, 4.150175303220749e-02, 5.933116003870964e-02, 5.933116003870964e-02, 5.933116003870964e-02, 1.254283040761948e-01, 1.254283040761948e-01, 1.254283040761948e-01, 2.459104955196381e-01, 2.459104955196381e-01, 2.459104955196381e-01, 2.459104955196381e-01, 3.220497369766235e-01, 3.220497369766235e-01, 3.220497369766235e-01, 2.655372619628906e-01, 2.655372619628906e-01, 2.655372619628906e-01, 1.428766548633575e-01, 1.428766548633575e-01, 1.428766548633575e-01, 1.428766548633575e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Rijal2007WindowsTInTOutTComf.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Rijal2007WindowsTInTOutTComf.txt
index bad756a03d5..0d97a4c4e8c 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Rijal2007WindowsTInTOutTComf.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Rijal2007WindowsTInTOutTComf.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.98e+02, 3.006912536621094e+02, 3.032453918457031e+02, 3.055322875976562e+02, 3.074354553222656e+02, 3.0885791015625e+02, 3.097272033691406e+02, 3.099990539550781e+02, 3.096595764160156e+02, 3.087261047363281e+02, 3.072461547851562e+02, 3.05295166015625e+02, 3.029725036621094e+02, 3.003965148925781e+02, 2.976984252929688e+02, 2.950157165527344e+02, 2.924850463867188e+02, 2.902353210449219e+02, 2.883811950683594e+02, 2.870171203613281e+02, 2.862125549316406e+02, 2.860085144042969e+02, 2.864154052734375e+02, 2.874125061035156e+02, 2.88948974609375e+02, 2.909465637207031e+02, 2.933035278320312e+02, 2.958997192382812e+02, 2.986029357910156e+02, 3.012754211425781e+02, 3.037810363769531e+02, 3.059921569824219e+02, 3.077960815429688e+02, 3.091009216308594e+02, 3.098402404785156e+02, 3.09976318359375e+02, 3.095022583007812e+02, 3.084421997070312e+02, 3.068501586914062e+02, 3.048072204589844e+02, 3.0241748046875e+02, 2.998027038574219e+02, 2.970960693359375e+02, 2.944354858398438e+02, 2.919565124511719e+02, 2.897854309082031e+02, 2.880328369140625e+02, 2.867880554199219e+02, 2.861144714355469e+02, 2.8604638671875e+02, 2.865873107910156e+02, 2.877096862792969e+02, 2.893562927246094e+02, 2.914432678222656e+02, 2.938642883300781e+02, 2.964960021972656e+02, 2.99204345703125e+02, 3.01851318359375e+02, 3.043020935058594e+02, 3.064317932128906e+02, 3.081319274902344e+02, 3.093158874511719e+02, 3.0992333984375e+02, 3.0992333984375e+02, 3.093158874511719e+02, 3.081319274902344e+02, 3.064317932128906e+02, 3.043020935058594e+02, 3.01851318359375e+02, 2.99204345703125e+02, 2.964960021972656e+02, 2.938642883300781e+02, 2.914432678222656e+02, 2.893562927246094e+02, 2.877096862792969e+02, 2.865873107910156e+02, 2.8604638671875e+02, 2.861144714355469e+02, 2.867880554199219e+02, 2.880328369140625e+02, 2.897854309082031e+02, 2.919565124511719e+02, 2.944354858398438e+02, 2.970960693359375e+02, 2.998027038574219e+02, 3.0241748046875e+02, 3.048072204589844e+02, 3.068501586914062e+02, 3.084421997070312e+02, 3.095022583007812e+02, 3.09976318359375e+02, 3.098402404785156e+02, 3.091009216308594e+02, 3.077960815429688e+02, 3.059921569824219e+02, 3.037810363769531e+02, 3.012754211425781e+02, 2.986029357910156e+02, 2.958997192382812e+02, 2.933035278320312e+02, 2.909465637207031e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
-win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, 9.42332923412323e-01, 9.42332923412323e-01, 9.42332923412323e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, 9.507871866226196e-01, 9.507871866226196e-01, 9.507871866226196e-01, 8.317476511001587e-01, 8.317476511001587e-01, 8.317476511001587e-01, 8.317476511001587e-01, 5.053492188453674e-01, 5.053492188453674e-01, 5.053492188453674e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, 9.516422748565674e-01, 9.516422748565674e-01, 9.516422748565674e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, -5e-01, 9.42332923412323e-01, 9.42332923412323e-01, 9.42332923412323e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, 9.507871866226196e-01, 9.507871866226196e-01, 9.507871866226196e-01, 8.317476511001587e-01, 8.317476511001587e-01, 8.317476511001587e-01, 8.317476511001587e-01, 5.053492188453674e-01, 5.053492188453674e-01, 5.053492188453674e-01, 2.776090800762177e-01, 2.776090800762177e-01, 2.776090800762177e-01, 3.269083797931671e-01, 3.269083797931671e-01, 3.269083797931671e-01, 3.269083797931671e-01, -1.000000014901161e-01, -1.000000014901161e-01, -1.000000014901161e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01, -3.00000011920929e-01]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Yun2008WindowsTIn.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Yun2008WindowsTIn.txt
index c703705fd74..c94da11acac 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Yun2008WindowsTIn.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Yun2008WindowsTIn.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-win.TIn=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 time=[0e+00, 3.6e+03]
+win.TIn=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
+win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 win.pOpen=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.517227172851562e-01, 3.517227172851562e-01, 3.517227172851562e-01, 4.012428820133209e-01, 4.012428820133209e-01, 4.012428820133209e-01, 4.821102619171143e-01, 4.821102619171143e-01, 4.821102619171143e-01, 4.821102619171143e-01, 5.489545464515686e-01, 5.489545464515686e-01, 5.489545464515686e-01, 5.642747282981873e-01, 5.642747282981873e-01, 5.642747282981873e-01, 5.202397704124451e-01, 5.202397704124451e-01, 5.202397704124451e-01, 5.202397704124451e-01, 4.403110146522522e-01, 4.403110146522522e-01, 4.403110146522522e-01, 3.704630136489868e-01, 3.704630136489868e-01, 3.704630136489868e-01, 3.469184935092926e-01, 3.469184935092926e-01, 3.469184935092926e-01, 3.469184935092926e-01, 3.795293867588043e-01, 3.795293867588043e-01, 3.795293867588043e-01, 4.542532861232758e-01, 4.542532861232758e-01, 4.542532861232758e-01, 5.31096339225769e-01, 5.31096339225769e-01, 5.31096339225769e-01, 5.31096339225769e-01, 5.66015362739563e-01, 5.66015362739563e-01, 5.66015362739563e-01, 5.407173633575439e-01, 5.407173633575439e-01, 5.407173633575439e-01, 4.682677090167999e-01, 4.682677090167999e-01, 4.682677090167999e-01, 4.682677090167999e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Yun2008WindowsTOut.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Yun2008WindowsTOut.txt
index 289ee3ea139..c55c9b57500 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Yun2008WindowsTOut.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Yun2008WindowsTOut.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.pOpen=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.725918471813202e-01, 4.725918471813202e-01, 4.725918471813202e-01, 4.884054064750671e-01, 4.884054064750671e-01, 4.884054064750671e-01, 5.130528211593628e-01, 5.130528211593628e-01, 5.130528211593628e-01, 5.130528211593628e-01, 5.331100225448608e-01, 5.331100225448608e-01, 5.331100225448608e-01, 5.377427339553833e-01, 5.377427339553833e-01, 5.377427339553833e-01, 5.244806408882141e-01, 5.244806408882141e-01, 5.244806408882141e-01, 5.244806408882141e-01, 5.004324913024902e-01, 5.004324913024902e-01, 5.004324913024902e-01, 4.786706268787384e-01, 4.786706268787384e-01, 4.786706268787384e-01, 4.710116386413574e-01, 4.710116386413574e-01, 4.710116386413574e-01, 4.710116386413574e-01, 4.815673828125e-01, 4.815673828125e-01, 4.815673828125e-01, 5.046623945236206e-01, 5.046623945236206e-01, 5.046623945236206e-01, 5.277374386787415e-01, 5.277374386787415e-01, 5.277374386787415e-01, 5.277374386787415e-01, 5.38270890712738e-01, 5.38270890712738e-01, 5.38270890712738e-01, 5.306289196014404e-01, 5.306289196014404e-01, 5.306289196014404e-01, 5.088915824890137e-01, 5.088915824890137e-01, 5.088915824890137e-01, 5.088915824890137e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsAll.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsAll.txt
index f2495cc5465..c64f57ad3ed 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsAll.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsAll.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.886161230504513e-02, 1.886161230504513e-02, 1.886161230504513e-02, 3.74121256172657e-02, 3.74121256172657e-02, 3.74121256172657e-02, 1.041477248072624e-01, 1.041477248072624e-01, 1.041477248072624e-01, 1.041477248072624e-01, 2.212308198213577e-01, 2.212308198213577e-01, 2.212308198213577e-01, 2.589238882064819e-01, 2.589238882064819e-01, 2.589238882064819e-01, 1.620135307312012e-01, 1.620135307312012e-01, 1.620135307312012e-01, 1.620135307312012e-01, 6.221060827374458e-02, 6.221060827374458e-02, 6.221060827374458e-02, 2.45839599519968e-02, 2.45839599519968e-02, 2.45839599519968e-02, 1.760102994740009e-02, 1.760102994740009e-02, 1.760102994740009e-02, 1.760102994740009e-02, 2.787319757044315e-02, 2.787319757044315e-02, 2.787319757044315e-02, 7.412406802177429e-02, 7.412406802177429e-02, 7.412406802177429e-02, 1.826972216367722e-01, 1.826972216367722e-01, 1.826972216367722e-01, 1.826972216367722e-01, 2.634797990322113e-01, 2.634797990322113e-01, 2.634797990322113e-01, 2.02744260430336e-01, 2.02744260430336e-01, 2.02744260430336e-01, 8.810463547706604e-02, 8.810463547706604e-02, 8.810463547706604e-02, 8.810463547706604e-02]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsEast.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsEast.txt
index e613d0230bf..e85dad908e7 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsEast.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsEast.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.49059721827507e-02, 2.49059721827507e-02, 2.49059721827507e-02, 4.591909423470497e-02, 4.591909423470497e-02, 4.591909423470497e-02, 1.142780408263206e-01, 1.142780408263206e-01, 1.142780408263206e-01, 1.142780408263206e-01, 2.238000184297562e-01, 2.238000184297562e-01, 2.238000184297562e-01, 2.578043043613434e-01, 2.578043043613434e-01, 2.578043043613434e-01, 1.693853139877319e-01, 1.693853139877319e-01, 1.693853139877319e-01, 1.693853139877319e-01, 7.224531471729279e-02, 7.224531471729279e-02, 7.224531471729279e-02, 3.156315162777901e-02, 3.156315162777901e-02, 3.156315162777901e-02, 2.341154403984547e-02, 2.341154403984547e-02, 2.341154403984547e-02, 2.341154403984547e-02, 3.531006723642349e-02, 3.531006723642349e-02, 3.531006723642349e-02, 8.443959057331085e-02, 8.443959057331085e-02, 8.443959057331085e-02, 1.885650157928467e-01, 1.885650157928467e-01, 1.885650157928467e-01, 1.885650157928467e-01, 2.618908584117889e-01, 2.618908584117889e-01, 2.618908584117889e-01, 2.069667279720306e-01, 2.069667279720306e-01, 2.069667279720306e-01, 9.847366064786911e-02, 9.847366064786911e-02, 9.847366064786911e-02, 9.847366064786911e-02]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsNorth.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsNorth.txt
index 48d62b90afd..8616487a71f 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsNorth.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsNorth.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.325676683336496e-02, 1.325676683336496e-02, 1.325676683336496e-02, 3.03200576454401e-02, 3.03200576454401e-02, 3.03200576454401e-02, 1.042977571487427e-01, 1.042977571487427e-01, 1.042977571487427e-01, 1.042977571487427e-01, 2.538449466228485e-01, 2.538449466228485e-01, 2.538449466228485e-01, 3.03669810295105e-01, 3.03669810295105e-01, 3.03669810295105e-01, 1.765372306108475e-01, 1.765372306108475e-01, 1.765372306108475e-01, 1.765372306108475e-01, 5.606212839484215e-02, 5.606212839484215e-02, 5.606212839484215e-02, 1.825444027781487e-02, 1.825444027781487e-02, 1.825444027781487e-02, 1.219513453543186e-02, 1.219513453543186e-02, 1.219513453543186e-02, 1.219513453543186e-02, 2.12444793432951e-02, 2.12444793432951e-02, 2.12444793432951e-02, 6.926725059747696e-02, 6.926725059747696e-02, 6.926725059747696e-02, 2.032968103885651e-01, 2.032968103885651e-01, 2.032968103885651e-01, 2.032968103885651e-01, 3.096936643123627e-01, 3.096936643123627e-01, 3.096936643123627e-01, 2.295106947422028e-01, 2.295106947422028e-01, 2.295106947422028e-01, 8.530167490243912e-02, 8.530167490243912e-02, 8.530167490243912e-02, 8.530167490243912e-02]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsSouth.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsSouth.txt
index bbb4506c6cd..e3b18bde944 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsSouth.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsSouth.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.707793563604355e-02, 2.707793563604355e-02, 2.707793563604355e-02, 5.327051132917404e-02, 5.327051132917404e-02, 5.327051132917404e-02, 1.440606415271759e-01, 1.440606415271759e-01, 1.440606415271759e-01, 1.440606415271759e-01, 2.914178073406219e-01, 2.914178073406219e-01, 2.914178073406219e-01, 3.359111845493317e-01, 3.359111845493317e-01, 3.359111845493317e-01, 2.186890840530396e-01, 2.186890840530396e-01, 2.186890840530396e-01, 2.186890840530396e-01, 8.762378990650177e-02, 8.762378990650177e-02, 8.762378990650177e-02, 3.520356118679047e-02, 3.520356118679047e-02, 3.520356118679047e-02, 2.528237923979759e-02, 2.528237923979759e-02, 2.528237923979759e-02, 2.528237923979759e-02, 3.985560312867165e-02, 3.985560312867165e-02, 3.985560312867165e-02, 1.038649156689644e-01, 1.038649156689644e-01, 1.038649156689644e-01, 2.444972544908524e-01, 2.444972544908524e-01, 2.444972544908524e-01, 2.444972544908524e-01, 3.411980271339417e-01, 3.411980271339417e-01, 3.411980271339417e-01, 2.690927982330322e-01, 2.690927982330322e-01, 2.690927982330322e-01, 1.227114647626877e-01, 1.227114647626877e-01, 1.227114647626877e-01, 1.227114647626877e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsWest.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsWest.txt
index f9bd8245fba..23a9872f640 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsWest.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Office_Windows_Validation_Zhang2012WindowsWest.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.014176204800606e-03, 9.014176204800606e-03, 9.014176204800606e-03, 2.073139697313309e-02, 2.073139697313309e-02, 2.073139697313309e-02, 7.307690382003784e-02, 7.307690382003784e-02, 7.307690382003784e-02, 7.307690382003784e-02, 1.872148811817169e-01, 1.872148811817169e-01, 1.872148811817169e-01, 2.279570549726486e-01, 2.279570549726486e-01, 2.279570549726486e-01, 1.267520636320114e-01, 1.267520636320114e-01, 1.267520636320114e-01, 1.267520636320114e-01, 3.865713253617287e-02, 3.865713253617287e-02, 3.865713253617287e-02, 1.243258640170097e-02, 1.243258640170097e-02, 1.243258640170097e-02, 8.289446122944355e-03, 8.289446122944355e-03, 8.289446122944355e-03, 8.289446122944355e-03, 1.448308583348989e-02, 1.448308583348989e-02, 1.448308583348989e-02, 4.797094687819481e-02, 4.797094687819481e-02, 4.797094687819481e-02, 1.473152339458466e-01, 1.473152339458466e-01, 1.473152339458466e-01, 1.473152339458466e-01, 2.329815030097961e-01, 2.329815030097961e-01, 2.329815030097961e-01, 1.678312569856644e-01, 1.678312569856644e-01, 1.678312569856644e-01, 5.939014256000519e-02, 5.939014256000519e-02, 5.939014256000519e-02, 5.939014256000519e-02]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Heating_Validation_Nicol2001HeatingEU.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Heating_Validation_Nicol2001HeatingEU.txt
index 2b248746a39..ea78f7dff0c 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Heating_Validation_Nicol2001HeatingEU.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Heating_Validation_Nicol2001HeatingEU.txt
@@ -1,11 +1,11 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-hea.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 time=[0e+00, 3.6e+03]
-hea.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hea.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 hea.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+hea.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Heating_Validation_Nicol2001HeatingUK.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Heating_Validation_Nicol2001HeatingUK.txt
index b0d082432e1..b2c5584d5c4 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Heating_Validation_Nicol2001HeatingUK.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Heating_Validation_Nicol2001HeatingUK.txt
@@ -1,11 +1,11 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
-hea.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 time=[0e+00, 3.6e+03]
-hea.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hea.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 hea.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+hea.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsEU.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsEU.txt
index a5b6422b3e4..71e060a3d23 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsEU.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsEU.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.541433304548264e-02, 9.541433304548264e-02, 9.541433304548264e-02, 1.798836886882782e-01, 1.798836886882782e-01, 1.798836886882782e-01, 4.066953063011169e-01, 4.066953063011169e-01, 4.066953063011169e-01, 4.066953063011169e-01, 6.344954967498779e-01, 6.344954967498779e-01, 6.344954967498779e-01, 6.828213334083557e-01, 6.828213334083557e-01, 6.828213334083557e-01, 5.377641916275024e-01, 5.377641916275024e-01, 5.377641916275024e-01, 5.377641916275024e-01, 2.766540348529816e-01, 2.766540348529816e-01, 2.766540348529816e-01, 1.226468309760094e-01, 1.226468309760094e-01, 1.226468309760094e-01, 8.92748236656189e-02, 8.92748236656189e-02, 8.92748236656189e-02, 8.92748236656189e-02, 1.378226280212402e-01, 1.378226280212402e-01, 1.378226280212402e-01, 3.174316883087158e-01, 3.174316883087158e-01, 3.174316883087158e-01, 5.750030875205994e-01, 5.750030875205994e-01, 5.750030875205994e-01, 5.750030875205994e-01, 6.881150603294373e-01, 6.881150603294373e-01, 6.881150603294373e-01, 6.074010729789734e-01, 6.074010729789734e-01, 6.074010729789734e-01, 3.612183332443237e-01, 3.612183332443237e-01, 3.612183332443237e-01, 3.612183332443237e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsPakistan.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsPakistan.txt
index 45669c39c85..13e985fea67 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsPakistan.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsPakistan.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.506080456078053e-02, 2.506080456078053e-02, 2.506080456078053e-02, 5.570314452052116e-02, 5.570314452052116e-02, 5.570314452052116e-02, 1.768962442874908e-01, 1.768962442874908e-01, 1.768962442874908e-01, 1.768962442874908e-01, 3.814874291419983e-01, 3.814874291419983e-01, 3.814874291419983e-01, 4.405200779438019e-01, 4.405200779438019e-01, 4.405200779438019e-01, 2.814419865608215e-01, 2.814419865608215e-01, 2.814419865608215e-01, 2.814419865608215e-01, 9.979181736707687e-02, 9.979181736707687e-02, 9.979181736707687e-02, 3.417433425784111e-02, 3.417433425784111e-02, 3.417433425784111e-02, 2.310777269303799e-02, 2.310777269303799e-02, 2.310777269303799e-02, 2.310777269303799e-02, 3.956853598356247e-02, 3.956853598356247e-02, 3.956853598356247e-02, 1.215642318129539e-01, 1.215642318129539e-01, 1.215642318129539e-01, 3.17333847284317e-01, 3.17333847284317e-01, 3.17333847284317e-01, 3.17333847284317e-01, 4.473972022533417e-01, 4.473972022533417e-01, 4.473972022533417e-01, 3.51172000169754e-01, 3.51172000169754e-01, 3.51172000169754e-01, 1.473095864057541e-01, 1.473095864057541e-01, 1.473095864057541e-01, 1.473095864057541e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsUK.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsUK.txt
index bf48ac09503..2b22b4b8b82 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsUK.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Occupants_Residential_Windows_Validation_Nicol2001WindowsUK.txt
@@ -1,12 +1,12 @@
-last-generated=2018-09-19
+last-generated=2024-12-08
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
   "numerical Jacobians": "0"
 }
+time=[0e+00, 3.6e+03]
 win.TOut=[2.88e+02, 2.913640747070312e+02, 2.945567321777344e+02, 2.974153747558594e+02, 2.997943115234375e+02, 3.015724182128906e+02, 3.026590270996094e+02, 3.029988098144531e+02, 3.02574462890625e+02, 3.014076232910156e+02, 2.995577087402344e+02, 2.971189575195312e+02, 2.942156372070312e+02, 2.909956359863281e+02, 2.87623046875e+02, 2.842696533203125e+02, 2.811062927246094e+02, 2.782941589355469e+02, 2.759765014648438e+02, 2.742713928222656e+02, 2.732656860351562e+02, 2.730106506347656e+02, 2.73519287109375e+02, 2.74765625e+02, 2.766862182617188e+02, 2.791832275390625e+02, 2.8212939453125e+02, 2.853746643066406e+02, 2.88753662109375e+02, 2.920942687988281e+02, 2.95226318359375e+02, 2.979901733398438e+02, 3.002450866699219e+02, 3.018761596679688e+02, 3.0280029296875e+02, 3.029703979492188e+02, 3.023778381347656e+02, 3.010527648925781e+02, 2.990626831054688e+02, 2.96509033203125e+02, 2.935218811035156e+02, 2.902533874511719e+02, 2.868700866699219e+02, 2.835443725585938e+02, 2.804456481933594e+02, 2.777317810058594e+02, 2.755410766601562e+02, 2.739850769042969e+02, 2.7314306640625e+02, 2.730579833984375e+02, 2.737341613769531e+02, 2.751370849609375e+02, 2.771953735351562e+02, 2.798040771484375e+02, 2.828303527832031e+02, 2.861199951171875e+02, 2.895054321289062e+02, 2.928141479492188e+02, 2.958776245117188e+02, 2.985397644042969e+02, 3.006649169921875e+02, 3.021448669433594e+02, 3.029041748046875e+02, 3.029041748046875e+02, 3.021448669433594e+02, 3.006649169921875e+02, 2.985397644042969e+02, 2.958776245117188e+02, 2.928141479492188e+02, 2.895054321289062e+02, 2.861199951171875e+02, 2.828303527832031e+02, 2.798040771484375e+02, 2.771953735351562e+02, 2.751370849609375e+02, 2.737341613769531e+02, 2.730579833984375e+02, 2.7314306640625e+02, 2.739850769042969e+02, 2.755410766601562e+02, 2.777317810058594e+02, 2.804456481933594e+02, 2.835443725585938e+02, 2.868700866699219e+02, 2.902533874511719e+02, 2.935218811035156e+02, 2.96509033203125e+02, 2.990626831054688e+02, 3.010527648925781e+02, 3.023778381347656e+02, 3.029703979492188e+02, 3.0280029296875e+02, 3.018761596679688e+02, 3.002450866699219e+02, 2.979901733398438e+02, 2.95226318359375e+02, 2.920942687988281e+02, 2.88753662109375e+02, 2.853746643066406e+02, 2.8212939453125e+02, 2.791832275390625e+02]
 win.occ=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-time=[0e+00, 3.6e+03]
 win.p=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.234065979719162e-02, 7.234065979719162e-02, 7.234065979719162e-02, 2.039811015129089e-01, 2.039811015129089e-01, 2.039811015129089e-01, 6.201249957084656e-01, 6.201249957084656e-01, 6.201249957084656e-01, 6.201249957084656e-01, 8.807992935180664e-01, 8.807992935180664e-01, 8.807992935180664e-01, 9.129142165184021e-01, 9.129142165184021e-01, 9.129142165184021e-01, 7.940782308578491e-01, 7.940782308578491e-01, 7.940782308578491e-01, 7.940782308578491e-01, 3.874438405036926e-01, 3.874438405036926e-01, 3.874438405036926e-01, 1.097203195095062e-01, 1.097203195095062e-01, 1.097203195095062e-01, 6.474591046571732e-02, 6.474591046571732e-02, 6.474591046571732e-02, 6.474591046571732e-02, 1.32886216044426e-01, 1.32886216044426e-01, 1.32886216044426e-01, 4.649699926376343e-01, 4.649699926376343e-01, 4.649699926376343e-01, 8.313151597976685e-01, 8.313151597976685e-01, 8.313151597976685e-01, 8.313151597976685e-01, 9.16034460067749e-01, 9.16034460067749e-01, 9.16034460067749e-01, 8.597121238708496e-01, 8.597121238708496e-01, 8.597121238708496e-01, 5.442265272140503e-01, 5.442265272140503e-01, 5.442265272140503e-01, 5.442265272140503e-01]
-win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+win.on=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
index f70b763e1a5..ef2663739e9 100644
--- a/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
+++ b/Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_11_to_12.0.0.mos
@@ -5,6 +5,76 @@ clear
 
 convertClear();
 
+
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/4069
+
+convertModifiers("Buildings.Occupants.Office.Blinds.Haldi2008BlindsTIn",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Blinds.Haldi2008BlindsTOut",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Blinds.Inkarojrit2008BlindsSolarIntensity",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Blinds.Zhang2012BlindsSolarAltitude",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Blinds.Zhang2012BlindsSolarIntensity",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Lighting.Gunay2016Light",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Lighting.Hunt1979Light",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Lighting.Love1998Light1",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Lighting.Love1998Light2",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Lighting.Reinhart2003Light",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Occupancy.Wang2005Occupancy",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Haldi2008WindowsTIn",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Haldi2008WindowsTOut",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Haldi2009WindowsTInTout",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Herkel2008WindowsCompletelyOpen",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Herkel2008WindowsSmall",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Herkel2008WindowsTiltedOpen",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Rijal2007WindowsTInTOutTComf",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Yun2008WindowsTIn",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Yun2008WindowsTOut",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Zhang2012WindowsAll",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Zhang2012WindowsEast",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Zhang2012WindowsNorth",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Zhang2012WindowsSouth",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Office.Windows.Zhang2012WindowsWest",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Residential.AirConditioning.Ren2014ACBedroom",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Residential.AirConditioning.Ren2014ACLivingroom",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Residential.Heating.Nicol2001HeatingEU",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Residential.Heating.Nicol2001HeatingPakistan",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Residential.Heating.Nicol2001HeatingUK",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Residential.Windows.Nicol2001WindowsEU",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Residential.Windows.Nicol2001WindowsPakistan",
+                 {"seed"}, {"localSeed"}, true);
+convertModifiers("Buildings.Occupants.Residential.Windows.Nicol2001WindowsUK",
+                 {"seed"}, {"localSeed"}, true);
+
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3965
 
 convertModifiers("Buildings.Fluid.Movers.FlowControlled_dp",
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
index f9563297f92..1067a55ed4a 100644
--- a/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_12_0_0.mo
@@ -416,6 +416,32 @@ have been <b style=\"color:blue\">improved</b> in a
                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3809\">#3809</a>.
     </td>
 </tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Occupants</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Occupants.BaseClasses
+    </td>
+    <td valign=\"top\">Refactored the implementation of all functions. The functions now take
+                       as an argument the internal state of the random number generator rather than a seed.
+                       Moreover, the functions return the new internal state of the random number generator.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4058\">issue 4069</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Occupants.Office<br/>
+                       Buildings.Occupants.Residential<br/>
+                       Buildings.Occupants.Residential
+    </td>
+    <td valign=\"top\">Refactored the implmenentation of the random number calculation in all blocks
+                       and functions as the old implementation was not producing high quality random numbers,
+                       and as it had rounding errors that caused cross-tool comparison to fail.<br/>
+                       The conversion script will automatically update the old parameter <code>seed</code>
+                       to the new parameter <code>localSeed</code> in the blocks.
+                       The blocks should be compatible with older versions after this update, but the results
+                       will differ.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4058\">issue 4069</a>.
+    </td>
+</tr>
 <tr><td colspan=\"2\"><b>xxx</b>
     </td>
 </tr>