Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #10902 - CoolingTower:VariableSpeed:Merkel not reporting to Equipment Summary - Cooling Towers and Fluid Coolers #10930

Merged
merged 2 commits into from
Feb 13, 2025

Conversation

jmarrec
Copy link
Contributor

@jmarrec jmarrec commented Feb 10, 2025

Pull request overview

Description of the purpose of this PR

CoolingTower:VariableSpeed:Merkel not reporting to Equipment Summary - Cooling Towers and Fluid Coolers

Pull Request Author

  • Title of PR should be user-synopsis style (clearly understandable in a standalone changelog context)
  • Label the PR with at least one of: Defect, Refactoring, NewFeature, Performance, and/or DoNoPublish
  • Pull requests that impact EnergyPlus code must also include unit tests to cover enhancement or defect repair
  • Author should provide a "walkthrough" of relevant code changes using a GitHub code review comment process
  • If any diffs are expected, author must demonstrate they are justified using plots and descriptions
  • If changes fix a defect, the fix should be demonstrated in plots and descriptions
  • If any defect files are updated to a more recent version, upload new versions here or on DevSupport
  • If IDD requires transition, transition source, rules, ExpandObjects, and IDFs must be updated, and add IDDChange label
  • If structural output changes, add to output rules file and add OutputChange label
  • If adding/removing any LaTeX docs or figures, update that document's CMakeLists file dependencies

Reviewer

  • Perform a Code Review on GitHub
  • If branch is behind develop, merge develop and build locally to check for side effects of the merge
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified
  • Check that performance is not impacted (CI Linux results include performance check)
  • Run Unit Test(s) locally
  • Check any new function arguments for performance impacts
  • Verify IDF naming conventions and styles, memos and notes and defaults
  • If new idf included, locally check the err file and other outputs

…:Merkel is not reported to Equipment Summary - Cooling Towers and Fluid Coolers

```
1001: [ RUN      ] EnergyPlusFixture.CondenserLoopTowers_VSMerkelCoolingTower_OutputReport
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5410: Failure
1001: Expected equality of these values:
1001:   "CoolingTower:VariableSpeed:Merkel"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCType, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5411: Failure
1001: Expected equality of these values:
1001:   "WATER"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCFluidType, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5412: Failure
1001: Expected equality of these values:
1001:   fmt::format("{:.2f}", expectedDesingRange)
1001:     Which is: "6.14"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCRange, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5413: Failure
1001: Expected equality of these values:
1001:   fmt::format("{:.2f}", expectedDesingApproach)
1001:     Which is: "4.56"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCApproach, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5415: Failure
1001: Expected equality of these values:
1001:   "4000.00"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesFanPwr, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5416: Failure
1001: Expected equality of these values:
1001:   fmt::format("{:.2f}", expectedDesignInletWB)
1001:     Which is: "25.70"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesInletAirWBT, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5418: Failure
1001: Expected equality of these values:
1001:   "0.020000"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesWaterFlowRate, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5419: Failure
1001: Expected equality of these values:
1001:   fmt::format("{:.2f}", expectedDesOutletWaterTemp)
1001:     Which is: "30.26"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCLevWaterSPTemp, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5421: Failure
1001: Expected equality of these values:
1001:   "COOLINGTOWER LOOP"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCCondLoopName, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5422: Failure
1001: Expected equality of these values:
1001:   "COOLINGTOWER SUPPLY EQUIPMENT BRANCH 1"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCCondLoopBranchName, TowerName)
1001:     Which is: "NOT FOUND"
1001: [  FAILED  ] EnergyPlusFixture.CondenserLoopTowers_VSMerkelCoolingTower_OutputReport (2392 ms)
```
@jmarrec jmarrec added Defect Includes code to repair a defect in EnergyPlus NotIDDChange Code does not impact IDD (can be merged after IO freeze) labels Feb 10, 2025
@jmarrec jmarrec self-assigned this Feb 10, 2025
@@ -4880,4 +4880,547 @@ TEST_F(EnergyPlusFixture, CondenserLoopTowers_VSCoolingTower_OutputReport)
OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCCondLoopBranchName, TowerName));
}

TEST_F(EnergyPlusFixture, CondenserLoopTowers_VSMerkelCoolingTower_OutputReport)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a unit test for #10902 showing that it CoolingTower:VariableSpeed:Merkel is not reported to Equipment Summary - Cooling Towers and Fluid Coolers

Comment on lines +5410 to +5423
EXPECT_EQ("CoolingTower:VariableSpeed:Merkel", OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCType, TowerName));
EXPECT_EQ("WATER", OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCFluidType, TowerName));
EXPECT_EQ(fmt::format("{:.2f}", expectedDesingRange), OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCRange, TowerName));
EXPECT_EQ(fmt::format("{:.2f}", expectedDesingApproach),
OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCApproach, TowerName));
EXPECT_EQ("4000.00", OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesFanPwr, TowerName));
EXPECT_EQ(fmt::format("{:.2f}", expectedDesignInletWB),
OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesInletAirWBT, TowerName));
EXPECT_EQ("0.020000", OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesWaterFlowRate, TowerName));
EXPECT_EQ(fmt::format("{:.2f}", expectedDesOutletWaterTemp),
OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCLevWaterSPTemp, TowerName));
EXPECT_EQ("COOLINGTOWER LOOP", OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCCondLoopName, TowerName));
EXPECT_EQ("COOLINGTOWER SUPPLY EQUIPMENT BRANCH 1",
OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCCondLoopBranchName, TowerName));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1001: [ RUN      ] EnergyPlusFixture.CondenserLoopTowers_VSMerkelCoolingTower_OutputReport
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5410: Failure
1001: Expected equality of these values:
1001:   "CoolingTower:VariableSpeed:Merkel"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCType, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5411: Failure
1001: Expected equality of these values:
1001:   "WATER"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCFluidType, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5412: Failure
1001: Expected equality of these values:
1001:   fmt::format("{:.2f}", expectedDesingRange)
1001:     Which is: "6.14"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCRange, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5413: Failure
1001: Expected equality of these values:
1001:   fmt::format("{:.2f}", expectedDesingApproach)
1001:     Which is: "4.56"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCApproach, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5415: Failure
1001: Expected equality of these values:
1001:   "4000.00"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesFanPwr, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5416: Failure
1001: Expected equality of these values:
1001:   fmt::format("{:.2f}", expectedDesignInletWB)
1001:     Which is: "25.70"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesInletAirWBT, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5418: Failure
1001: Expected equality of these values:
1001:   "0.020000"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCDesWaterFlowRate, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5419: Failure
1001: Expected equality of these values:
1001:   fmt::format("{:.2f}", expectedDesOutletWaterTemp)
1001:     Which is: "30.26"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCLevWaterSPTemp, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5421: Failure
1001: Expected equality of these values:
1001:   "COOLINGTOWER LOOP"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCCondLoopName, TowerName)
1001:     Which is: "NOT FOUND"
1001: /home/julien/Software/Others/EnergyPlus2/tst/EnergyPlus/unit/CondenserLoopTowers.unit.cc:5422: Failure
1001: Expected equality of these values:
1001:   "COOLINGTOWER SUPPLY EQUIPMENT BRANCH 1"
1001:   OutputReportPredefined::RetrievePreDefTableEntry(*state, orp.pdchCTFCCondLoopBranchName, TowerName)
1001:     Which is: "NOT FOUND"
1001: [  FAILED  ] EnergyPlusFixture.CondenserLoopTowers_VSMerkelCoolingTower_OutputReport (2392 ms)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

⚠️ Regressions detected on macos-14 for commit 60e5327

Regression Summary
  • Audit: 1

Copy link
Member

@Myoldmopar Myoldmopar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems fine here. My only wish is that we could have reused an existing implementation of this logic. I'm sure there are so many spots where this is written very similarly. But maybe it's different enough that reusing it would be a net loss. Anyway, it's fine as is.

@Myoldmopar
Copy link
Member

This does seem ready for final checks/merge, right @jmarrec ?

@jmarrec
Copy link
Contributor Author

jmarrec commented Feb 10, 2025

Yes

@Myoldmopar
Copy link
Member

Running great here with latest develop, good to go. Thanks @jmarrec

@Myoldmopar Myoldmopar merged commit 2121881 into develop Feb 13, 2025
9 checks passed
@Myoldmopar Myoldmopar deleted the 10902_CT_Merkel_EquipSummary branch February 13, 2025 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Defect Includes code to repair a defect in EnergyPlus NotIDDChange Code does not impact IDD (can be merged after IO freeze)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CoolingTower:VariableSpeed:Merkel not reporting to Equipment Summary - Cooling Towers and Fluid Coolers
3 participants