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

Refactor Weather module #1650

Merged
merged 59 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
fe46765
add epw class
eringold Dec 21, 2023
59a46de
add StatFile class
eringold Dec 21, 2023
2706dfb
extend and refactor StatFile
eringold Dec 21, 2023
752540f
harmonize Epw.to_json
eringold Dec 21, 2023
feb7f5a
Harmonize StatFile.load
eringold Dec 21, 2023
1f7cd1c
add get epw path and representative cz weather file to information
eringold Dec 21, 2023
a6a1a2f
refactor and replicate changebuildinglocation in Weather.modify
eringold Dec 21, 2023
c8e4431
initial replace model_get_weather_file
eringold Dec 21, 2023
d37ec2f
test stat
eringold Dec 22, 2023
f9501fd
misc weather module corrections
eringold Dec 26, 2023
1953c67
test weather information
eringold Dec 26, 2023
25cd12a
test weather modify
eringold Dec 26, 2023
a107442
clean up test
eringold Dec 26, 2023
b6df36c
Merge remote-tracking branch 'origin/master' into refactor/weather_mo…
eringold Jan 2, 2024
3d4b7af
yard and rubocop fixes
eringold Jan 2, 2024
1763454
correct weather file path call
eringold Jan 4, 2024
6592121
Merge branch 'master' of https://github.com/NREL/openstudio-standards…
eringold Jan 16, 2024
33f9102
Merge branch 'master' of https://github.com/NREL/openstudio-standards…
eringold Jan 17, 2024
fa62912
Merge branch 'master' into refactor/weather_module
eringold Jan 17, 2024
338f4c7
Merge branch 'refactor/weather_module' of https://github.com/NREL/ope…
eringold Jan 17, 2024
8006491
delete Weather.stat_file.rb
mdahlhausen Jan 18, 2024
e0572db
remove redundant methods from Weather.Model.rb
mdahlhausen Jan 18, 2024
f067729
weather method replacements
mdahlhausen Jan 18, 2024
6a54fd6
Merge branch 'master' into refactor/weather_module
mdahlhausen Jan 18, 2024
dfb06d5
replace EnergyPlus::StateFile.new
mdahlhausen Jan 18, 2024
6d956f9
add set undisturbed ground temperature methods
mdahlhausen Jan 19, 2024
d7bab9b
rubocop edits
mdahlhausen Jan 19, 2024
d68fe17
extend weather module methods
mdahlhausen Jan 19, 2024
cf84aa8
delete California weather files
mdahlhausen Jan 19, 2024
888e469
weather module yard doc edits
mdahlhausen Jan 19, 2024
241d8e6
Change stat_file logs to warn instead of error
mdahlhausen Jan 21, 2024
50967e7
replace model_add_ground_temperatures
mdahlhausen Jan 22, 2024
0fa3814
Merge branch 'refactor/weather_module' of https://github.com/NREL/ope…
eringold Jan 22, 2024
74ca35f
weather modify changes, design day defaults
mdahlhausen Jan 22, 2024
1b5311a
split and add weather tests
mdahlhausen Jan 22, 2024
7db5211
replace model_add_design_days_and_weather_file
mdahlhausen Jan 22, 2024
0405af9
remove remaining instances of model_add_design_days_and_weather_file
mdahlhausen Jan 22, 2024
7493411
refactor weather method calls in necb tests
mdahlhausen Jan 22, 2024
6f967ff
update regression tests
mdahlhausen Jan 23, 2024
6422c1e
remove Weather.Model.rb
mdahlhausen Jan 23, 2024
b0f8523
update nil ddy_list test result
eringold Jan 23, 2024
12935ac
calculate design day average global irradiance
mdahlhausen Jan 23, 2024
a433fcd
improve ddy regex lookup
eringold Jan 23, 2024
2d29716
update all heating+cooling ddy test
eringold Jan 23, 2024
dbb4d36
remove Weather.Model.rb
mdahlhausen Jan 24, 2024
3905cf9
fix to hdd lookup
mdahlhausen Jan 24, 2024
11b745b
add annual cooling wetbulb design day to necb regression models
mdahlhausen Jan 24, 2024
e994cc3
Merge branch 'refactor/weather_module' of https://github.com/NREL/ope…
eringold Jan 24, 2024
374d26e
ddy docstrings
eringold Jan 24, 2024
7cfcbf6
fix undefined error
mdahlhausen Jan 24, 2024
3b89ed2
update performance results
mdahlhausen Jan 25, 2024
1f612c4
Fixing typo when using weather_file_path in btap_data.rb.
ckirney Jan 26, 2024
96b1ebb
fix additional typos
mdahlhausen Jan 26, 2024
47012b8
update module weather tests
mdahlhausen Jan 27, 2024
70a51d8
update NECB building regression tests
mdahlhausen Jan 27, 2024
22e971a
update DOE regression models
mdahlhausen Jan 27, 2024
7989168
Merge branch 'master' into refactor/weather_module
mdahlhausen Feb 5, 2024
c818dc1
update warehouse regression models
mdahlhausen Feb 5, 2024
57a4290
fix param name missing for yard doc
mdahlhausen Feb 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .yardopts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
--exclude lib/openstudio-standards/prototypes/common/buildings/Prototype.*.rb
--exclude lib/openstudio-standards/utilities/convert_costing_constructions.rb
--exclude lib/openstudio-standards/prototypes/common/do_not_edit_metaclasses.rb
--exclude lib/openstudio-standards/weather/Weather.Model.rb
--exclude lib/openstudio-standards/weather/Weather.stat_file.rb
--exclude lib/openstudio-standards/utilities/sched_create.rb
--exclude lib/openstudio-standards/utilities/os_sim_extract.rb
--exclude lib/openstudio-standards/utilities/hash.rb
Expand Down
2 changes: 0 additions & 2 deletions data/standards/manage_OpenStudio_Standards.rb
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ def unique_properties(sheet_name)
['template', 'climate_ID']
when 'motors'
['template', 'number_of_poles', 'type', 'synchronous_speed', 'minimum_capacity', 'maximum_capacity']
when 'ground_temperatures'
['building_type', 'template', 'climate_zone']
when 'hvac_inference'
['template', 'size_category', 'heating_source', 'cooling_source', 'delivery_type']
when 'size_category'
Expand Down
15 changes: 0 additions & 15 deletions data/standards/metadata_units_OpenStudio_Standards-ashrae_90_1.csv
Original file line number Diff line number Diff line change
Expand Up @@ -598,21 +598,6 @@ motors,minimum_capacity,HP
motors,maximum_capacity,HP
motors,nominal_full_load_efficiency,%
motors,notes,
ground_temperatures,building_type,
ground_temperatures,template,
ground_temperatures,climate_zone,
ground_temperatures,jan,
ground_temperatures,feb,
ground_temperatures,mar,
ground_temperatures,apr,
ground_temperatures,may,
ground_temperatures,jun,
ground_temperatures,jul,
ground_temperatures,aug,
ground_temperatures,sep,
ground_temperatures,oct,
ground_temperatures,nov,
ground_temperatures,dec,
hvac_inference,template,
hvac_inference,size_category,
hvac_inference,heating_source,
Expand Down
2,105 changes: 91 additions & 2,014 deletions data/standards/test_performance_expected_dd_results.csv

Large diffs are not rendered by default.

251 changes: 0 additions & 251 deletions data/weather/ALTURAS_725958_CZ2010.ddy

This file was deleted.

Loading