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

Appendix g merge master 0306 #1705

Merged
merged 97 commits into from
Mar 25, 2024
Merged

Conversation

weilixu
Copy link
Collaborator

@weilixu weilixu commented Mar 7, 2024

Pull request overview

Merge geo module refactor into Appx G dev

  • 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

eringold and others added 30 commits December 28, 2023 15:53
- add tests for new methods
- switch tests to ASHRAESecondarySchool
- change space_get_exterior_wall_and_subsurface_area and  space_get_exterior_wall_and_subsurface_and_roof_area default to false
- use Standard.build for now to access space_plenum? and space_conditioning_category methods
- change naming of Foundation F constructions; this will cause regression failures. regenerate names once it's determined that the F construction name changes are the only changes in the model
spaces_get_occupancy_scheudule initial move
- deleted btap/geometry method assign_spaces_to_thermal_zone because it is unused
- deleted btap/geometry method enumerate_model because it is unused
- deleted btap/geometry method create_thermal_zone because it is unused
- btap/geometry method getStoryAboveGround-> model_get_building_stories_above_ground
- btap/geometry method getStoryBelowGround -> model_get_building_stories_below_ground
- btap/geometry method get_zones_from_storey -> building_story_get_thermal_zones
- btap/geometry method getStoryForNominalZCoordinate -> model_get_building_story_for_nominal_height
- model_get_story_for_nominal_z_coordinate -> model_get_building_story_for_nominal_height
- building_story_get_minimum_z_value -> building_story_get_minimum_height
- added tests
changed f-factor names
getBuildingStorys[0] returns the stories in a different order depending on operating system; fix it to Building Story 1
model_get_perimeter_length -> model_get_perimeter
- remove surfaces_lower_z_values, because this method lowers all vertices to target z value, which collapses vertical surfaces to lines. Need a different implementation. Only used in one AEDG measure for partitions.
- move model_set_building_north_axis
- move model_assign_spaces_to_building_stories
- delete model_assign_building_story
- create group.rb for three methods:
  - model_group_zones_by_building_type -> model_group_thermal_zones_by_building_type
  - model_group_zones_by_type -> model_group_thermal_zones_by_occupancy_type
  - model_group_zones_by_story -> model_group_thermal_zones_by_building_story
model_num_stories_spanned -> thermal_zones_get_number_of_stories_spanned
- surface_get_door_ratio -> surface_get_window_to_wall_ratio
- surface_get_wwr -> surface_get_door_to_wall_ratio
- surface_absolute_azimuth -> surface_get_absolute_azimuth
- surface_cardinal_direction -> surface_get_cardinal_direction
- delete model_get_window_area_info_for_orientation; use model_get_exterior_window_to_wall_ratio instead
- delete model_get_window_area_info_for_orientation; use model_get_exterior_window_and_wall_area_by_orientation instead
lymereJ and others added 22 commits March 6, 2024 14:24
add new DistrictHeatingWater and DistrictHeatingSteam fuel type columns, copying values from DistrictHeating
Move and test parametric schedule methods
Address test failures on master
@weilixu
Copy link
Collaborator Author

weilixu commented Mar 19, 2024

CI shows everything passed but result is still failed:
=|
Some tests failed the first time. This may have been due to computer performance issues. Rerunning failed tests...

Progress :: |�[32mPASSED: test_LargeOffice-90.1-2016-ASHRAE_169-2013-2A IN FILE test/doe_prototype/test_large_office.rb�[0m
==================================================================|
test_all PASS (41473.78s)

Rerun to make sure things are fine.

@weilixu weilixu marked this pull request as ready for review March 25, 2024 15:48
@weilixu
Copy link
Collaborator Author

weilixu commented Mar 25, 2024

NECBs are failing but that is expected.

@weilixu weilixu merged commit 87a2b47 into AppendixG_Dev Mar 25, 2024
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants