Skip to content

Commit

Permalink
Creat json; change refs.
Browse files Browse the repository at this point in the history
  • Loading branch information
spahrenk committed Dec 11, 2024
1 parent 02c3d4e commit 1ea3fb6
Show file tree
Hide file tree
Showing 7 changed files with 1,407 additions and 1,219 deletions.
3 changes: 2 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ set(BradfordWhiteAeroThermRE2H80_Tests

#
set(LG_Models LG_APHWC50 LG_APHWC80)
set(LG_TestDir "LG/LG_APHWC50")
set(LG_TestDir "LG/APHWC50")
set(LG_Tests
DOE2014_LGC50_24hr50
DOE2014_LGC50_24hr67
Expand Down Expand Up @@ -341,6 +341,7 @@ foreach(model ${LG_Models})
set(fullTestName "${LG_TestDir}/${test}")
add_model_test(TEST_NAME "${fullTestName}" MODEL_NAME "${model}" SPEC_TYPE "Preset")
add_model_test(TEST_NAME "${fullTestName}" MODEL_NAME "${model}" SPEC_TYPE "File")
add_model_test(TEST_NAME "${fullTestName}" MODEL_NAME "${model}" SPEC_TYPE "JSON")
endforeach (test)
endforeach (model)

Expand Down
4 changes: 2 additions & 2 deletions test/LG_APHWC50.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ heatsource 2 coilConfig wrapped


#this might be better as the 5/6 layer at 20F below setpoint
heatsource 0 onlogic topThird 37.0 F
heatsource 0 onlogic topThird 39.0 F

heatsource 2 onlogic bottomThird 52.7 F
heatsource 2 onlogic bottomThird 52.9 F
heatsource 2 onlogic standby 9.0 F

heatsource 1 backupSource 2
Expand Down
4 changes: 2 additions & 2 deletions test/LG_APHWC80.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ heatsource 2 coilConfig wrapped


#this might be better as the 5/6 layer at 20F below setpoint
heatsource 0 onlogic topThird 37.0 F
heatsource 0 onlogic topThird 39.0 F

heatsource 2 onlogic bottomThird 52.7 F
heatsource 2 onlogic bottomThird 52.9 F
heatsource 2 onlogic standby 9.0 F

heatsource 1 backupSource 2
Expand Down
24 changes: 12 additions & 12 deletions test/models_json/LG_APHWC50.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,16 @@
},
"lookup_variables": {
"heating_capacity": [
668.7649616326531,
566.939133061225,
677.7718971428568,
584.2404685714286,
658.5299999999999,
1194.9779999999998,
408.9719999999998,
1359.116,
455.39199999999977,
2046.8159999999993,
425.7407603305781,
2600.146578512397
407.39599999999984,
1352.164,
503.4039999999997,
2083.8199999999993,
544.5794545454543,
2702.8572727272726
],
"input_power": [
291.8914285714285,
Expand All @@ -134,10 +134,10 @@
431.39999999999986,
78.79999999999995,
347.59999999999985,
60.79999999999997,
329.59999999999985,
44.43636363636357,
313.2363636363635
67.29999999999997,
336.09999999999985,
56.8454545454545,
325.64545454545436
]
}
}
Expand Down
187 changes: 187 additions & 0 deletions test/models_json/LG_APHWC80.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
{
"metadata": {
"schema": "RSINTEGRATEDWATERHEATER"
},
"performance": {
"heat_source_configurations": [
{
"companion_heat_source_id": "compressor",
"followed_by_heat_source_id": "compressor",
"heat_distribution": [
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
1.0,
0.0,
0.0,
0.0
],
"heat_source": {
"metadata": {
"schema": "RSRESISTANCEWATERHEATSOURCE"
},
"performance": {
"input_power": 5000.0
}
},
"heat_source_type": "RESISTANCE",
"id": "resistiveElementTop",
"turn_on_logic": [
{
"comparison_type": "LESS_THAN",
"heating_logic": {
"differential_temperature": 21.666666666666668,
"temperature_weight_distribution": [
0.0,
0.0,
1.0
]
},
"heating_logic_type": "TEMPERATURE_BASED"
}
]
},
{
"backup_heat_source_id": "compressor",
"followed_by_heat_source_id": "compressor",
"heat_distribution": [
1.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
],
"heat_source": {
"metadata": {
"schema": "RSRESISTANCEWATERHEATSOURCE"
},
"performance": {
"input_power": 5000.0
}
},
"heat_source_type": "RESISTANCE",
"id": "resistiveElementBottom"
},
{
"backup_heat_source_id": "resistiveElementBottom",
"heat_distribution": [
0.17,
0.166,
0.166,
0.166,
0.166,
0.166,
0.0,
0.0,
0.0,
0.0,
0.0,
0.0
],
"heat_source": {
"metadata": {
"schema": "RSCONDENSERWATERHEATSOURCE"
},
"performance": {
"coil_configuration": "WRAPPED",
"compressor_lockout_temperature_hysteresis": 0.5555555555555556,
"maximum_refrigerant_temperature": 344.26111111111106,
"maximum_temperature": 322.0388888888889,
"minimum_temperature": 268.15,
"performance_map": {
"grid_variables": {
"evaporator_environment_dry_bulb_temperature": [
268.15,
283.15,
292.8722222222222,
308.15,
322.0388888888889
],
"heat_source_temperature": [
273.15,
344.26111111111106
]
},
"lookup_variables": {
"heating_capacity": [
677.7718971428568,
584.2404685714286,
658.5299999999999,
1194.9779999999998,
407.39599999999984,
1352.164,
503.4039999999997,
2083.8199999999993,
544.5794545454543,
2702.8572727272726
],
"input_power": [
291.8914285714285,
560.6914285714284,
162.59999999999997,
431.39999999999986,
78.79999999999995,
347.59999999999985,
67.29999999999997,
336.09999999999985,
56.8454545454545,
325.64545454545436
]
}
}
}
},
"heat_source_type": "CONDENSER",
"id": "compressor",
"turn_on_logic": [
{
"comparison_type": "LESS_THAN",
"heating_logic": {
"differential_temperature": 29.388888888888886,
"temperature_weight_distribution": [
1.0,
0.0,
0.0
]
},
"heating_logic_type": "TEMPERATURE_BASED"
},
{
"comparison_type": "LESS_THAN",
"heating_logic": {
"differential_temperature": 5.0,
"standby_temperature_location": "TOP_OF_TANK"
},
"heating_logic_type": "TEMPERATURE_BASED"
}
]
}
],
"primary_heat_source_id": "resistiveElementTop",
"tank": {
"metadata": {
"schema": "RSTANK"
},
"performance": {
"bottom_fraction_of_tank_mixing_on_draw": 0.0,
"fittings_ua": 0.0,
"fixed_volume": true,
"number_of_nodes": 12,
"ua": 3.0083333333333333,
"volume": 0.27254952000000005
}
}
}
}
Loading

0 comments on commit 1ea3fb6

Please sign in to comment.