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

Appx g/merge master 09192023 #1610

Merged
merged 70 commits into from
Sep 22, 2023
Merged

Conversation

weilixu
Copy link
Collaborator

@weilixu weilixu commented Sep 19, 2023

Pull request overview

Merge master to Appendix_G to resolve conflicts.

  • Fixes #ISSUENUMBERHERE (IF THIS IS A DEFECT)

Pull Request Author

  • Method changes or additions
  • Data changes or additions
  • Added tests for added methods
  • If methods have been deprecated, update rest of code to use the new methods
  • Documented new methods using yard syntax
  • Resolved yard documentation errors for new code (ran bundle exec rake doc)
  • Resolved rubocop syntax errors for new code (ran bundle exec rake rubocop)
  • All new and existing tests passes
  • If the code adds new require statements, ensure these are in core ruby or add to the gemspec

Review Checklist

This will not be exhaustively relevant to every PR.

  • Perform a code review on GitHub
  • All related changes have been implemented: method additions, changes, tests
  • Check rubocop errors
  • Check yard doc errors
  • If fixing a defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If a new feature, test the new feature and try creative ways to break it
  • CI status: all green or justified

mdahlhausen and others added 30 commits August 25, 2023 10:11
remove Siz.AirLoopHVAC.rb and associated methods. These methods are now available in OpenStudio as of OpenStudio version 3.6.0.
remove Siz.CoilCoolingWater.rb and associated methods. These methods are now available in OpenStudio as of OpenStudio version 3.6.0.
remove Siz.HVACComponent.rb and associated methods. Only water heaters were using the feature. May consider generalizing if other components need it in the future.
remove Siz.HeatingCoolingFuels.rb and Siz.ThermalZone.rb and refactor associated methods. These methods are now available in OpenStudio as of OpenStudio version 3.6.0, under coolingFuelTypes, heatingFuelTypes, and appGHeatingFuelTypes
plant_loop_total_cooling_capacity is overloaded in the prm code and doesn't need to be
calculate fan power from existing field rather than relying on an sql file lookup
remove getAutosizedValueFromEquipmentSummary method from Siz.Model.rb
remove output fan report, which was only used for manually checking the older prm method
delete Siz.Model.rb and hvac_sizing directory
The original heatingDesignLoad and coolingDesignLoad method sin openstudio-standards were poorly named. They returned load density in w_per_m2 instead of w. Adjust the code to account for the w return from the new OpenStudio methods.
mdahlhausen and others added 19 commits September 12, 2023 19:43
Apply Black to Python scripts
- remove references to runner and Os_Lib_HelperMethods
- add tests
…swt_redo

Support to control supply water temperature based on outdoor air or zone demand for radiant system
…into appx_g/merge_master_09192023

# Conflicts:
#	lib/openstudio-standards/standards/Standards.Model.rb
#	lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.AirLoopHVAC.rb
#	lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.AirTerminalSingleDuctVAVReheat.rb
#	lib/openstudio-standards/standards/ashrae_90_1_prm/ashrae_90_1_prm.Model.rb
@weilixu weilixu added the AppendixG Methods to enable the Appendix G model workflow label Sep 19, 2023
@weilixu weilixu self-assigned this Sep 19, 2023
@weilixu weilixu merged commit e06088d into AppendixG_Dev Sep 22, 2023
@weilixu weilixu mentioned this pull request Sep 22, 2023
16 tasks
@weilixu weilixu deleted the appx_g/merge_master_09192023 branch February 11, 2024 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AppendixG Methods to enable the Appendix G model workflow
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants