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

Incorporating changes from master into nrcan_master_merge branch #1593

Merged
merged 60 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
f13d38c
added arg for using zone occupancy and rearrange existing arg
carlosduarteroa Aug 11, 2023
04022e2
use zone occupancy objs use for radiant control
carlosduarteroa Aug 12, 2023
e7f40aa
fixed bugs with naming EMS programs
carlosduarteroa Aug 14, 2023
f9f7842
reference specific zone occupancy in EMS programs if selected for con…
carlosduarteroa Aug 14, 2023
4d98523
remove extra occupancy schedules/rulesets that are not needed
carlosduarteroa Aug 14, 2023
dfc1c26
added errors to users for zone occupancy control
carlosduarteroa Aug 14, 2023
99a08b9
add Carlos to gemspec author list
mdahlhausen Aug 15, 2023
409d1f3
Merge branch 'master' into feature/radiant_controls_zone_occupancy
mdahlhausen Aug 16, 2023
ba2dd5b
Merge branch 'master' into feature/radiant_controls_zone_occupancy
mdahlhausen Aug 24, 2023
9080899
add methods to testing helper
mdahlhausen Aug 24, 2023
ed8b339
remove Siz.AirLoopHVAC.rb
mdahlhausen Aug 25, 2023
5ba9c05
remove Siz.CoilCoolingWater.rb
mdahlhausen Aug 25, 2023
3710796
remove sizing methods in Siz.ThermalZone.rb
mdahlhausen Aug 25, 2023
e38bfc3
remove Siz.HVACComponent.rb
mdahlhausen Aug 25, 2023
1f9c89d
remove Siz.HeatingCoolingFuels.rb and Siz.ThermalZone.rb
mdahlhausen Aug 25, 2023
27e38db
remove overloaded prm method plant_loop_total_cooling_capacity
mdahlhausen Aug 25, 2023
8b99e87
calculate fan power
mdahlhausen Aug 25, 2023
89be23d
remove getAutosizedValueFromEquipmentSummary
mdahlhausen Aug 25, 2023
e8ec7ec
remove output_fan_report
mdahlhausen Aug 25, 2023
6d0c652
Delete Siz.Model.rb
mdahlhausen Aug 25, 2023
a2b247b
remove require to Siz.Model
mdahlhausen Aug 28, 2023
c0d0304
remove prm air_loop_hvac_multizone_vav_optimization_required?
mdahlhausen Aug 28, 2023
fa415a6
remove prm air_loop_hvac_set_vsd_curve_type
mdahlhausen Aug 28, 2023
f14ee79
remove 90.1-2019 prm model_baseline_system_vav_fan_type
mdahlhausen Aug 28, 2023
6b8460e
remove model_prm_baseline_system_group_minimum_area method
mdahlhausen Aug 28, 2023
d2fa12e
remove duplicated model_prm_baseline_system_change_fuel_type
mdahlhausen Aug 28, 2023
1c54b8e
grammar fix
mdahlhausen Aug 28, 2023
ccb3692
remove prm boiler_hot_water_find_search_criteria
mdahlhausen Aug 28, 2023
c431a4d
remove coil_heating_gas_find_capacity
mdahlhausen Aug 28, 2023
b0fb278
remove boiler_hot_water_standard_minimum_thermal_efficiency
mdahlhausen Aug 28, 2023
b95fc18
remove duplicate model_prm_baseline_system_number
mdahlhausen Aug 28, 2023
091c8b5
remove prm cooling_tower_apply_minimum_power_per_flow
mdahlhausen Aug 28, 2023
e5f78d6
remove prm chiller_electric_eir_standard_minimum_full_load_efficiency
mdahlhausen Aug 28, 2023
0293dc8
remove prm chiller_electric_eir_find_search_criteria
mdahlhausen Aug 28, 2023
81c4e59
remove prm model_apply_constructions
mdahlhausen Aug 28, 2023
927274f
fix OptionalDouble error
mdahlhausen Aug 28, 2023
54dd618
implmented a schedule with occupied hours to determine when to calcul…
carlosduarteroa Aug 29, 2023
b471c4a
added occupancy arguments into method to create low temp radiant
carlosduarteroa Aug 29, 2023
e0158df
remove prm CoolingTower file requires
mdahlhausen Aug 29, 2023
2ad720d
get value of FuelType Enums
mdahlhausen Aug 29, 2023
f7d9499
refactor design load to be w not w_per_m2
mdahlhausen Aug 29, 2023
0fd35ed
add radiant occupancy tests
mdahlhausen Aug 29, 2023
5e6293f
Merge pull request #1571 from NREL/feature/radiant_controls_zone_occu…
mdahlhausen Aug 29, 2023
4fb660b
Revert "remove prm model_apply_constructions"
mdahlhausen Aug 29, 2023
2a331e9
Merge pull request #1566 from NREL/nrcan_master_merge
mdahlhausen Aug 30, 2023
ac51ed0
check for OptionalDouble
mdahlhausen Aug 30, 2023
7d20c94
fix .get typo for double
mdahlhausen Aug 31, 2023
e79863a
Update Standards.ThermalZone.rb
mdahlhausen Aug 31, 2023
b5e222b
Large Office cooling tower regression update
mdahlhausen Aug 31, 2023
b1aa834
Revert "remove prm air_loop_hvac_set_vsd_curve_type"
mdahlhausen Aug 31, 2023
9cc75f2
update regression and performance results
mdahlhausen Aug 31, 2023
f65b785
update data file
weilixu Sep 1, 2023
3c6b9c1
remove extra argument
mdahlhausen Sep 1, 2023
ab4faaa
Merge pull request #1583 from NREL/remove_duplicate_prm_methods
mdahlhausen Sep 1, 2023
9aa6c6b
Merge branch 'master' into remove_sizing_methods
mdahlhausen Sep 2, 2023
a7bd20d
fix app g method call typos
mdahlhausen Sep 2, 2023
4c124da
Update test_performance_expected_dd_results.csv
mdahlhausen Sep 2, 2023
40e49f4
check app G fuel type against array
mdahlhausen Sep 2, 2023
97840e9
update test failures
mdahlhausen Sep 7, 2023
4d4da95
Merge pull request #1582 from NREL/remove_sizing_methods
mdahlhausen Sep 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions data/standards/test_performance_expected_dd_results.csv

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions lib/openstudio-standards.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
module OpenstudioStandards
require 'json' # Used to load standards JSON files

# HVAC sizing
require_relative 'openstudio-standards/hvac_sizing/Siz.Model'

# Weather data
require_relative 'openstudio-standards/weather/Weather.Model'

Expand Down Expand Up @@ -282,8 +279,6 @@ module OpenstudioStandards
require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.CoilHeatingGas"
require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.BoilerHotWater"
require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.ChillerElectricEIR"
require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.CoolingTower"
require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.CoolingTowerVariableSpeed"
require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.HeatExchangerSensLat"
require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.PlanarSurface"
require_relative "#{stds}/ashrae_90_1_prm/ashrae_90_1_prm.ThermalZone"
Expand Down
59 changes: 0 additions & 59 deletions lib/openstudio-standards/hvac_sizing/Siz.AirLoopHVAC.rb

This file was deleted.

13 changes: 0 additions & 13 deletions lib/openstudio-standards/hvac_sizing/Siz.CoilCoolingWater.rb

This file was deleted.

36 changes: 0 additions & 36 deletions lib/openstudio-standards/hvac_sizing/Siz.HVACComponent.rb

This file was deleted.

Loading