Merge remote-tracking branch 'remotes/origin/develop' into spaceCompL…

…oads
NREL · Sep 20, 2024 · 9881656 · 9881656
2 parents ac222b0 + 337bfba
commit 9881656
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/.github/workflows/test_develop_commits.yml b/.github/workflows/test_develop_commits.yml
@@ -2,7 +2,7 @@ name: Develop Branch Testing
 
 on:
   push:
-    branches: [ develop ]  # run this on all commits to the develop branch
+    branches: [ develop, fixPythonEngineBuild ]  # run this on all commits to the develop branch
 
 defaults:
   run:
@@ -58,13 +58,13 @@ jobs:
 #          nproc: 4
 #          pretty: "Standard Build on Windows VS 2022"
 #          alternate: false
-#        - os: ubuntu-24.04
-#          arch: x86_64
-#          python-arch: x64
-#          generator: "Unix Makefiles"
-#          nproc: 4
-#          pretty: "Alternate Build on Ubuntu 24.04"
-#          alternate: true
+        - os: ubuntu-24.04
+          arch: x86_64
+          python-arch: x64
+          generator: "Unix Makefiles"
+          nproc: 4
+          pretty: "Alternate Build on Ubuntu 24.04"
+          alternate: true
 
     steps:
 

diff --git a/...neering-reference/src/simulation-models-encyclopedic-reference-003/indoor-living-wall.tex b/...neering-reference/src/simulation-models-encyclopedic-reference-003/indoor-living-wall.tex
@@ -9,7 +9,7 @@ \subsection{Energy Balance of Indoor Living Wall}\label{energy-balance-of-indoor
 Plant energy balance equation:
 
 \begin{equation}
-Q_{lw-net}+Q_{sw}+h_{ip} \cdot A_ip \cdot (T_z - T_p )-\lambda \cdot A_ip \cdot ET+Q_{cond}=0
+Q_{lw-net}+Q_{sw}+h_{ip} \cdot A_ip \cdot (T_z - T_p )+Q_{cond}=0
 \end{equation}
 
 where:
@@ -27,11 +27,7 @@ \subsection{Energy Balance of Indoor Living Wall}\label{energy-balance-of-indoor
 \item
   \(T_p\) is the plant surface temperature (\si{\celsius})
 \item
-  \(A_ip\) is the plant surface area (\si{\area})
-\item
-  \(\lambda\) is the latent heat of vaporization (\si{\specificEnthalpy})
-\item
-  \(ET\) is the evapotranspiration rate (\si{\evapotranspirationRate}).
+  \(A_ip\) is the plant surface area (\si{\area}).
 \end{itemize}
 
 Indoor air heat balance connects with indoor living walls through convective heat transfer, which has the opposite sign of the term in surface heat balance. Convective portion of heat gain from LED lights also contributes to zone air heat balance equation.
@@ -53,7 +49,7 @@ \subsection{Energy Balance of Indoor Living Wall}\label{energy-balance-of-indoor
 \item
   $V_z$ is zone air volume (\si{\volume})
 \item
-  \(\dot Q_i\) is the convective heat from internal loads (\si{\watt})
+  \(\dot Q_i\) is the convective heat from internal loads including sensible heat gain from living walls (\si{\watt})
 \item
   \({{h_i}} {A_i}\left( {{T_{si}} - {T_z}} \right)\) is the convective heat transfer from surfaces to zone air (\si{\watt})
 \item

diff --git a/doc/input-output-reference/src/overview/group-internal-gains-people-lights-other.tex b/doc/input-output-reference/src/overview/group-internal-gains-people-lights-other.tex
@@ -2452,7 +2452,7 @@ \subsubsection{Outputs}\label{outputs-indoorlivingwall}
 
 \paragraph{Indoor Living Wall Sensible Heat Gain Rate {[}W{]}}\label{indoor-living-wall-sensible-heat-gain-rate-w}
 
-This output is the sensible heat gain rate from indoor living walls in W and determined by surface heat balance. Positive sign represents heat gain of living walls or heat loss of indoor spaces; negative sign represents heat loss of living walls or heat gain of indoor spaces. 
+This output is the sensible heat gain rate from indoor living walls in W and determined by surface heat balance. Positive sign represents heat gain of spaces; negative sign represents heat loss of spaces. 
 
 \paragraph{Indoor Living Wall Latent Heat Gain Rate {[}W{]}}\label{indoor-living-wall-latent-heat-gain-rate-w}
 

diff --git a/src/EnergyPlus/IndoorGreen.cc b/src/EnergyPlus/IndoorGreen.cc
@@ -363,7 +363,7 @@ namespace IndoorGreen {
                                   ig.ZonePtr,
                                   ig.Name,
                                   DataHeatBalance::IntGainType::IndoorGreen,
-                                  &ig.SensibleRateLED,
+                                  &ig.SensibleRate,
                                   nullptr,
                                   nullptr,
                                   &ig.LatentRate,
@@ -582,15 +582,12 @@ namespace IndoorGreen {
                 ZoneNewHum = ZoneSatHum;
             }
             HMid = Psychrometrics::PsyHFnTdbW(ZoneNewTemp, ZonePreHum);
-            ig.SensibleRateLED =
-                (1 - ig.LEDRadFraction) * ig.LEDActualEleP; // convective heat gain from LED lights when LED is on; heat convection from
-                                                            // plants was considered and counted from plant surface heat balance.
-            ig.SensibleRate = state.dataHeatBalSurf->SurfQConvInRep(ig.SurfPtr) / Timestep;
             ig.LatentRate = ZoneAirVol * rhoair * (HCons - HMid) / Timestep; // unit W
+            ig.SensibleRateLED = (1 - ig.LEDRadFraction) * ig.LEDActualEleP; // convective heat gain from LED lights when LED is on;
+            ig.SensibleRate = -1.0 * ig.LatentRate + ig.SensibleRateLED;
             state.dataHeatBalSurf->SurfQAdditionalHeatSourceInside(ig.SurfPtr) =
-                -1.0 * ig.LambdaET +
                 ig.LEDRadFraction * 0.9 * ig.LEDActualEleP /
-                    state.dataSurface->Surface(ig.SurfPtr).Area; // assume the energy from radiation for photosynthesis is only 10%.
+                state.dataSurface->Surface(ig.SurfPtr).Area; // assume the energy from radiation for photosynthesis is only 10%.
         }
     }
 

diff --git a/src/EnergyPlus/PythonEngine.cc b/src/EnergyPlus/PythonEngine.cc
@@ -362,7 +362,7 @@ namespace Python {
     }
 
 #else // NOT LINK_WITH_PYTHON
-    PythonEngine::PythonEngine()
+    PythonEngine::PythonEngine(EnergyPlus::EnergyPlusData &state)
     {
         ShowFatalError(state, "EnergyPlus is not linked with python");
     }