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.

Sign up for GitHub

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

Airloop naming convention change. #1856

Open
wants to merge 53 commits into
base: nrcan
Choose a base branch
from
+19,990 −17,425
Open

Airloop naming convention change. #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
661f55e
Fixed naming conventions for necb systems
Sep 6, 2024
506672b
updated airloop in method calls
Sep 9, 2024
f22006a
script to add system types
Sep 18, 2024
92e2703
updated syntax to support chillers
Sep 20, 2024
cb70b9e
system 6 fan_type does nothing. Setting to var_speed_drive only for now
Sep 20, 2024
92b4238
updated reference system namer
Sep 24, 2024
52cb7a6
Update HVAC system naming conventions for NECB2011
Sep 26, 2024
ef9b1d8
Merge pull request #1833 from NREL/nrcan
ckirney Oct 21, 2024
cde8482
Merge pull request #1850 from NREL/nrcan
ckirney Nov 13, 2024
de0ea01
Merge remote-tracking branch 'origin/nrcan_oee_dev' into nrcan_434
Nov 15, 2024
bbfd552
Merge pull request #1851 from NREL/nrcan
ckirney Nov 15, 2024
0c1d447
modifications to allow consistent naming of systems.
Nov 21, 2024
40609a4
Update .gitignore and refactor weather file download tests
Nov 22, 2024
78d246c
Merge remote-tracking branch 'origin/nrcan' into nrcan_oee_dev
Nov 25, 2024
04f412d
Merge remote-tracking branch 'origin/nrcan_oee_dev' into nrcan_434
Nov 25, 2024
b631f2b
updated regression test files.
Nov 26, 2024
58ed59a
update that include removing NECB2011 from autozone.rb code.
Dec 3, 2024
7d629e0
added new fields to datapoint.rb
Dec 3, 2024
9cf5323
Revised NECB version in create_hvac_by_name method
srgilani Dec 6, 2024
401cc5e
Revised NECB version in create_hvac_by_name method
srgilani Dec 7, 2024
b80a994
Merge pull request #1858 from NREL/nrcan_434
ckirney Dec 9, 2024
371b81b
Modified add_sys6_multi_zone_built_up_system_with_baseboard_heating m…
srgilani Dec 9, 2024
9a8d8e9
Updated expected results of regression tests for LargeOffice and Medi…
srgilani Dec 10, 2024
e5e8216
Including some minor fixes and significant revisions to code checking
ckirney Dec 10, 2024
3438fcc
Merge pull request #1862 from NREL/nrcan_434_sg
ckirney Dec 10, 2024
1eca421
Tweak a comment in test_dcv.rb just for the sake of re-running all te…
srgilani Dec 11, 2024
345d8ec
Inculding more changes to support code which determines if a hot water
ckirney Dec 11, 2024
ff837bf
Merge pull request #1863 from NREL/nrcan_434
ckirney Dec 11, 2024
e1e22ae
Including code to adjust system fuel types
ckirney Dec 13, 2024
acb5859
Removing HVAC system 5 which appears to be cooling only. Keeping the…
ckirney Dec 16, 2024
e2a5b9f
Merge pull request #1867 from NREL/nrcan_434hw
ckirney Dec 18, 2024
c9e6adf
Fixing type in boiler_fueltype parameter in noair baseboard ECM.
ckirney Dec 18, 2024
1ba4133
Merge branch 'nrcan_434' into nrcan_434hw
ckirney Dec 18, 2024
be329d5
Merge pull request #1868 from NREL/nrcan_434hw
ckirney Dec 18, 2024
32e791f
Including code which adds washrooms, corridors, storage spaces and dw…
ckirney Dec 19, 2024
c832b6e
Removing commas from btap_cli run_options test run_options.yml.
ckirney Dec 19, 2024
98bd9cd
Small syntax error and variable name error fixes in autozone.rb.
ckirney Dec 19, 2024
61887a5
Removing washrooms and locker rooms from method that finds wildcard s…
ckirney Dec 19, 2024
44f72e3
Ensuring that if washrooms, dwelling units, storage areas, and coorid…
ckirney Dec 20, 2024
fb4c2e9
Renaming systems_including_sys5.json table to distinguish it from the…
ckirney Dec 20, 2024
eebfa38
Ensure HW loops added to FPFC systems.
ckirney Dec 30, 2024
fed094e
Ensuring boiler created for FPFC systems in systems_including_sys5.json
ckirney Dec 30, 2024
7fddede
Ensure that undefined spaces are not inculded when assigning user def…
ckirney Dec 30, 2024
a8b9dff
Ensuring that HW loops are created if needed when custom system types…
ckirney Dec 31, 2024
57e5db2
Including sys2 heating coil type in primary heating fuel setting and
ckirney Dec 31, 2024
852dbfb
When setting standards performance, ensuring that the performance of a
ckirney Jan 2, 2025
9567ef1
Setting system type for wet, wild, and storage spaces as 4 when
ckirney Jan 6, 2025
b1230cc
Removing innapropriate .empty? on if an integer is returned.
ckirney Jan 6, 2025
bfd9955
Autosizing cooling tower fan power when below 500 W to avoid E+ failure.
ckirney Jan 7, 2025
530fdcb
Adding code to ensure fuel types sets are set to those defined by the…
ckirney Jan 9, 2025
d38f854
Merge pull request #1873 from NREL/nrcan_434chw
ckirney Jan 9, 2025
962b02e
Merge pull request #1877 from NREL/nrcan
ckirney Jan 20, 2025
1afcaf0
Merge pull request #1879 from NREL/nrcan
ckirney Jan 21, 2025
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
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"ms-python.python",
"janisdd.vscode-edit-csv",
"qwtel.sqlite-viewer",
"moshfeu.compare-folders"
"moshfeu.compare-folders",
"GitHub.copilot-chat"
]
}
},
Expand Down
1 change: 1 addition & 0 deletions lib/openstudio-standards.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ module OpenstudioStandards
require_relative "#{stds}/necb/NECB2011/hvac_system_3_and_8_multi_speed"
require_relative "#{stds}/necb/NECB2011/hvac_system_4"
require_relative "#{stds}/necb/NECB2011/hvac_system_6"
require_relative "#{stds}/necb/NECB2011/hvac_namer"
require_relative "#{stds}/necb/NECB2011/service_water_heating"
require_relative "#{stds}/necb/NECB2011/electrical_power_systems_and_motors"
require_relative "#{stds}/necb/NECB2011/beps_compliance_path"
Expand Down
2 changes: 1 addition & 1 deletion lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_3_and_8_single_speed.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def add_sys3and8_single_zone_packaged_rooftop_unit_with_baseboard_heating_single
sys_name_pars['zone_htg'] = baseboard_type
sys_name_pars['zone_clg'] = 'none'
sys_name_pars['sys_rf'] = 'none'
assign_base_sys_name(air_loop,
assign_base_sys_name(air_loop: air_loop,
sys_abbr: 'sys_3',
sys_oa: 'mixed',
sys_name_pars: sys_name_pars)
Expand Down
2 changes: 1 addition & 1 deletion lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_4.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def add_sys4_single_zone_make_up_air_unit_with_baseboard_heating(model:,
sys_name_pars['zone_htg'] = baseboard_type
sys_name_pars['zone_clg'] = 'none'
sys_name_pars['sys_rf'] = 'none'
assign_base_sys_name(air_loop,
assign_base_sys_name(air_loop: air_loop,
sys_abbr: 'sys_4',
sys_oa: 'mixed',
sys_name_pars: sys_name_pars)
Expand Down
2 changes: 1 addition & 1 deletion lib/openstudio-standards/standards/necb/BTAPPRE1980/hvac_system_6.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def add_sys6_multi_zone_built_up_system_with_baseboard_heating(model:,
sys_name_pars['zone_htg'] = baseboard_type
sys_name_pars['zone_clg'] = 'none'
sys_name_pars['sys_rf'] = 'vv'
assign_base_sys_name(air_loop,
assign_base_sys_name(air_loop: air_loop,
sys_abbr: 'sys_6',
sys_oa: 'mixed',
sys_name_pars: sys_name_pars)
Expand Down
15 changes: 9 additions & 6 deletions lib/openstudio-standards/standards/necb/ECMS/hvac_systems.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,10 @@ def add_air_system(model:,
sys_name_pars['sys_rf'] = 'none'
sys_name_pars['sys_rf'] = 'cv' if sys_ret_fan_type == 'constant_volume'
sys_name_pars['sys_rf'] = 'vv' if sys_ret_fan_type == 'variable_volume'
assign_base_sys_name(airloop, sys_abbr: sys_abbr, sys_oa: sys_vent_type, sys_name_pars: sys_name_pars)
assign_base_sys_name( air_loop: airloop,
sys_abbr: sys_abbr,
sys_oa: sys_vent_type,
sys_name_pars: sys_name_pars)
return airloop, clg_eqpt, htg_eqpt, return_fan
end

Expand Down Expand Up @@ -3768,11 +3771,11 @@ def add_ecm_remove_airloops_add_zone_baseboards(model:,

# Create the hot water loop if necessary.
hw_loop = standard.create_hw_loop_if_required(
baseboard_type,
boiler_fueltype,
backup_boiler_fueltype,
mau_heating_coil_type,
model
baseboard_type: baseboard_type,
boiler_fueltype: boiler_fueltype,
backup_boiler_fueltype: backup_boiler_fueltype,
mau_heating_coil_type: mau_heating_coil_type,
model: model
)

# Add baseboard heaters to each heated zone.
Expand Down
765 changes: 564 additions & 201 deletions lib/openstudio-standards/standards/necb/NECB2011/autozone.rb
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions lib/openstudio-standards/standards/necb/NECB2011/data/fuel_type_sets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"mau_heating_coil_type": "Hot Water",
"mau_cooling_type": "DX",
"chiller_type": "",
"heating_coil_type_sys2": "Gas",
"heating_coil_type_sys3": "Gas",
"heating_coil_type_sys4": "Gas",
"heating_coil_type_sys6": "Hot Water",
Expand All @@ -35,6 +36,7 @@
"mau_heating_coil_type": "DX",
"mau_cooling_type": "DX",
"chiller_type": "",
"heating_coil_type_sys2": "DX",
"heating_coil_type_sys3": "DX",
"heating_coil_type_sys4": "DX",
"heating_coil_type_sys6": "DX",
Expand All @@ -52,6 +54,7 @@
"mau_heating_coil_type": "DX",
"mau_cooling_type": "DX",
"chiller_type": "",
"heating_coil_type_sys2": "DX",
"heating_coil_type_sys3": "DX",
"heating_coil_type_sys4": "DX",
"heating_coil_type_sys6": "DX",
Expand All @@ -69,6 +72,7 @@
"mau_heating_coil_type": "Electric",
"mau_cooling_type": "DX",
"chiller_type": "",
"heating_coil_type_sys2": "Electric",
"heating_coil_type_sys3": "Electric",
"heating_coil_type_sys4": "Electric",
"heating_coil_type_sys6": "Electric",
Expand All @@ -87,6 +91,7 @@
"mau_heating_coil_type": "DX",
"mau_cooling_type": "DX",
"chiller_type": "",
"heating_coil_type_sys2": "DX",
"heating_coil_type_sys3": "DX",
"heating_coil_type_sys4": "DX",
"heating_coil_type_sys6": "DX",
Expand All @@ -104,6 +109,7 @@
"mau_heating_coil_type": "DX",
"mau_cooling_type": "DX",
"chiller_type": "",
"heating_coil_type_sys2": "DX",
"heating_coil_type_sys3": "DX",
"heating_coil_type_sys4": "DX",
"heating_coil_type_sys6": "DX",
Expand All @@ -120,6 +126,7 @@
"mau_heating_coil_type": "Hot Water",
"mau_cooling_type": "DX",
"chiller_type": "",
"heating_coil_type_sys2": "Electric",
"heating_coil_type_sys3": "Electric",
"heating_coil_type_sys4": "Electric",
"heating_coil_type_sys6": "Electric",
Expand Down
Loading