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. 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;