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

RS/JDJ/Rule 11-10 #1578

Merged
merged 40 commits into from
Dec 30, 2024
Merged

RS/JDJ/Rule 11-10 #1578

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2463573
file setup
JacksonJ-KC Dec 16, 2024
6f585b9
add SWHEquipRule methods
JacksonJ-KC Dec 16, 2024
91deab9
table f-2
JacksonJ-KC Dec 16, 2024
1cc6680
begin get_calc_vals
JacksonJ-KC Dec 17, 2024
d7cabe8
make tables uniform
JacksonJ-KC Dec 17, 2024
867af2d
convert tables to json
JacksonJ-KC Dec 17, 2024
36b1e0d
table lookup modules
JacksonJ-KC Dec 17, 2024
dbc930e
table 7.8 data lookup functions
JacksonJ-KC Dec 17, 2024
6fb2779
table F-2 data lookup functions
JacksonJ-KC Dec 17, 2024
a0e2cde
continue get_calc_vals
JacksonJ-KC Dec 17, 2024
21ec627
complete get_calc_vals
JacksonJ-KC Dec 17, 2024
6e13d4b
handle units
JacksonJ-KC Dec 17, 2024
7c0855e
complete manual check required
JacksonJ-KC Dec 17, 2024
2786807
complete get manual check required msg
JacksonJ-KC Dec 18, 2024
da8994a
complete rule check
JacksonJ-KC Dec 18, 2024
7c01c8f
complete rule check
JacksonJ-KC Dec 18, 2024
ed00025
black format
JacksonJ-KC Dec 18, 2024
969ce40
add ServiceWaterHeatingEfficiencyMetricOptions
JacksonJ-KC Dec 18, 2024
0bf118d
Merge branch 'develop' into RS/JDJ/rule11-10
JacksonJ-KC Dec 18, 2024
7910f10
enum typo
JacksonJ-KC Dec 18, 2024
120f3a2
Merge remote-tracking branch 'origin/RS/JDJ/rule11-10' into RS/JDJ/ru…
JacksonJ-KC Dec 18, 2024
e6c44a9
update messages
JacksonJ-KC Dec 18, 2024
ed294e9
added precision comparisons
JacksonJ-KC Dec 18, 2024
7f27e77
black format
JacksonJ-KC Dec 18, 2024
b78971f
Update undetermined message
JacksonJ-KC Dec 18, 2024
1c3c358
update with rule tests
JacksonJ-KC Dec 19, 2024
a125364
black format
JacksonJ-KC Dec 19, 2024
71c15a4
update standby loss units
JacksonJ-KC Dec 19, 2024
3226813
standby loss units back to watts
JacksonJ-KC Dec 19, 2024
f47b185
correct units and precision discrepancy
JacksonJ-KC Dec 19, 2024
af3caea
correct precision bug
JacksonJ-KC Dec 19, 2024
8c5af33
black format
JacksonJ-KC Dec 19, 2024
358ce07
separate lt comparison based on units
JacksonJ-KC Dec 19, 2024
3cf0b8e
update outcome when power per storage volume exceeds limit
JacksonJ-KC Dec 19, 2024
73f7d58
lookup assertions
JacksonJ-KC Dec 20, 2024
4d85253
unit test lookup assertions
JacksonJ-KC Dec 20, 2024
fbe075e
'Very small' capitalization
JacksonJ-KC Dec 20, 2024
8c15e5a
update note
JacksonJ-KC Dec 20, 2024
46b00cf
Merge branch 'develop' of https://github.com/pnnl/ruleset-checking-to…
weilixu Dec 30, 2024
de2b706
add section 11 test function
weilixu Dec 30, 2024
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
130 changes: 130 additions & 0 deletions rct229/rulesets/ashrae9012019/data/ashrae_90_1_table_7_8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"service_water_heater_efficiency": [
{
"Equipment Type": "Electric storage water heater",
"Capacity min": {
"value": 12,
"unit": "kW",
"inclusive": true
},
"Capacity max": {
"value": 9999,
"unit": "kW",
"inclusive": false
},
"Draw Pattern": "",
"Efficiency": {
"equation": "0.3 + 27/v",
"metric": "STANDBY_LOSS_FRACTION"
}
},
{
"Equipment Type": "Gas storage water heater",
"Capacity min": {
"value": 75000,
"unit": "Btu/h",
"inclusive": false
},
"Capacity max": {
"value": 105000,
"unit": "Btu/h",
"inclusive": true
},
"Draw Pattern": "Very small",
"Efficiency": {
"equation": "0.2674 - 0.0009*v",
"metric": "UNIFORM_ENERGY_FACTOR"
}
},
{
"Equipment Type": "Gas storage water heater",
"Capacity min": {
"value": 75000,
"unit": "Btu/h",
"inclusive": false
},
"Capacity max": {
"value": 105000,
"unit": "Btu/h",
"inclusive": true
},
"Draw Pattern": "Low",
"Efficiency": {
"equation": "0.5362 - 0.0012*v",
"metric": "UNIFORM_ENERGY_FACTOR"
}
},
{
"Equipment Type": "Gas storage water heater",
"Capacity min": {
"value": 75000,
"unit": "Btu/h",
"inclusive": false
},
"Capacity max": {
"value": 105000,
"unit": "Btu/h",
"inclusive": true
},
"Draw Pattern": "Medium",
"Efficiency": {
"equation": "0.6002 - 0.0011*v",
"metric": "UNIFORM_ENERGY_FACTOR"
}
},
{
"Equipment Type": "Gas storage water heater",
"Capacity min": {
"value": 75000,
"unit": "Btu/h",
"inclusive": false
},
"Capacity max": {
"value": 105000,
"unit": "Btu/h",
"inclusive": true
},
"Draw Pattern": "High",
"Efficiency": {
"equation": "0.6597 - 0.0009*v",
"metric": "UNIFORM_ENERGY_FACTOR"
}
},
{
"Equipment Type": "Gas storage water heater",
"Capacity min": {
"value": 105000,
"unit": "Btu/h",
"inclusive": false
},
"Capacity max": {
"value": 9999999,
"unit": "Btu/h",
"inclusive": true
},
"Draw Pattern": "",
"Efficiency": {
"equation": "0.80",
"metric": "THERMAL_EFFICIENCY"
}
},
{
"Equipment Type": "Gas storage water heater",
"Capacity min": {
"value": 105000,
"unit": "Btu/h",
"inclusive": false
},
"Capacity max": {
"value": 9999999,
"unit": "Btu/h",
"inclusive": true
},
"Draw Pattern": "",
"Efficiency": {
"equation": "q/800 + 110*v**0.5",
"metric": "STANDBY_LOSS_ENERGY"
}
}
]
}
Loading
Loading