CppCheck Cleanups #11319

mitchute · 2025-11-04T01:00:46Z

Pull request overview

CppCheck has a flagged number of warnings, as well as some style and performance recommendations. In addition, several files are being ignored. This is expected to be a pass at moving these towards a better place.

Update: this generally only addresses variables out of scope.

Pull Request Author

Reviewer

rraustad

CppCheck is running pretty fast so including these doesn't seem to hurt GHA run time.

mitchute · 2025-11-04T22:05:08Z

@rraustad yeah, I don't think it was the speed, but that it was just that those files were throwing some errors that they didn't have time to deal with.

github-actions · 2025-11-05T00:28:18Z

⚠️ Regressions detected on macos-14 for commit `eae6352`

Regression Summary

ESO Small Diffs: 4

github-actions · 2025-11-05T00:43:35Z

⚠️ Regressions detected on ubuntu-24.04 for commit `eae6352`

Regression Summary

ESO Small Diffs: 4

github-actions · 2025-11-24T17:28:22Z

⚠️ Regressions detected on ubuntu-24.04 for commit `76cb589`

Regression Summary

ESO Small Diffs: 4

github-actions · 2025-11-24T17:29:16Z

⚠️ Regressions detected on macos-14 for commit `76cb589`

Regression Summary

ESO Small Diffs: 4

rraustad · 2025-11-25T21:20:50Z

src/EnergyPlus/AirflowNetwork/src/Solver.cpp


        // Check the number of primary air loops
        if (!simulation_control.DuctLoss) {
+            int NumAPL;


I would think this should be initialized to 0 here since distribution_simulated could be false? and NumAPL is used at line 2224.

rraustad · 2025-11-25T21:25:48Z

src/EnergyPlus/BaseboardElectric.cc

            int BaseboardNum = 0;
            for (int ConvElecBBNum = 1; ConvElecBBNum <= NumConvElecBaseboards; ++ConvElecBBNum) {
-
+                auto &s_ipsc = state.dataIPShortCut;


Shouldn't this be done outside the for loop? after line 190?

rraustad · 2025-11-25T21:28:40Z

src/EnergyPlus/DataHeatBalance.cc

        for (nLayer = 1; nLayer <= Construction::MaxLayersInConstruct; ++nLayer) {
            state.dataConstruction->Construct(state.dataHeatBal->TotConstructs).LayerPoint(nLayer) = state.dataConstruction->LayerPoint(nLayer);
            if (state.dataConstruction->LayerPoint(nLayer) != 0) {
+                auto &s_mat = state.dataMaterial;


Same here, do this just above line 863?

rraustad · 2025-11-25T21:30:05Z

src/EnergyPlus/DemandManager.cc


            auto &thisDemandMgrList = state.dataDemandManager->DemandManagerList(ListNum);
-
+            auto &s_ipsc = state.dataIPShortCut;


Same, outside for loop.

rraustad · 2025-11-25T21:30:53Z

src/EnergyPlus/DuctLoss.cc

            for (int DuctLossNum = 1; DuctLossNum <= state.dataDuctLoss->NumOfDuctLosses; DuctLossNum++) {
                auto &thisDuctLoss(state.dataDuctLoss->ductloss(DuctLossNum));
-
+                std::string CurrentModuleObject;


outside for loop.

src/EnergyPlus/HVACVariableRefrigerantFlow.cc

src/EnergyPlus/OutAirNodeManager.cc

rraustad · 2025-11-25T21:41:19Z

src/EnergyPlus/PlantLoopHeatPumpEIR.cc

    bool errorsFound = false;
-    std::string &cCurrentModuleObject = state.dataIPShortCut->cCurrentModuleObject;
    for (auto const &classToInput : classesToInput) {
+        std::string &cCurrentModuleObject = state.dataIPShortCut->cCurrentModuleObject;


I wonder why CppCheck would want this scope reduced?? and line 3780.

…e-integrity

dareumnam · 2025-12-01T23:04:47Z

@mitchute @rraustad I started the CppCheck cleanup with the (style), [variableScope] The scope of the variable '****' can be reduced warnings, which suggest reducing the scope of certain variables, but it seems like moving the variable declaration closer to where it is actually used or the smallest relevant loop might not be the best placement. If we prefer to keep the current declarations and ignore these specific variable-scope warnings, I can revert the changes and move on to the next set of CppCheck issues.

github-actions · 2026-01-07T03:04:03Z

⚠️ Regressions detected on ubuntu-24.04 for commit `322baf2`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

…e-integrity

…nto code-integrity

…e-integrity

github-actions · 2026-01-09T15:31:11Z

⚠️ Regressions detected on macos-14 for commit `49144ad`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

github-actions · 2026-01-09T15:35:05Z

⚠️ Regressions detected on ubuntu-24.04 for commit `49144ad`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

…e-integrity

github-actions · 2026-01-13T15:22:06Z

⚠️ Regressions detected on macos-14 for commit `afc4540`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

github-actions · 2026-01-13T15:24:29Z

⚠️ Regressions detected on ubuntu-24.04 for commit `afc4540`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

mitchute

Alright, this is "fine" enough for now. Mostly just silly scope adjustments for variables where cppcheck was complaining. It does address a small bug in HeatBalanceSurfaceManager, which is causing some diffs.

mitchute · 2026-01-14T01:36:08Z

.github/workflows/test_code_integrity.yml

-          -i EnergyPlus/DXCoils.cc
-          -i EnergyPlus/RefrigeratedCase.cc
-          -i EnergyPlus/SolarShading.cc


These were being ignored previously. Adding them back now.

mitchute · 2026-01-14T01:38:36Z

.github/workflows/test_code_integrity.yml

+          --suppress="uninitvar:*" \
+          --suppress="arrayIndexThenCheck:*" \
+          --suppress="checkLevelNormal:*" \
+          --suppress="constParameterPointer:*" \
+          --suppress="constParameterReference:*" \
+          --suppress="constVariable:*" \
+          --suppress="constVariablePointer:*" \
+          --suppress="constVariableReference:*" \
+          --suppress="cstyleCast:*" \
+          --suppress="duplicateCondition:*" \
+          --suppress="duplicateExpression:*" \
+          --suppress="knownConditionTrueFalse:*" \
+          --suppress="multiCondition:*" \
+          --suppress="noExplicitConstructor:*" \
+          --suppress="passedByValueCallback:*" \
+          --suppress="redundantAssignment:*" \
+          --suppress="redundantCondition:*" \
+          --suppress="redundantInitialization:*" \
+          --suppress="sameIteratorExpression:*" \
+          --suppress="shadowFunction:*" \
+          --suppress="shadowVariable:*" \
+          --suppress="unassignedVariable:*" \
+          --suppress="unmatchedSuppression:*" \
+          --suppress="unpreciseMathCall:*" \
+          --suppress="unreadVariable:*" \
+          --suppress="useInitializationList:*" \
+          --suppress="useStlAlgorithm:*" \
+          --suppress="uselessAssignmentArg:*" \
+          --suppress="uselessCallsSubstr:*" \


These all exist currently, but we don't do anything about them. After this PR, cppcheck should be "clean." We will keep working to address these, but at least we will know if anything new is popping up after this.

mitchute · 2026-01-14T01:39:30Z

src/EnergyPlus/Construction.cc

+    // Start of Step 1 ...
+    // set to tiny value to avoid log(0) below
+    AMatRowNormMax = 1e-12;


As stated, changed to avoid log(0) below.

mitchute · 2026-01-14T01:39:59Z

src/EnergyPlus/Autosizing/Base.cc

-        auto &cmpType = state.dataPlnt->PlantLoop(loopNum).plantCoilObjectTypes;
        int arrayIndex = -1;
        // check if component has been added to array
        if (!plntComps.empty()) {
+            auto &cmpType = state.dataPlnt->PlantLoop(loopNum).plantCoilObjectTypes;


Most of these are just scope adjustments. I'm not going to review them individually.

mitchute · 2026-01-14T01:41:17Z

src/EnergyPlus/HeatBalanceSurfaceManager.cc

                                        int slatIdxLo = surfShade.blind.slatAngIdxLo;
-                                        int slatIdxHi = surfShade.blind.slatAngIdxLo;
+                                        int slatIdxHi = surfShade.blind.slatAngIdxHi;


This appears to be a bug that was addressed here. It's causing some minor diffs in results.

@mitchute maybe this change should be reverted here to see if diffs go away? CppCheck changes typically require no diffs.

github-actions · 2026-01-14T02:13:32Z

⚠️ Regressions detected on macos-14 for commit `0ec5ccb`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

github-actions · 2026-01-14T02:18:40Z

⚠️ Regressions detected on ubuntu-24.04 for commit `0ec5ccb`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

…e-integrity

github-actions · 2026-01-20T21:38:57Z

⚠️ Regressions detected on macos-14 for commit `6f1b915`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

github-actions · 2026-01-20T21:59:11Z

⚠️ Regressions detected on ubuntu-24.04 for commit `6f1b915`

Regression Summary

ESO Small Diffs: 5
EIO: 3
ESO Big Diffs: 2
Table Small Diffs: 3

mitchute · 2026-01-21T01:25:01Z

@rraustad 377391c and f539a4e should get us back to no diffs.

mitchute · 2026-01-23T20:51:46Z

Thanks @dareumnam. Merging.

mitchute added 2 commits November 3, 2025 17:55

try running cppcheck on DXCoils, RefrigeratedCase, and SolarShading

d6a75bc

delete comments?

61bc36b

mitchute added the Defect Includes code to repair a defect in EnergyPlus label Nov 4, 2025

clamp so cppcheck doesn't throw containerOutOfBounds errors

270103a

rraustad approved these changes Nov 4, 2025

View reviewed changes

mitchute added 2 commits November 4, 2025 15:54

cleanup cppcheck warnings

8a4e521

cppcheck performance fixes

c40ef31

dareumnam added 6 commits November 23, 2025 00:24

cppcheck style_variableScope

7e98d30

pull develop and merge conflicts

011884c

fix error

a7f2b51

fix error 2

1e3c22b

fix error 3

78860cc

fix error

907b6e0

rraustad reviewed Nov 25, 2025

View reviewed changes

src/EnergyPlus/HVACVariableRefrigerantFlow.cc Outdated Show resolved Hide resolved

rraustad reviewed Nov 25, 2025

View reviewed changes

src/EnergyPlus/OutAirNodeManager.cc Outdated Show resolved Hide resolved

rraustad reviewed Nov 25, 2025

View reviewed changes

mitchute marked this pull request as draft December 1, 2025 16:11

dareumnam added 2 commits December 1, 2025 15:49

style - variableScope 2

334ab6f

Merge branch 'develop' of https://github.com/NREL/EnergyPlus into cod…

a12526d

…e-integrity

dareumnam and others added 5 commits January 6, 2026 23:07

Merge branch 'develop' of https://github.com/NREL/EnergyPlus into cod…

ee9aec7

…e-integrity

Merge branch 'code-integrity' of https://github.com/NREL/EnergyPlus i…

4abe242

…nto code-integrity

Merge branch 'develop' of https://github.com/NREL/EnergyPlus into cod…

c3485f5

…e-integrity

rest of variable scope fixes

3eea010

fix build errors, a few more last cleanups

ead0597

Merge branch 'develop' of https://github.com/NREL/EnergyPlus into cod…

5b047b8

…e-integrity

mitchute added 2 commits January 13, 2026 18:09

suppress other warnings for now

ece10e4

final touchups

b773b2c

mitchute commented Jan 14, 2026

View reviewed changes

mitchute marked this pull request as ready for review January 14, 2026 01:47

Merge branch 'develop' of https://github.com/NREL/EnergyPlus into cod…

067da92

…e-integrity

dareumnam added DoNotPublish Includes changes that shouldn't be reported in the changelog and removed Defect Includes code to repair a defect in EnergyPlus labels Jan 20, 2026

mitchute added 3 commits January 20, 2026 17:20

fix diffs

377391c

fix diffs

f539a4e

Merge branch 'develop' into code-integrity

3cf34c7

mitchute merged commit 3c380d1 into develop Jan 23, 2026
11 checks passed

mitchute deleted the code-integrity branch January 23, 2026 20:51

mitchute mentioned this pull request Jan 24, 2026

Fix Incorrect High Slat Angle Index #11405

Open

25 tasks


		auto &thisDemandMgrList = state.dataDemandManager->DemandManagerList(ListNum);

		auto &s_ipsc = state.dataIPShortCut;

CppCheck Cleanups #11319

CppCheck Cleanups #11319

Conversation

mitchute commented Nov 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull request overview

Pull Request Author

Reviewer

Uh oh!

rraustad left a comment

Choose a reason for hiding this comment

Uh oh!

mitchute commented Nov 4, 2025

Uh oh!

github-actions bot commented Nov 5, 2025

⚠️ Regressions detected on macos-14 for commit eae6352

Uh oh!

github-actions bot commented Nov 5, 2025

⚠️ Regressions detected on ubuntu-24.04 for commit eae6352

Uh oh!

github-actions bot commented Nov 24, 2025

⚠️ Regressions detected on ubuntu-24.04 for commit 76cb589

Uh oh!

github-actions bot commented Nov 24, 2025

⚠️ Regressions detected on macos-14 for commit 76cb589

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

rraustad Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dareumnam commented Dec 1, 2025

Uh oh!

github-actions bot commented Jan 7, 2026

⚠️ Regressions detected on ubuntu-24.04 for commit 322baf2

Uh oh!

github-actions bot commented Jan 9, 2026

⚠️ Regressions detected on macos-14 for commit 49144ad

Uh oh!

github-actions bot commented Jan 9, 2026

⚠️ Regressions detected on ubuntu-24.04 for commit 49144ad

Uh oh!

github-actions bot commented Jan 13, 2026

⚠️ Regressions detected on macos-14 for commit afc4540

Uh oh!

github-actions bot commented Jan 13, 2026

⚠️ Regressions detected on ubuntu-24.04 for commit afc4540

Uh oh!

mitchute left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 14, 2026

⚠️ Regressions detected on macos-14 for commit 0ec5ccb

Uh oh!

github-actions bot commented Jan 14, 2026

⚠️ Regressions detected on ubuntu-24.04 for commit 0ec5ccb

Uh oh!

mitchute commented Nov 4, 2025 •

edited

Loading

⚠️ Regressions detected on macos-14 for commit `eae6352`

⚠️ Regressions detected on ubuntu-24.04 for commit `eae6352`

⚠️ Regressions detected on ubuntu-24.04 for commit `76cb589`

⚠️ Regressions detected on macos-14 for commit `76cb589`

rraustad Nov 25, 2025 •

edited

Loading

⚠️ Regressions detected on ubuntu-24.04 for commit `322baf2`

⚠️ Regressions detected on macos-14 for commit `49144ad`

⚠️ Regressions detected on ubuntu-24.04 for commit `49144ad`

⚠️ Regressions detected on macos-14 for commit `afc4540`

⚠️ Regressions detected on ubuntu-24.04 for commit `afc4540`

⚠️ Regressions detected on macos-14 for commit `0ec5ccb`

⚠️ Regressions detected on ubuntu-24.04 for commit `0ec5ccb`

⚠️ Regressions detected on macos-14 for commit `6f1b915`

⚠️ Regressions detected on ubuntu-24.04 for commit `6f1b915`