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

Update development branch from master #1560

Merged
merged 119 commits into from
Aug 16, 2023
Merged
Changes from 1 commit
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
0e040bc
Add DEER DCV to ThermalZone.rb and AirLoopHVAC.rb
amylebar Feb 13, 2023
1675086
Modified model_add_daylighting_controls method in a way to set minimu…
srgilani Mar 8, 2023
a41ca39
Modification of model_add_daylighting_controls method and unit test f…
srgilani Mar 9, 2023
d4769b9
removed redundant tests.. now always rely on circle_ci.txt for what t…
phylroy Mar 9, 2023
e6cb6d8
Modification of daylighting sensor control ECM and its unit test in p…
srgilani Mar 9, 2023
1091913
Added min illuminance level to space_types.json of NECB2011; and NECB…
srgilani Mar 10, 2023
34a0ba5
Modified unit test for daylighting sensor control ecm
srgilani Mar 10, 2023
996f683
Commented in unit test for daylighting sensor control ecm
srgilani Mar 10, 2023
30ae6af
Activating gems only used by nrcan for the btap_cli.
ckirney Mar 20, 2023
0dbef25
Merge remote-tracking branch 'origin/nrcan' into nrcan_375
srgilani Mar 20, 2023
c80a3e1
Updated bundler version in openstudio-standards.gemspec
srgilani Mar 20, 2023
8d61245
Added min illuminance level to space_types.json of NECB2015
srgilani Mar 21, 2023
24cbdf1
Adding min illuminance level to space_types.json of NECB2017, in prog…
srgilani Mar 21, 2023
d24f49d
Adding min illuminance level to space_types.json of NECB2017
srgilani Mar 22, 2023
66fafc3
Added min illuminance level to space_types.json of NECB2020
srgilani Mar 22, 2023
6c6c3bc
Orienting interior walls properly.
ckirney Mar 23, 2023
6038645
Ensuring the volume of all spaces are auto-calculated. Updating test…
ckirney Mar 23, 2023
3983d5a
Merge pull request #1463 from NREL/nrcan_warehouse
ckirney Mar 23, 2023
c64ac22
Merge pull request #1468 from NREL/nrcan_merge_os351
ckirney Mar 24, 2023
b6b4217
Added min illuminance level to space_types.json of BTAPPRE1980 and BT…
srgilani Mar 27, 2023
21c1b1b
Set daylighting_type in model_apply_standard method of necb_2011.rb; …
srgilani Mar 27, 2023
cf24c7e
Merge remote-tracking branch 'origin/nrcan' into nrcan_375
srgilani Mar 27, 2023
4b7fff5
Updated expected results files of regression tests for warehouse, ret…
srgilani Mar 28, 2023
3a0d518
Updated expected results files of regression tests for primary and se…
srgilani Mar 29, 2023
3df5aee
Merge pull request #1479 from NREL/nrcan_375: modify daylighting sens…
srgilani Apr 3, 2023
c16ec80
Nrcan 380 (#1489)
phylroy Apr 3, 2023
4d147c5
Variable for zone heating equipment in ECN HS12 was not properly set …
khaddad Apr 4, 2023
49266ba
Adding a 1W minimum boiler capacity. Fixing a spelling mistake in a …
ckirney Apr 4, 2023
873be55
Merge pull request #1491 from NREL/nrcan
ckirney Apr 4, 2023
4a1c3c0
Merge pull request #1492 from NREL/nrcan
ckirney Apr 5, 2023
f35a65c
Merge pull request #1494 from NREL/nrcan_378
ckirney Apr 6, 2023
ff8d091
Modify capacities of boiler and air cooled chiller so that the total …
khaddad Apr 24, 2023
14358ea
Set COP of air cooled chiller for HS14 ECM based on NECB 2020
khaddad Apr 24, 2023
b1f6bae
Add chiller_type key to the json file for chillers in ECM class.
khaddad Apr 24, 2023
ad4ac73
Apply sort method to object arrays before updating model
khaddad Apr 25, 2023
9b654e8
Added Northern osm files developed by RDH/Evoke
phylroy Apr 27, 2023
73645aa
Add json file for compressor type of air cooled chiller for ECM HS14
khaddad May 2, 2023
39212b3
Add water cooled chiller type json for NECB and update name of chille…
khaddad May 2, 2023
a09acea
Nrcan 372 (#1505)
phylroy May 4, 2023
1977c32
Update initial name of water-cooled chiller in ECM HS14
khaddad May 5, 2023
078fda7
Merge branch 'nrcan' into nrcan_280
khaddad May 5, 2023
d833976
Including changes from 'master' into 'nrcan' branch to test with Open…
ckirney May 15, 2023
951d452
Update openstudio-standards.gemspec
ckirney May 16, 2023
db1cb66
Update btap_datapoint.rb
ckirney May 16, 2023
ffd4d2d
Enabling gems required for NRCan development.
ckirney May 16, 2023
40f4544
Inculding ability to not apply daylighting by setting "daylighting_ty…
ckirney May 18, 2023
1512971
Merge pull request #1511 from NREL/nrcan
ckirney May 19, 2023
1b42257
Merge pull request #1512 from NREL/nrcan
ckirney May 19, 2023
86a2ef1
Merge branch 'nrcan' into nrcan_280
khaddad May 23, 2023
a2ede67
Add NECB performance curves for air-cooled chillers
khaddad May 26, 2023
48cbee5
Incorporating updates from nrcan branch (#1515)
ckirney May 29, 2023
06f4d8a
Updating regression tests from OS 3.5.1 to reflect merge of nrcan bra…
ckirney May 30, 2023
f9a6300
Updating nrcan_os360_dev with changes to nrcan branch.
ckirney May 30, 2023
1b77d1c
Updating nrcan_os360_dev with changes to nrcan branch and updating wi…
ckirney May 30, 2023
587c8f5
Incorporating recent changes to nrcan branch (#1518)
ckirney May 30, 2023
7f8d611
Updating regression test expected results to those used with OS 3.6.0…
ckirney May 31, 2023
e27dbcd
Updating regression test expected results to those used with OS 3.6.0…
ckirney May 31, 2023
71c406c
Updates default economizer type to FixedDryBulb and reverts exception…
asparke2 Jun 1, 2023
d270642
Adds possible fixed enthalpy limit to fixed drybulb economizer control
asparke2 Jun 1, 2023
1b5f6f0
Updates DEER economizer logic based on MASControl3
asparke2 Jun 1, 2023
a4ce431
Moves DEER economizer limits from code to data files
asparke2 Jun 1, 2023
1b96578
Update openstudio-standards.gemspec
ckirney Jun 7, 2023
12bbfab
Merge pull request #1520 from NREL/nrcan_os360
mdahlhausen Jun 7, 2023
6285117
init refactor of CBE ctrl sequences
carlosduarteroa Jul 6, 2023
d8ebcea
add dimensionless schedule limits type
mdahlhausen Jul 7, 2023
d2df8f1
removed code blocks not needed anymore
carlosduarteroa Jul 7, 2023
5a56179
modified/added comments
carlosduarteroa Jul 7, 2023
50b4ac3
set ems variables names to lowercase
carlosduarteroa Jul 7, 2023
12ac0f4
modified radiant system methods' arguments
carlosduarteroa Jul 7, 2023
c227aef
assign reversed radiant constructions to adjacent surfaces
carlosduarteroa Jul 8, 2023
6665790
Fix min OA requirements
amylebar Jul 10, 2023
b50172b
Update comments
amylebar Jul 10, 2023
31e024d
replace existing zone thermostat with constant thermostat to control …
carlosduarteroa Jul 12, 2023
4e90339
added radiant system availability presets
carlosduarteroa Jul 13, 2023
650db03
Merge remote-tracking branch 'origin/master' into deer_ventilation_rates
asparke2 Jul 13, 2023
b7019df
add erv method to deer 2020
amylebar Jul 14, 2023
d66ec66
add placeholder for radiant controls tests
mdahlhausen Jul 21, 2023
19db3eb
Merge pull request #1534 from NREL/feature/radiant_controls_update
mdahlhausen Jul 21, 2023
dc48c02
add require_relative for new DEER files
amylebar Aug 2, 2023
c15b911
Merge branch 'master' into fix/economizers
JanghyunJK Aug 3, 2023
b991240
Merge branch 'master' into feature/radiant_controls_operation_presets
carlosduarteroa Aug 7, 2023
3a69adb
Merge branch 'master' into feature/radiant_controls_thermostat
carlosduarteroa Aug 7, 2023
46b5122
safeguard for max_net_vert_distance equal to zero
JanghyunJK Aug 8, 2023
5d55410
comstock economizer type
mdahlhausen Aug 8, 2023
7493282
Merge branch 'master' into deer_ventilation_rates
amylebar Aug 8, 2023
938e66b
removing if for zero
JanghyunJK Aug 8, 2023
d2b5e28
Merge pull request #1555 from NREL/fix/economizers
mdahlhausen Aug 8, 2023
e9efb85
remove .vscode artificats
mdahlhausen Aug 8, 2023
aa802e4
Update performance and regression tests results.
lymereJ Aug 8, 2023
4723ad3
Merge branch 'master' into update_tests_os_3_6_1
lymereJ Aug 9, 2023
cdb5e1d
Merge pull request #1559 from NREL/update_tests_os_3_6_1
mdahlhausen Aug 9, 2023
714437e
Merge pull request #1557 from NREL/vrf-ou-vertical-height
mdahlhausen Aug 9, 2023
dc94c41
Merge branch 'master' into deer_ventilation_rates
mdahlhausen Aug 9, 2023
94243bb
Merge pull request #1558 from NREL/deer_ventilation_rates
mdahlhausen Aug 9, 2023
9fef91d
Merge branch 'master' into feature/radiant_controls_operation_presets
mdahlhausen Aug 9, 2023
87ead70
Merge branch 'master' into feature/radiant_controls_thermostat
mdahlhausen Aug 9, 2023
212ae96
remove VRP default in VAV constructor
mdahlhausen Aug 9, 2023
b13a713
undo vent controller name change
mdahlhausen Aug 10, 2023
1303957
remove maximum flow fraction setting
mdahlhausen Aug 10, 2023
640ea0a
Updating MiniTest inheritance to Minitest to accommodate change minit…
ckirney Aug 10, 2023
a8db561
Update openstudio-standards.gemspec
ckirney Aug 11, 2023
6e0fa53
Merge branch 'fix/minitest_version' into fix/default_vav_controls
mdahlhausen Aug 11, 2023
5383c47
Merge pull request #1547 from NREL/feature/radiant_controls_operation…
mdahlhausen Aug 11, 2023
53dc083
Merge pull request #1546 from NREL/feature/radiant_controls_thermostat
mdahlhausen Aug 11, 2023
f4450af
Merge remote-tracking branch 'origin/master' into fix/default_vav_con…
asparke2 Aug 11, 2023
0c8dd21
Merge branch 'master' into fix/minitest_version
mdahlhausen Aug 11, 2023
fe4b0d3
Merge pull request #1567 from NREL/fix/minitest_version
mdahlhausen Aug 11, 2023
8eb2873
update regression models
mdahlhausen Aug 11, 2023
86bcd02
Merge pull request #1561 from NREL/fix/default_vav_controls
mdahlhausen Aug 11, 2023
0298d65
formatting edits to hvac_system_test_helper
mdahlhausen Aug 14, 2023
102863d
update test model path lookup
mdahlhausen Aug 14, 2023
5215214
Merge pull request #1569 from NREL/fix/hvac_tests
mdahlhausen Aug 14, 2023
7bc4145
add test helper for radiant system controls
mdahlhausen Aug 14, 2023
f4354de
change default test name arguments
mdahlhausen Aug 14, 2023
ad27e35
Merge pull request #1572 from NREL/feature/radiant_controls_tests
mdahlhausen Aug 15, 2023
5174f68
restore 0.5 maximum reheat flow fraction
mdahlhausen Aug 15, 2023
f4529dc
add python script to create expected results
mdahlhausen Aug 14, 2023
57e6010
update performance and regression tests
mdahlhausen Aug 15, 2023
13a79e8
Merge pull request #1574 from NREL/fix/default_vav_controls
mdahlhausen Aug 16, 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
Prev Previous commit
Next Next commit
change default test name arguments
mdahlhausen committed Aug 14, 2023
commit f4354debbc6c254c2c0d4c91657352c0e693c8eb
2 changes: 2 additions & 0 deletions test/helpers/hvac_system_test_helper.rb
Original file line number Diff line number Diff line change
@@ -267,6 +267,8 @@ def model_radiant_system_test(arguments)
standard = Standard.build(template)
if model_test_name.nil?
model_test_name = 'default_radiant_controls_test_name'
else
model_test_name = model_test_name.gsub(' ', '_')
end
model_dir = "#{output_dir}/hvac_#{model_test_name}"

4 changes: 2 additions & 2 deletions test/os_stds_methods/test_radiant_controls.rb
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@

class TestRadiantControls < Minitest::Test
def test_default_radiant_controls
arguments = {system_type: 'Radiant Slab with DOAS', main_heat_fuel: 'NaturalGas', cool_fuel: 'Electricity',
arguments = {model_test_name: 'default_radiant', main_heat_fuel: 'NaturalGas', cool_fuel: 'Electricity',
hot_water_loop_type: 'LowTemperature', climate_zone: 'ASHRAE 169-2013-5B', model_name: 'basic_2_story_office_no_hvac_20WWR'}

errs = model_radiant_system_test(arguments)
assert(errs.empty?, "Radiant slab system model failed with errors: #{errs}")
end

def test_default_radiant_ceiling
arguments = {system_type: 'Radiant Slab with DOAS', main_heat_fuel: 'NaturalGas', cool_fuel: 'Electricity',
arguments = {model_test_name: 'default_radiant_ceiling', main_heat_fuel: 'NaturalGas', cool_fuel: 'Electricity',
hot_water_loop_type: 'LowTemperature', climate_zone: 'ASHRAE 169-2013-5B', model_name: 'basic_2_story_office_no_hvac_20WWR',
radiant_type: 'ceiling'}