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

…eeUnitary

.decent_ci-Linux.yaml

@@ -1,14 +1,14 @@
 compilers:
   - name: "gcc"
-    version: "13.2"
+    version: "13.3"
     cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DBUILD_PERFORMANCE_TESTS:BOOL=ON -DVALGRIND_ANALYZE_PERFORMANCE_TESTS:BOOL=ON -DENABLE_PCH:BOOL=OFF
     collect_performance_results: true
     skip_regression: true
     s3_upload_bucket: energyplus
     num_parallel_builds: 16
 
   - name: "gcc"
-    version: "13.2"
+    version: "13.3"
     build_type: RelWithDebInfo
     cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA:STRING=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DENABLE_PCH:BOOL=OFF
     coverage_enabled: true
@@ -23,7 +23,7 @@ compilers:
     num_parallel_builds: 16
 
   - name: "gcc"
-    version: "13.2"
+    version: "13.3"
     build_type: RelWithDebInfo
     cmake_extra_flags: -DLINK_WITH_PYTHON:BOOL=ON -DPYTHON_CLI:BOOL=OFF -DPython_REQUIRED_VERSION:STRING=3.12.2 -DPython_ROOT_DIR:PATH=~/.pyenv/versions/3.12.2/ -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA:STRING=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DENABLE_PCH:BOOL=OFF
     coverage_enabled: true

doc/getting-started/src/energy-meters/standard-energy-meters.tex

@@ -61,7 +61,8 @@ \section{Standard Energy Meters}\label{standard-energy-meters}
 Water \tabularnewline
 Steam \tabularnewline
 DistrictCooling \tabularnewline
-DistrictHeating \tabularnewline
+DistrictHeatingWater \tabularnewline
+DistrictHeatingSteam \tabularnewline
 \bottomrule
 \end{longtable}
 

doc/getting-started/src/tutorial-example-for-running-energyplus/instructions.tex

@@ -28,7 +28,7 @@ \subsection{Exercise 1A. Run Pre-Defined Building with no Windows}\label{exercis
 \item
   Outdoor Dry Bulb -- is being reported (so you can compare to outside temperature)
 \item
-  The meter for the heating in the facility - DistrictHeating:Facility -- is being reported. Facility is the entire building.
+  The meter for the heating in the facility - DistrictHeatingWater:Facility -- is being reported. Facility is the entire building.
 \item
   The meter for the cooling in the facility - DistrictCooling:Facility -- is being reported.
 \end{itemize}

idd/Energy+.idd.in

@@ -35695,7 +35695,7 @@ ZoneHVAC:IdealLoadsAirSystem,
        \memo the ideal loads system component. This component can be thought of as an ideal unit
        \memo that mixes zone air with the specified amount of outdoor air and then adds or removes
        \memo heat and moisture at 100% efficiency in order to meet the specified controls. Energy
-       \memo use is reported as DistrictHeating and DistrictCooling.
+       \memo use is reported as DistrictHeatingWater and DistrictCooling.
        \min-fields 27
   A1 , \field Name
        \required-field
@@ -73653,6 +73653,7 @@ Chiller:Electric:EIR,
        \note Name" input.
        \note Use "ConstantFlow" when modeling a constant flow condenser plant loop, choose one of the other inputs
        \note when modeling a variable flow condenser plant loop.
+       \type choice
        \key ConstantFlow
        \key ModulatedChillerPLR
        \key ModulatedLoopPLR
@@ -73904,6 +73905,7 @@ Chiller:Electric:ReformulatedEIR,
        \note Name" input.
        \note Use "ConstantFlow" when modeling a constant flow condenser plant loop, choose one of the other inputs
        \note when modeling a variable flow condenser plant loop.
+       \type choice
        \key ConstantFlow
        \key ModulatedChillerPLR
        \key ModulatedLoopPLR

src/EnergyPlus/CMakeLists.txt

@@ -1147,6 +1147,17 @@ if(BUILD_TESTING)
       COMMAND  energyplus -D -d "${CLI_TEST_DIR}/PythonPlugin.FromOutside/out-${NON_ASCII_DIRNAME}" ${NON_ASCII_DIRNAME}/${TEST_CASE}.idf
       WORKING_DIRECTORY  "${CLI_TEST_DIR}"
     )
+
+    set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/TestRuntimeReleasesTheGIL")
+    file(MAKE_DIRECTORY ${TEST_DIR})
+    add_test(NAME "API.Runtime.PythonPlugin.TestRuntimeReleasesTheGIL"
+      COMMAND "${Python_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntimeReleasesTheGIL.py" -d "${TEST_DIR}" -w "${EPW_FILE}" -D "${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntimeReleasesTheGIL/mcve_gil.idf"
+    )
+    set_tests_properties("API.Runtime.PythonPlugin.TestRuntimeReleasesTheGIL"
+      PROPERTIES
+        ENVIRONMENT PYTHONPATH=${DIR_WITH_PY_ENERGYPLUS}
+        TIMEOUT 10  # This used to timeout! and we expect it NOT to
+    )
   endif()
 endif()
 

src/EnergyPlus/ChillerAbsorption.cc

@@ -1728,6 +1728,9 @@ void BLASTAbsorberSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, bool R
         this->CondOutletTemp = state.dataLoopNodes->Node(this->CondInletNodeNum).Temp;
         this->CondMassFlowRate = 0.0;
         this->QCondenser = 0.0;
+        MyLoad = 0.0;
+        this->EvapMassFlowRate = 0.0;
+        PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
         return;
         // V7 plant upgrade, no longer fatal here anymore, set some things and return
     }

src/EnergyPlus/ChillerElectricASHRAE205.cc

@@ -1337,7 +1337,14 @@ void ASHRAE205ChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, boo
         PlantUtilities::PullCompInterconnectTrigger(
             state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
 
-        if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
+        if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
+            MyLoad = 0.0;
+            this->Power = standbyPower;
+            this->AmbientZoneGain = standbyPower;
+            this->EvapMassFlowRate = 0.0;
+            PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
+            return;
+        }
     }
     Real64 EvapOutletTempSetPoint(0.0); // Evaporator outlet temperature setpoint [C]
     switch (state.dataPlnt->PlantLoop(PlantLoopNum).LoopDemandCalcScheme) {

src/EnergyPlus/ChillerElectricEIR.cc

@@ -1962,11 +1962,11 @@ void ElectricEIRChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoad, b
             state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
 
         if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
-            if (this->EvapMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
-                // Use PlantUtilities::SetComponentFlowRate to decide actual flow
-                PlantUtilities::SetComponentFlowRate(
-                    state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
-            }
+            // Shut chiller off if there is no condenser water flow
+            MyLoad = 0.0;
+            this->EvapMassFlowRate = 0.0;
+            // Use PlantUtilities::SetComponentFlowRate to decide actual flow
+            PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
             return;
         }
     }

src/EnergyPlus/ChillerIndirectAbsorption.cc

@@ -1604,7 +1604,7 @@ void IndirectAbsorberSpecs::sizeChiller(EnergyPlusData &state)
     }
 }
 
-void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 const MyLoad, bool const RunFlag)
+void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 MyLoad, bool const RunFlag)
 {
     // SUBROUTINE INFORMATION:
     //       AUTHOR         R. Raustad (FSEC)
@@ -1999,6 +1999,9 @@ void IndirectAbsorberSpecs::calculate(EnergyPlusData &state, Real64 const MyLoad
         this->CondOutletTemp = CondInletTemp;
         this->CondMassFlowRate = 0.0;
         this->QCondenser = 0.0;
+        MyLoad = 0.0;
+        this->EvapMassFlowRate = 0.0;
+        PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
         return;
         // V7 plant upgrade, no longer fatal here anymore... set some things and return
     }

src/EnergyPlus/ChillerReformulatedEIR.cc

@@ -2147,7 +2147,12 @@ void ReformulatedEIRChillerSpecs::calculate(EnergyPlusData &state, Real64 &MyLoa
         PlantUtilities::PullCompInterconnectTrigger(
             state, this->CWPlantLoc, this->CondMassFlowIndex, this->CDPlantLoc, DataPlant::CriteriaType::MassFlowRate, this->CondMassFlowRate);
 
-        if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) return;
+        if (this->CondMassFlowRate < DataBranchAirLoopPlant::MassFlowTolerance) {
+            MyLoad = 0.0;
+            this->EvapMassFlowRate = 0.0;
+            PlantUtilities::SetComponentFlowRate(state, this->EvapMassFlowRate, this->EvapInletNodeNum, this->EvapOutletNodeNum, this->CWPlantLoc);
+            return;
+        }
     }
     Real64 FRAC = 1.0;
     Real64 EvapOutletTempSetPoint(0.0); // Evaporator outlet temperature setpoint [C]