Surface Outside Face Convection Heat Gain Rate was fixed when rain flag is true & to be altered for OSCM as well

src/EnergyPlus/HeatBalanceSurfaceManager.cc

@@ -5707,17 +5707,30 @@ namespace HeatBalanceSurfaceManager {
             }
 
             // fill in reporting values for outside face
-            QdotConvOutRep(SurfNum) = -Surface(SurfNum).Area * HcExtSurf(SurfNum) * (TH(1, 1, SurfNum) - Surface(SurfNum).OutDryBulbTemp);
+
+            QdotConvOutRepPerArea(SurfNum) = GetQdotConvOutRepPerArea(SurfNum);
+
+            QdotConvOutRep(SurfNum) = QdotConvOutRepPerArea(SurfNum) * Surface(SurfNum).Area;
 
-            if (Surface(SurfNum).OSCMPtr > 0) { // Optr is set above in this case, use OSCM boundary data
-                QdotConvOutRepPerArea(SurfNum) = -OSCM(OPtr).HConv * (TH(1, 1, SurfNum) - OSCM(OPtr).TConv);
-            } else {
-                QdotConvOutRepPerArea(SurfNum) = -HcExtSurf(SurfNum) * (TH(1, 1, SurfNum) - Surface(SurfNum).OutDryBulbTemp);
-            }
             QConvOutReport(SurfNum) = QdotConvOutRep(SurfNum) * TimeStepZoneSec;
+
         } // ...end of DO loop over all surface (actually heat transfer surfaces)
     }
 
+    Real64 GetQdotConvOutRepPerArea(int const SurfNum) 
+    {
+        int OPtr = Surface(SurfNum).OSCPtr;
+        if (Surface(SurfNum).OSCMPtr > 0) { // Optr is set above in this case, use OSCM boundary data
+            return -OSCM(OPtr).HConv * (TH(1, 1, SurfNum) - OSCM(OPtr).TConv);
+        } else {
+            if (IsRain) {
+                return -HcExtSurf(SurfNum) * (TH(1, 1, SurfNum) - Surface(SurfNum).OutWetBulbTemp);
+            } else {
+                return -HcExtSurf(SurfNum) * (TH(1, 1, SurfNum) - Surface(SurfNum).OutDryBulbTemp);
+            }
+        }
+    }
+
     void CalcHeatBalanceInsideSurf(Optional_int_const ZoneToResimulate) // if passed in, then only calculate surfaces that have this zone
     {
         // Pass correct list of surfaces to CalcHeatBalanceInsideSurf2

src/EnergyPlus/HeatBalanceSurfaceManager.hh

@@ -155,6 +155,8 @@ namespace HeatBalanceSurfaceManager {
 
     void CalcHeatBalanceOutsideSurf(Optional_int_const ZoneToResimulate = _); // if passed in, then only calculate surfaces that have this zone
 
+    Real64 GetQdotConvOutRepPerArea(int const SurfNum);
+
     void CalcHeatBalanceInsideSurf(Optional_int_const ZoneToResimulate = _); // if passed in, then only calculate surfaces that have this zone
 
     void CalcHeatBalanceInsideSurf2(const std::vector<int> &HTSurfs,          // Heat transfer surfaces to simulate (opaque and windows)

tst/EnergyPlus/unit/HeatBalanceSurfaceManager.unit.cc

@@ -2504,50 +2504,75 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfTempCalcHeatBalanceA
 
 TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestReportIntMovInsInsideSurfTemp)
 {
-    
+
     Real64 ExpectedResult1;
     Real64 ExpectedResult2;
     Real64 ExpectedResult3;
 
     DataSurfaces::clear_state();
     DataHeatBalSurface::clear_state();
-    
+
     DataSurfaces::TotSurfaces = 3;
     DataSurfaces::Surface.allocate(DataSurfaces::TotSurfaces);
     DataHeatBalSurface::TempSurfIn.allocate(DataSurfaces::TotSurfaces);
     DataHeatBalSurface::TempSurfInTmp.allocate(DataSurfaces::TotSurfaces);
     DataHeatBalSurface::TempSurfInMovInsRep.allocate(DataSurfaces::TotSurfaces);
 
     // Test 1 Data: Surface does NOT have movable insulation
-    DataSurfaces::Surface(1).MaterialMovInsulInt = 0;   // No material means no movable insulation
-    DataSurfaces::Surface(1).SchedMovInsulInt = 0;      // Schedule index of zero returns zero value (not scheduled)
+    DataSurfaces::Surface(1).MaterialMovInsulInt = 0; // No material means no movable insulation
+    DataSurfaces::Surface(1).SchedMovInsulInt = 0;    // Schedule index of zero returns zero value (not scheduled)
     DataHeatBalSurface::TempSurfIn(1) = 23.0;
     DataHeatBalSurface::TempSurfInTmp(1) = 12.3;
     DataHeatBalSurface::TempSurfInMovInsRep(1) = 1.23;
-    ExpectedResult1 = 23.0;                             // TempSurfInMovInsRep should be set to TempSurfIn
-    
+    ExpectedResult1 = 23.0; // TempSurfInMovInsRep should be set to TempSurfIn
+
     // Test 2 Data: Surface does have movable insulation but it is scheduled OFF
-    DataSurfaces::Surface(2).MaterialMovInsulInt = 1;   // Material index present means there is movable insulation
-    DataSurfaces::Surface(2).SchedMovInsulInt = 0;      // Schedule index of zero returns zero value (not scheduled)
+    DataSurfaces::Surface(2).MaterialMovInsulInt = 1; // Material index present means there is movable insulation
+    DataSurfaces::Surface(2).SchedMovInsulInt = 0;    // Schedule index of zero returns zero value (not scheduled)
     DataHeatBalSurface::TempSurfIn(2) = 123.0;
     DataHeatBalSurface::TempSurfInTmp(2) = 12.3;
     DataHeatBalSurface::TempSurfInMovInsRep(2) = 1.23;
-    ExpectedResult2 = 123.0;                             // TempSurfInMovInsRep should be set to TempSurfIn
-    
+    ExpectedResult2 = 123.0; // TempSurfInMovInsRep should be set to TempSurfIn
+
     // Test 3 Data: Surface does have movable insulation and it is scheduled ON
-    DataSurfaces::Surface(3).MaterialMovInsulInt = 1;   // Material index present means there is movable insulation
-    DataSurfaces::Surface(3).SchedMovInsulInt = -1;     // Schedule index of -1 returns 1.0 value
+    DataSurfaces::Surface(3).MaterialMovInsulInt = 1; // Material index present means there is movable insulation
+    DataSurfaces::Surface(3).SchedMovInsulInt = -1;   // Schedule index of -1 returns 1.0 value
     DataHeatBalSurface::TempSurfIn(3) = 12.3;
     DataHeatBalSurface::TempSurfInTmp(3) = 1.23;
     DataHeatBalSurface::TempSurfInMovInsRep(3) = -9999.9;
-    ExpectedResult3 = 1.23;                             // TempSurfInMovInsRep should be set to TempSurfInTmp
+    ExpectedResult3 = 1.23; // TempSurfInMovInsRep should be set to TempSurfInTmp
 
     // Now call the subroutine which will run all of the test cases at once and then make the comparisons
     HeatBalanceSurfaceManager::ReportIntMovInsInsideSurfTemp();
-    EXPECT_NEAR(DataHeatBalSurface::TempSurfInMovInsRep(1),ExpectedResult1,0.00001);
-    EXPECT_NEAR(DataHeatBalSurface::TempSurfInMovInsRep(2),ExpectedResult2,0.00001);
-    EXPECT_NEAR(DataHeatBalSurface::TempSurfInMovInsRep(3),ExpectedResult3,0.00001);
-
+    EXPECT_NEAR(DataHeatBalSurface::TempSurfInMovInsRep(1), ExpectedResult1, 0.00001);
+    EXPECT_NEAR(DataHeatBalSurface::TempSurfInMovInsRep(2), ExpectedResult2, 0.00001);
+    EXPECT_NEAR(DataHeatBalSurface::TempSurfInMovInsRep(3), ExpectedResult3, 0.00001);
 }
-
+
+TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_OutsideSurfHeatBalanceWhenRainFlag)
+{
+    DataSurfaces::Surface.allocate(1);
+    DataHeatBalSurface::HcExtSurf.allocate(1);
+    DataHeatBalSurface::TH.allocate(1, 1, 1);
+
+    DataSurfaces::Surface(1).Area = 58.197;
+    DataHeatBalSurface::HcExtSurf(1) = 1000;
+    DataHeatBalSurface::TH(1, 1, 1) = 6.71793958923051;
+    DataSurfaces::Surface(1).OutWetBulbTemp = 6.66143784594778;
+    DataSurfaces::Surface(1).OutDryBulbTemp = 7.2;
+
+    // If Rain Flag = on, GetQdotConvOutRep uses Outdoor Air Wet Bulb Temp.
+    DataEnvironment::IsRain = true;
+    Real64 ExpectedQconvPerArea1 = -1000 * (6.71793958923051 - 6.66143784594778);
+
+    EXPECT_NEAR(ExpectedQconvPerArea1, GetQdotConvOutRepPerArea(1), 0.01);
+
+    // Otherwise, GetQdotConvOutRep uses Outdoor Air Dry Bulb Temp.
+    DataEnvironment::IsRain = false;
+    DataHeatBalSurface::HcExtSurf(1) = 5.65361106051348;
+    Real64 ExpectedQconvPerArea2 = -5.65361106051348 * (6.71793958923051 - 7.2);
+
+    EXPECT_NEAR(ExpectedQconvPerArea2, GetQdotConvOutRepPerArea(1), 0.01);
+}
+
 } // namespace EnergyPlus