Merge remote-tracking branch 'remotes/origin/develop' into 10823FanFr…

…eeUnitary

.github/workflows/cpp-problem-matcher.json

@@ -0,0 +1,17 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "gcc-problem-matcher",
+      "pattern": [
+        {
+          "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "severity": 4,
+          "message": 5
+        }
+      ]
+    }
+  ]
+}

.github/workflows/test_code_integrity.yml

@@ -14,14 +14,14 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run clang-format style check for C/C++ source code.
-        uses: jidicula/clang-format-action@v4.13.0
+        uses: jidicula/clang-format-action@v4.14.0
         if: always()
         with:
           clang-format-version: '10'
           check-path: 'src/EnergyPlus'
 
       - name: Run clang-format style check for C/C++ unit test code.
-        uses: jidicula/clang-format-action@v4.13.0
+        uses: jidicula/clang-format-action@v4.14.0
         if: always()
         with:
           clang-format-version: '10'
@@ -46,7 +46,8 @@ jobs:
           --force
           --std=c++17
           --inline-suppr
-          --suppress=cppcheckError
+          --suppress=missingInclude
+          --suppress=missingIncludeSystem
           --suppress=unusedFunction:src/EnergyPlus/api/autosizing.cc
           --suppress=unusedFunction:src/EnergyPlus/api/datatransfer.cc
           --suppress=unusedFunction:src/EnergyPlus/api/func.cc

.github/workflows/test_develop_commits.yml

@@ -135,7 +135,10 @@ jobs:
     - name: Build
       id: build
       working-directory: ./build
-      run: cmake --build . -j ${{ matrix.nproc }} --config Release
+      run: |
+        echo "::add-matcher::./.github/workflows/cpp-problem-matcher.json"
+        cmake --build . -j ${{ matrix.nproc }} --config Release
+        echo "::remove-matcher owner=gcc-problem-matcher::"
 
     - name: Test
       # Not running test on alternate build yet, I need to test things

.github/workflows/test_pull_requests.yml

@@ -155,7 +155,10 @@ jobs:
     - name: Branch Build
       id: branch_build
       working-directory: ./branch/build
-      run: cmake --build . -j ${{ matrix.nproc }} --config Release
+      run: |
+        echo "::add-matcher::./branch/.github/workflows/cpp-problem-matcher.json"
+        cmake --build . -j ${{ matrix.nproc }} --config Release
+        echo "::remove-matcher owner=gcc-problem-matcher::"
 
     - name: Branch Test
       working-directory: ./branch/build

src/EnergyPlus/UnitarySystem.cc

@@ -2983,12 +2983,14 @@ namespace UnitarySystems {
         if (this->m_CoolCoilExists && this->m_MaxCoolAirVolFlow < 0.0) {
             if (!state.dataSize->SysSizingRunDone) {
                 int BranchNum = BranchInputManager::GetAirBranchIndex(state, "AirloopHVAC:UnitarySystem", this->Name);
-                std::string FanType = "";
-                std::string m_FanName = ""; // the notation m_ implies member variables, and this is a local
                 BranchFanFlow = 0.0;
-                if (BranchNum > 0.0) BranchInputManager::GetBranchFanTypeName(state, BranchNum, FanType, m_FanName, ErrFound);
-                if (!ErrFound && BranchNum > 0) {
-                    BranchFanFlow = state.dataFans->fans(this->m_FanIndex)->maxAirFlowRate;
+                if (BranchNum > 0.0) {
+                    std::string FanType = "";
+                    std::string FanName = "";
+                    BranchInputManager::GetBranchFanTypeName(state, BranchNum, FanType, FanName, ErrFound);
+                    if (!ErrFound) {
+                        BranchFanFlow = state.dataFans->fans(this->m_FanIndex)->maxAirFlowRate;
+                    }
                 }
                 if (BranchFanFlow > 0.0) {
                     this->m_MaxCoolAirVolFlow = BranchFanFlow;
@@ -6618,10 +6620,7 @@ namespace UnitarySystems {
                         this->m_MSHeatingSpeedRatio[i] = 1.0;
                     }
                     if (this->m_HeatingCoilType_Num == HVAC::Coil_HeatingWaterToAirHPVSEquationFit) {
-                        std::string MultispeedType = "UnitarySystemPerformance:Multispeed";
-                        if (this->m_DesignSpecMSHPIndex == -1) {
-                            std::string MultispeedType = "Fan:SystemModel";
-                        }
+                        std::string MultispeedType = (this->m_DesignSpecMSHPIndex == -1) ? "Fan:SystemModel" : "UnitarySystemPerformance:Multispeed";
                         int NumOfSpeed = VariableSpeedCoils::GetVSCoilNumOfSpeeds(state, this->m_HeatingCoilName, errorsFound);
                         if (errorsFound) {
                             ShowSevereError(state,
@@ -6664,10 +6663,7 @@ namespace UnitarySystems {
                         this->m_MSCoolingSpeedRatio[i] = 1.0;
                     }
                     if (this->m_CoolingCoilType_Num == HVAC::Coil_CoolingWaterToAirHPVSEquationFit) {
-                        std::string MultispeedType = "UnitarySystemPerformance:Multispeed";
-                        if (this->m_DesignSpecMSHPIndex == -1) {
-                            std::string MultispeedType = "Fan:SystemModel";
-                        }
+                        std::string MultispeedType = (this->m_DesignSpecMSHPIndex == -1) ? "Fan:SystemModel" : "UnitarySystemPerformance:Multispeed";
                         int NumOfSpeed = VariableSpeedCoils::GetVSCoilNumOfSpeeds(state, this->m_CoolingCoilName, errorsFound);
                         if (errorsFound) {
                             ShowSevereError(state,

src/EnergyPlus/UserDefinedComponents.cc

@@ -114,7 +114,6 @@ namespace UserDefinedComponents {
 
     void UserPlantComponentStruct::onInitLoopEquip(EnergyPlusData &state, const PlantLocation &calledFromLocation)
     {
-        bool anyEMSRan;
         Real64 myLoad = 0.0;
         int thisLoop = 0;
 
@@ -128,6 +127,7 @@ namespace UserDefinedComponents {
 
         if (thisLoop > 0) {
             if (this->Loop(thisLoop).ErlInitProgramMngr > 0) {
+                bool anyEMSRan;
                 EMSManager::ManageEMS(state, EMSManager::EMSCallFrom::UserDefinedComponentModel, anyEMSRan, this->Loop(thisLoop).ErlInitProgramMngr);
             } else if (this->Loop(thisLoop).initPluginLocation > -1) {
                 state.dataPluginManager->pluginManager->runSingleUserDefinedPlugin(state, this->Loop(thisLoop).initPluginLocation);