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

Addenda a b c #57

Merged
merged 54 commits into from
Mar 8, 2024
Merged

Addenda a b c #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
214080b
remove ratings precursor info
TimMcDowell Jan 7, 2023
610f514
add 340/360 2022
TimMcDowell Jan 8, 2023
10c8a8b
addendum a front matter changes
TimMcDowell Sep 27, 2023
11a5188
addendum a RS0001 changes
TimMcDowell Sep 27, 2023
e1f66ff
addendum a RS0002 changes
TimMcDowell Sep 27, 2023
8bb5dab
addendum a RS0003 changes
TimMcDowell Sep 27, 2023
0865308
addendum a RS0004 changes
TimMcDowell Sep 27, 2023
cd114cf
addendum a RS0005 changes
TimMcDowell Sep 27, 2023
8d42ddd
addendum a RS0006 changes
TimMcDowell Sep 27, 2023
9607883
addendum a RS0007 changes
TimMcDowell Sep 27, 2023
add15d3
addendum a meta schema changes
TimMcDowell Sep 27, 2023
4bb86f6
addendum a meta schema changes
TimMcDowell Sep 27, 2023
7f10d45
addendum b RS0001 changes
TimMcDowell Sep 27, 2023
9b87b1d
addendum b RS0002 changes
TimMcDowell Sep 27, 2023
929881e
addendum c front matter changes
TimMcDowell Sep 29, 2023
1b95d21
addendum c front matter changes
TimMcDowell Sep 29, 2023
c7b6898
addendum c front matter changes
TimMcDowell Sep 29, 2023
538bb71
addendum c front matter changes
TimMcDowell Sep 29, 2023
c53809e
addendum c RS0001 changes
TimMcDowell Sep 29, 2023
9edbe18
addendum c RS0001 changes
TimMcDowell Sep 29, 2023
b9cc189
addendum c RS0002 changes
TimMcDowell Sep 29, 2023
1d358d1
addendum c RS0003 changes
TimMcDowell Sep 29, 2023
0eee437
addendum c RS0001 changes
TimMcDowell Sep 29, 2023
0b256a6
addendum c RS0002 changes
TimMcDowell Sep 29, 2023
078f14d
addendum c RS0003 changes
TimMcDowell Sep 29, 2023
87a9c74
addendum c RS0004 changes
TimMcDowell Sep 29, 2023
73c5994
addendum c RS0005 changes
TimMcDowell Sep 29, 2023
2d40f5b
addendum c RS0006 changes
TimMcDowell Sep 29, 2023
d679757
addendum c RS0007 changes
TimMcDowell Sep 29, 2023
91e1889
addenda format changes
TimMcDowell Oct 2, 2023
ab40d36
remove max power from chiller example
TimMcDowell Feb 12, 2024
3c2a163
update chiller examples
TimMcDowell Feb 12, 2024
f2915d9
update one more chiller examples
TimMcDowell Feb 12, 2024
d2abd84
update RS0002 examples
TimMcDowell Feb 12, 2024
4f00fbc
update RS0003 examples
TimMcDowell Feb 12, 2024
f6f2d28
update RS0004 examples
TimMcDowell Feb 12, 2024
34a9395
update RS0005 examples
TimMcDowell Feb 12, 2024
a625be8
update RS0006 examples
TimMcDowell Feb 12, 2024
00da6c7
update RS0007 examples
TimMcDowell Feb 12, 2024
149bcbf
fix RS0005 examples
TimMcDowell Feb 12, 2024
64e0912
Merge remote-tracking branch 'origin/main' into addenda_A_B_C
nealkruis Feb 13, 2024
6f323d7
Merge remote-tracking branch 'origin/main' into addenda_A_B_C
nealkruis Feb 13, 2024
3f980c8
Merge remote-tracking branch 'origin/main' into rates_precursors
nealkruis Feb 20, 2024
4701fe6
Merge remote-tracking branch 'origin/main' into add_340360_year
nealkruis Feb 20, 2024
e0ed93b
Merge removal of rating precursors.
nealkruis Feb 20, 2024
aecb664
Merge add_340360_year.
nealkruis Feb 20, 2024
3f224f2
Save file after merge.
nealkruis Feb 20, 2024
23bc147
Update to version 2.0.0.
nealkruis Feb 21, 2024
730ef00
Update schema version.
nealkruis Feb 21, 2024
68637b7
Update 90.1 Chiller examples.
nealkruis Feb 22, 2024
7b87405
Update residential examples.
nealkruis Feb 23, 2024
e2cf166
Add inormative info to JSON schema.
nealkruis Feb 23, 2024
bbf9cd9
fix description error
TimMcDowell Feb 23, 2024
64ffd3b
Modify CPP generation to handle enums in lookup tables.
tanaya-mankad Feb 27, 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
645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AA.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AB.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-C.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-D.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-E.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-F.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-G.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-H.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-I.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-J.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-M.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-N.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-O.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-P.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Q.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-R.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-S.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-T.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-U.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-V.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

645 changes: 246 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-X.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Y.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

644 changes: 245 additions & 399 deletions examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Z.RS0001.a205.json
View file
Open in desktop

Large diffs are not rendered by default.

247 changes: 77 additions & 170 deletions examples/RS0001/Chiller-Constant-Efficiency.RS0001.a205.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"metadata": {
"data_model": "ASHRAE_205",
"schema": "RS0001",
"schema_version": "1.0.0",
"schema_version": "2.0.0",
"description": "Water-Cooled Chiller with Constant Efficiency",
"id": "123e4567-e89b-12d3-a456-426614174000",
"data_timestamp": "2020-05-07T00:00Z",
Expand Down Expand Up @@ -44,7 +44,6 @@
"evaporator_fouling_factor": 0.01761,
"condenser_fouling_factor": 0.04403,
"compressor_speed_control_type": "DISCRETE",
"maximum_power": 31400,
"cycling_degradation_coefficient": 0.25,
"performance_map_cooling": {
"grid_variables": {
Expand Down Expand Up @@ -199,174 +198,6 @@
1644772.8813559322,
2055966.1016949152
],
"evaporator_liquid_entering_temperature": [
280.92999999999995,
282.04999999999995,
283.15999999999997,
284.28,
285.39,
280.92999999999995,
282.04999999999995,
283.15999999999997,
284.28,
285.39,
280.92999999999995,
282.04999999999995,
283.15999999999997,
284.28,
285.39,
280.92999999999995,
282.04999999999995,
283.15999999999997,
284.28,
285.39,
282.92999999999995,
284.04999999999995,
285.15999999999997,
286.28,
287.39,
282.92999999999995,
284.04999999999995,
285.15999999999997,
286.28,
287.39,
282.92999999999995,
284.04999999999995,
285.15999999999997,
286.28,
287.39,
282.92999999999995,
284.04999999999995,
285.15999999999997,
286.28,
287.39
],
"condenser_liquid_leaving_temperature": [
295.17988731248823,
296.2097746249765,
297.23966193746475,
298.26954924995295,
299.2994365624412,
298.17988731248823,
299.2097746249765,
300.23966193746475,
301.26954924995295,
302.2994365624412,
301.17988731248823,
302.2097746249765,
303.23966193746475,
304.26954924995295,
305.2994365624412,
303.61988731248823,
304.6497746249765,
305.67966193746474,
306.70954924995294,
307.7394365624412,
295.17988731248823,
296.2097746249765,
297.23966193746475,
298.26954924995295,
299.2994365624412,
298.17988731248823,
299.2097746249765,
300.23966193746475,
301.26954924995295,
302.2994365624412,
301.17988731248823,
302.2097746249765,
303.23966193746475,
304.26954924995295,
305.2994365624412,
303.61988731248823,
304.6497746249765,
305.67966193746474,
306.70954924995294,
307.7394365624412
],
"evaporator_liquid_differential_pressure": [
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400,
74400
],
"condenser_liquid_differential_pressure": [
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600,
23600
],
"oil_cooler_heat": [
0,
0,
Expand Down Expand Up @@ -450,6 +281,48 @@
0,
0,
0
],
"operation_state": [
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL",
"NORMAL"
]
}
},
Expand All @@ -466,6 +339,40 @@
2200
]
}
},
"performance_map_evaporator_liquid_pressure_differential":{
"grid_variables": {
"evaporator_liquid_volumetric_flow_rate": [
0.0755
],
"evaporator_liquid_leaving_temperature":[
279.82,
281.82
]
},
"lookup_variables": {
"evaporator_liquid_differential_pressure": [
74400,
74400
]
}
},
"performance_map_condenser_liquid_pressure_differential":{
"grid_variables": {
"condenser_liquid_volumetric_flow_rate": [
0.0957
],
"condenser_liquid_entering_temperature":[
294.15,
302.59
]
},
"lookup_variables": {
"condenser_liquid_differential_pressure": [
23600,
23600
]
}
}
}
}
Loading