Merge from remote.

bigladder · Jul 22, 2024 · d4ac8d1 · d4ac8d1 · nrel-bot-3 · Jul 22, 2024
2 parents cb92a78 + 374707a
commit d4ac8d1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/src/EnergyPlus/Coils/CoilCoolingDX.cc b/src/EnergyPlus/Coils/CoilCoolingDX.cc
@@ -664,6 +664,8 @@ void CoilCoolingDX::simulate(EnergyPlusData &state,
                              bool const singleMode,
                              Real64 const LoadSHR)
 {
+    assert(speedNum != 0);
+
     if (this->myOneTimeInitFlag) {
         this->oneTimeInit(state);
         this->myOneTimeInitFlag = false;
@@ -769,7 +771,7 @@ void CoilCoolingDX::simulate(EnergyPlusData &state,
     this->wasteHeatEnergyRate = this->performance.wasteHeatRate;
     this->wasteHeatEnergy = this->performance.wasteHeatRate * reportingConstant;
 
-    this->partLoadRatioReport = speedNum == 1 ? 1.0 : speedRatio;
+    this->partLoadRatioReport = speedNum > 1 ? 1.0 : speedRatio;
     this->speedNumReport = speedNum;
     this->speedRatioReport = speedRatio;
 

diff --git a/src/EnergyPlus/UnitarySystem.cc b/src/EnergyPlus/UnitarySystem.cc
@@ -11537,24 +11537,25 @@ namespace UnitarySystems {
         } break;
         case HVAC::CoilDX_Cooling: { // CoilCoolingDX
             bool const singleMode = (this->m_SingleMode == 1);
+            CoilPLR = 0.0;
             if (this->m_ControlType == UnitarySysCtrlType::Setpoint) {
                 if (CompressorOn == HVAC::CompressorOp::On) {
                     CoilPLR = (this->m_CoolingSpeedNum > 1) ? 1.0 : PartLoadRatio;
-                } else
-                    CoilPLR = 0.0;
+                }
             } else {
                 if (this->m_EMSOverrideCoilSpeedNumOn) {
                     CoilPLR = this->m_CoolingSpeedRatio;
                 } else {
-                    if (CompressorOn == HVAC::CompressorOp::Off) {
-                        this->m_CoolingSpeedNum = 1; // Bypass mixed-speed calculations in called functions
-                        CoilPLR = 0.0;
-                    } else {
-                        if (singleMode) {
-                            CoilPLR = (m_CoolingSpeedNum == 1) ? PartLoadRatio
-                                                               : 0.0; // singleMode allows cycling, but not part load operation at higher speeds
+                    if (state.dataUnitarySystems->CoolingLoad) {
+                        if (CompressorOn == HVAC::CompressorOp::Off) {
+                            this->m_CoolingSpeedNum = 1; // Bypass mixed-speed calculations in called functions
                         } else {
-                            CoilPLR = PartLoadRatio;
+                            if (singleMode) {
+                                CoilPLR = (m_CoolingSpeedNum == 1) ? PartLoadRatio
+                                                                   : 0.0; // singleMode allows cycling, but not part load operation at higher speeds
+                            } else {
+                                CoilPLR = PartLoadRatio;
+                            }
                         }
                     }
                 }

diff --git a/src/EnergyPlus/UnitarySystem.hh b/src/EnergyPlus/UnitarySystem.hh
@@ -365,7 +365,7 @@ namespace UnitarySystems {
 
         Real64 m_CoolingCycRatio = 0.0;
         Real64 m_CoolingSpeedRatio = 0.0;
-        int m_CoolingSpeedNum = 0;
+        int m_CoolingSpeedNum = 1;
 
         int m_EconoSpeedNum = 0;
         Real64 m_EconoPartLoadRatio = 0;