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

Update to v22.1.0-IOFreeze #4540

Merged
merged 34 commits into from Mar 23, 2022
Merged

Update to v22.1.0-IOFreeze #4540

merged 34 commits into from Mar 23, 2022

Conversation

joseph-robertson
Copy link
Collaborator

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

@joseph-robertson joseph-robertson added this to the OpenStudio SDK 3.4.0 milestone Feb 24, 2022
@joseph-robertson joseph-robertson added IDDChange Pull Request - Ready for CI This pull request if finalized and is ready for continuous integration verification prior to merge. labels Feb 24, 2022
@@ -2800,7 +2800,7 @@ namespace detail {
// in 8.1 this is 'EnergyPlus-Windows-32 8.1.0.008, YMD=2014.11.08 22:49'
// in 8.2 this is 'EnergyPlus, Version 8.2.0-8397c2e30b, YMD=2015.01.09 08:37'
// radiance script is writing 'EnergyPlus, VERSION 8.2, (OpenStudio) YMD=2015.1.9 08:35:36'
boost::regex version_regex("\\d\\.\\d[\\.\\d]*");
boost::regex version_regex("\\d{1,}\\.\\d[\\.\\d]*");
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@jmarrec Does this look right?

Copy link
Collaborator

@jmarrec jmarrec Mar 1, 2022

Choose a reason for hiding this comment

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

Ah yeah right, the version change... I suppose it will always be a two digits year at the start. The minor (and patch but that's covered) versions are unlikely to get into the two digits though, but I'm not sure.
Pinging @Myoldmopar here... Could you let us know a bit more about the new versionning scheme for E+?

Side note: this may be a good opportunity to change this to a raw string litteral to avoid escaping like crazy, like so, though that may be my preference only (it's hard to read in any case, given that the parenthesis here are not a capturing group...)

boost::regex version_regex(R"(\d{2}\.\d[\.\d]*)");

@Myoldmopar
Copy link
Member

Could you let us know a bit more about the new versionning scheme for E+?

It will be a two digit year for the major version and then a single digit minor version. I cannot fathom how we would get to a double digit minor version in a single year.

@joseph-robertson joseph-robertson self-assigned this Mar 7, 2022
Copy link
Collaborator

@jmarrec jmarrec left a comment

Choose a reason for hiding this comment

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

A surprisingly low amount of IDD changes (perhaps we got used to the major refactors like renaming fuel types and co in the last few versions), and no field inserted so no VT needed.

I saw you filed enhancement requests for the new objects, thanks for that.

I'm all good with this once the cmake adjustment for arm64 is done.

Thanks for the good work @joseph-robertson !

CMakeLists.txt Outdated Show resolved Hide resolved
@@ -6826,12 +6826,12 @@ namespace osversion {

} // end update_3_2_1_to_3_3_0

std::string VersionTranslator::update_3_3_0_to_3_3_1(const IdfFile& idf_3_3_0, const IddFileAndFactoryWrapper& idd_3_3_1) {
std::string VersionTranslator::update_3_3_0_to_3_4_0(const IdfFile& idf_3_3_0, const IddFileAndFactoryWrapper& idd_3_4_0) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok, no VT needed, all these fields were added at the end of the object (not inserted) and have a default, so no-op

@jmarrec jmarrec merged commit fca1790 into develop Mar 23, 2022
@jmarrec jmarrec deleted the v22.1.0-IOFreeze branch March 23, 2022 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Update to EnergyPlus 22.1.0
4 participants