From eb8b28de8155568980fee52d2236f697e5a31e52 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 2 Feb 2026 14:59:14 -0700 Subject: [PATCH 1/2] pin testing badges to develop --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 72e041f329c..88c1659aaae 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ This is the EnergyPlus Development Repository. EnergyPlus™ is a whole buildin ## Testing -[![](https://github.com/NatLabRockies/EnergyPlus/workflows/Code%20Integrity/badge.svg)](https://github.com/NatLabRockies/EnergyPlus/actions/workflows/test_code_integrity.yml) -[![](https://github.com/NatLabRockies/EnergyPlus/workflows/Documentation/badge.svg)](https://github.com/NatLabRockies/EnergyPlus/actions/workflows/build_documentation.yml) +[![](https://github.com/NatLabRockies/EnergyPlus/actions/workflows/test_code_integrity.yml/badge.svg?branch=develop)](https://github.com/NatLabRockies/EnergyPlus/actions/workflows/test_code_integrity.yml) +[![](https://github.com/NatLabRockies/EnergyPlus/actions/workflows/build_documentation.yml/badge.svg?branch=develop)](https://github.com/NatLabRockies/EnergyPlus/actions/workflows/build_documentation.yml) Every commit and every release of EnergyPlus undergoes rigorous testing. The testing consists of building EnergyPlus, of course, then there are unit tests, integration tests, API tests, and regression tests. From 03137b1d31e6f78d8a3e62c47f0bc1c243c83df8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 3 Feb 2026 07:28:02 -0700 Subject: [PATCH 2/2] fix tabular monthly average value when conversion is applied --- src/EnergyPlus/OutputReportTabular.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/EnergyPlus/OutputReportTabular.cc b/src/EnergyPlus/OutputReportTabular.cc index c83fb0beffc..cf4352c9c23 100644 --- a/src/EnergyPlus/OutputReportTabular.cc +++ b/src/EnergyPlus/OutputReportTabular.cc @@ -7222,7 +7222,7 @@ void WriteMonthlyTables(EnergyPlusData &state) maxVal = storedMinVal; for (lMonth = 1; lMonth <= 12; ++lMonth) { if (ort->MonthlyColumns(curCol).avgSum == - OutputProcessor::StoreType::Average) { // if it is a average variable divide by duration + OutputProcessor::StoreType::Average) { // if it is an average variable divide by duration if (ort->MonthlyColumns(curCol).duration(lMonth) != 0) { curVal = ((ort->MonthlyColumns(curCol).reslt(lMonth) / ort->MonthlyColumns(curCol).duration(lMonth)) * curConversionFactor) + @@ -7230,8 +7230,12 @@ void WriteMonthlyTables(EnergyPlusData &state) } else { curVal = 0.0; } - sumVal += - (ort->MonthlyColumns(curCol).reslt(lMonth) * curConversionFactor) + state.dataOutRptTab->curConversionOffset; + if (ort->MonthlyColumns(curCol).duration(lMonth) > 0) { + sumVal += ((ort->MonthlyColumns(curCol).reslt(lMonth) / ort->MonthlyColumns(curCol).duration(lMonth) * + curConversionFactor) + + state.dataOutRptTab->curConversionOffset) * + ort->MonthlyColumns(curCol).duration(lMonth); + } sumDuration += ort->MonthlyColumns(curCol).duration(lMonth); } else { curVal = (ort->MonthlyColumns(curCol).reslt(lMonth) * curConversionFactor) + state.dataOutRptTab->curConversionOffset;