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 #5314 - Add Tank Element Control Logic field to WaterHeaterHeatPump #5321

Merged
merged 6 commits into from
Dec 23, 2024

Conversation

jmarrec
Copy link
Collaborator

@jmarrec jmarrec commented Dec 18, 2024

Pull request overview

Pull Request Author

  • Model API Changes / Additions
  • Any new or modified fields have been implemented in the EnergyPlus ForwardTranslator (and ReverseTranslator as appropriate)
  • Model API methods are tested (in src/model/test)
  • EnergyPlus ForwardTranslator Tests (in src/energyplus/Test)
  • If a new object or method, added a test in NREL/OpenStudio-resources: Add Link
  • If needed, added VersionTranslation rules for the objects (src/osversion/VersionTranslator.cpp)
  • Verified that C# bindings built fine on Windows, partial classes used as needed, etc.
  • All new and existing tests passes
  • If methods have been deprecated, update rest of code to use the new methods

Labels:

  • If change to an IDD file, add the label IDDChange
  • If breaking existing API, add the label APIChange
  • If deemed ready, add label Pull Request - Ready for CI so that CI builds your PR

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • Code Style, strip trailing whitespace, etc.
  • All related changes have been implemented: model changes, model tests, FT changes, FT tests, VersionTranslation, OS App
  • Labeling is ok
  • 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

@jmarrec jmarrec added component - Model component - IDF Translation component - Version Translator Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. IDDChange labels Dec 18, 2024
@jmarrec jmarrec self-assigned this Dec 18, 2024
@jmarrec
Copy link
Collaborator Author

jmarrec commented Dec 18, 2024

clang-format is tripping.

diff --git a/src/gltf/GltfMaterialData.hpp b/src/gltf/GltfMaterialData.hpp
index 531ad5aea7..675ad6783c 100644
--- a/src/gltf/GltfMaterialData.hpp
+++ b/src/gltf/GltfMaterialData.hpp
@@ -36,7 +36,7 @@ namespace gltf {
 
     /** Standard constructor */
     constexpr GltfMaterialData(std::string_view materialName, int r, int g, int b, double a, bool isDoubleSided = false)
-      : m_materialName(materialName), m_r(r), m_g(g), m_b(b), m_a(a), m_isDoubleSided(isDoubleSided) {};
+      : m_materialName(materialName), m_r(r), m_g(g), m_b(b), m_a(a), m_isDoubleSided(isDoubleSided){};
 
     static std::vector<GltfMaterialData> buildMaterials(const model::Model& model);
     //@}

: m_materialName(materialName), m_r(r), m_g(g), m_b(b), m_a(a), m_isDoubleSided(isDoubleSided){};

@jmarrec
Copy link
Collaborator Author

jmarrec commented Dec 18, 2024

And once again, we get an issue where an older VT test is now failing due to new VT rules... pfff. At some point we really should fix it by stopping VT at the target version

@jmarrec jmarrec force-pushed the 5314_HPWH_TankElementControlLogic branch from b01d323 to 5ff2efd Compare December 18, 2024 15:56
@jmarrec jmarrec force-pushed the 5314_HPWH_TankElementControlLogic branch from 5ff2efd to d42f008 Compare December 19, 2024 10:12
@jmarrec jmarrec force-pushed the 5314_HPWH_TankElementControlLogic branch from d42f008 to 2e37401 Compare December 23, 2024 13:48
@jmarrec
Copy link
Collaborator Author

jmarrec commented Dec 23, 2024

K, tests are clean on the ubuntus, and this is simple enough. I'm going to merge it, because we're piling PRs, and especially PRs with IDD changes, and with CI that's unreliable it's annoying

@jmarrec jmarrec merged commit 6f293ed into develop Dec 23, 2024
4 of 6 checks passed
@jmarrec jmarrec deleted the 5314_HPWH_TankElementControlLogic branch December 23, 2024 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component - IDF Translation component - Model component - Version Translator IDDChange Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WaterHeater:HeatPump Field !- Tank Element Control Logic is not exposed
2 participants