From d0d856520b10ff60aa89d8d6d8dd04b24e98837d Mon Sep 17 00:00:00 2001 From: Actions CI Date: Wed, 10 May 2023 21:42:02 +0000 Subject: [PATCH 1/5] "Start reorganizing the build files for libtk205." --- ...90-1-2019-bd-Curve-Set-AA.RS0001.a205.json | 2 +- ...90-1-2019-bd-Curve-Set-AB.RS0001.a205.json | 654 +++++++++--------- ...E90-1-2019-bd-Curve-Set-C.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-D.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-E.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-F.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-G.RS0001.a205.json | 654 +++++++++--------- ...E90-1-2019-bd-Curve-Set-H.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-I.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-J.RS0001.a205.json | 654 +++++++++--------- ...E90-1-2019-bd-Curve-Set-M.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-N.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-O.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-P.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-Q.RS0001.a205.json | 654 +++++++++--------- ...E90-1-2019-bd-Curve-Set-R.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-S.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-T.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-U.RS0001.a205.json | 654 +++++++++--------- ...E90-1-2019-bd-Curve-Set-V.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-X.RS0001.a205.json | 2 +- ...E90-1-2019-bd-Curve-Set-Y.RS0001.a205.json | 654 +++++++++--------- ...E90-1-2019-bd-Curve-Set-Z.RS0001.a205.json | 2 +- include/libtk205/ashrae205.h | 12 +- include/libtk205/grid_variables_base.h | 3 +- include/libtk205/loadobject_205.h | 6 +- include/libtk205/lookup_variables_base.h | 1 - include/libtk205/performance_map_base.h | 41 +- include/libtk205/rs0001.h | 6 +- include/libtk205/rs0001_factory.h | 2 +- include/libtk205/rs0002.h | 2 + include/libtk205/rs0002_factory.h | 2 +- include/libtk205/rs0003.h | 6 +- include/libtk205/rs0003_factory.h | 2 +- include/libtk205/rs0004.h | 6 +- include/libtk205/rs0004_factory.h | 2 +- include/libtk205/rs0005.h | 4 +- include/libtk205/rs0005_factory.h | 2 +- include/libtk205/rs0006.h | 4 +- include/libtk205/rs0006_factory.h | 2 +- include/libtk205/rs0007.h | 4 +- include/libtk205/rs0007_factory.h | 2 +- include/libtk205/rs_instance_base.h | 3 +- include/libtk205/rs_instance_factory.h | 14 +- src/ashrae205.cpp | 50 +- src/rs0001.cpp | 242 +++---- src/rs0001_factory.cpp | 9 +- src/rs0002.cpp | 114 +-- src/rs0002_factory.cpp | 9 +- src/rs0003.cpp | 98 +-- src/rs0003_factory.cpp | 9 +- src/rs0004.cpp | 82 +-- src/rs0004_factory.cpp | 9 +- src/rs0005.cpp | 54 +- src/rs0005_factory.cpp | 9 +- src/rs0006.cpp | 46 +- src/rs0006_factory.cpp | 9 +- src/rs0007.cpp | 42 +- src/rs0007_factory.cpp | 9 +- src/rs_instance_factory.cpp | 9 +- test/fixtures_libtk205.hpp | 21 +- test/main_libtk205.cpp | 32 +- 62 files changed, 2461 insertions(+), 2476 deletions(-) diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AA.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AA.RS0001.a205.json index da550c4..c1fda19 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AA.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AA.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'AA': 225.0 ton, 2.23 COP liquid-cooled, centrifugal compressor chiller", "id": "0d92de87-13de-4fa4-a6f5-c092ded36fa1", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AB.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AB.RS0001.a205.json index 228eec4..182b8b6 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AB.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-AB.RS0001.a205.json @@ -3,13 +3,13 @@ "data_model": "ASHRAE_205", "schema": "RS0001", "schema_version": "1.0.0", - "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'AA': 300.0 ton, 2.03 COP liquid-cooled, centrifugal compressor chiller", - "id": "c2a84c29-9241-47cd-a2e5-b1f83f5ed79a", - "data_timestamp": "2022-12-01T11:35Z", + "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'AB': 350.0 ton, 2.03 COP liquid-cooled, centrifugal compressor chiller", + "id": "660f0087-cab0-41d4-b86b-98701d85e974", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", - "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'AA' for Performance Rating Method (PRM)" + "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'AB' for Performance Rating Method (PRM)" }, "description": { "product_information": { @@ -40,12 +40,12 @@ "evaporator_fouling_factor": 0.0, "condenser_fouling_factor": 0.0, "compressor_speed_control_type": "CONTINUOUS", - "maximum_power": 541181.4218585292, + "maximum_power": 608214.9022351246, "cycling_degradation_coefficient": 0.0, "performance_map_cooling": { "grid_variables": { "evaporator_liquid_volumetric_flow_rate": [ - 0.04520614613499604 + 0.05274050382416204 ], "evaporator_liquid_leaving_temperature": [ 277.0388888888889, @@ -54,7 +54,7 @@ 288.7055555555556 ], "condenser_liquid_volumetric_flow_rate": [ - 0.07325163403057448 + 0.08546023970233692 ], "condenser_liquid_entering_temperature": [ 285.9277777777778, @@ -71,334 +71,334 @@ }, "lookup_variables": { "input_power": [ - 157921.53448442332, - 209325.9082815521, - 291686.80501307786, - 405004.22467900073, - 188066.58118724523, - 249283.3422177098, - 347365.80020789366, - 482313.9551577966, - 191175.34627068645, - 253404.02833470987, - 353107.80213109945, - 490286.66765985533, - 169892.11430750164, - 225192.9811434223, - 313796.9003471131, - 435703.87191857415, - 152602.58232241377, - 202275.60639553162, - 281862.5073501964, - 391363.2851864081, - 192960.92631323368, - 255770.82501912588, - 356405.83326666383, - 494865.9510558477, - 205726.43469304868, - 272691.5802853692, - 379984.1904921832, - 527604.2653134906, - 192031.5704582017, - 254538.95845256498, - 354689.27927699103, - 492482.53293148003, - 142365.4003092309, - 188706.16236657658, - 262954.06067437475, - 365109.0952326252, - 190172.58640575784, - 252074.864328042, - 351255.668271387, - 487714.99823579297, - 211020.51624794386, - 279708.91603766556, - 389762.5512411941, - 541181.4218585292, - 204529.83125572026, - 271105.4755011842, - 377774.0205198517, - 524535.466311723, - 129750.82952373993, - 171985.47575549711, - 239654.49066295175, - 332757.87424610386, - 182211.63863222196, - 241522.5819625121, - 336551.50883854093, - 467298.41926030844, - 209536.90419131547, - 277742.37966689706, - 387022.2659337491, - 537376.562991872, - 209835.44604454012, - 278138.0986218219, - 387573.68357045134, - 538142.2008904284 + 195394.83793181306, + 266550.5933657873, + 372034.2874895716, + 511845.92030316615, + 223501.0825822576, + 304892.1190076999, + 425548.9392235376, + 585471.5432297708, + 225612.5190078734, + 307772.4644562241, + 429569.1413665319, + 591002.549738797, + 204149.07234183655, + 278492.80433284084, + 388702.4625331023, + 534778.046942621, + 186552.27279319748, + 254487.8848033629, + 355197.9296013811, + 488682.4071872524, + 222315.02184850277, + 303274.1377155814, + 423290.66431375826, + 582364.6016430333, + 232183.2558117404, + 316736.02671027085, + 442079.9088513989, + 608214.9022351246, + 217714.04943677952, + 296997.65702967695, + 414530.35359586723, + 570312.1391353505, + 175921.073825527, + 239985.18645668912, + 334955.98987072473, + 460833.48406763404, + 216564.48300373176, + 295429.45994685934, + 412341.5643045651, + 567300.796076849, + 231999.71838351781, + 316485.6515677369, + 441730.4512246815, + 607734.1173543517, + 222921.00433944757, + 304100.7971823324, + 424444.4627796546, + 583952.0011314143, + 166006.7293359229, + 226460.3951443463, + 316078.9502971245, + 434862.3947942575, + 209162.46938018937, + 285331.89982531016, + 398248.03505082056, + 547910.8750567207, + 228382.42508057403, + 311551.070457594, + 434843.07819658186, + 598258.4482975374, + 223497.9704323325, + 304887.873524974, + 425543.0136500057, + 585463.3908074276 ], "net_evaporator_capacity": [ - 264393.5102339755, - 528787.020467951, - 793180.5307019264, - 1057574.040935902, - 253002.10027090277, - 506004.20054180553, - 759006.3008127083, - 1012008.4010836111, - 234747.79706283694, - 469495.5941256739, - 704243.3911885108, - 938991.1882513477, - 209630.60060977793, - 419261.20121955586, - 628891.8018293338, - 838522.4024391117, - 286749.70726730884, - 573499.4145346177, - 860249.1218019265, - 1146998.8290692354, - 281389.7007709028, - 562779.4015418056, - 844169.1023127084, - 1125558.8030836112, - 269166.8010295037, - 538333.6020590074, - 807500.4030885111, - 1076667.2041180148, - 250081.00804311142, - 500162.01608622284, - 750243.0241293343, - 1000324.0321724457, - 294099.19805619755, - 588198.3961123951, - 882297.5941685927, - 1176396.7922247902, - 294770.5950264582, - 589541.1900529164, - 884311.7850793747, - 1179082.3801058328, - 288579.0987517257, - 577158.1975034514, - 865737.2962551771, - 1154316.3950069027, - 275524.709232, - 551049.418464, - 826574.127696, - 1102098.836928, - 286441.98260064184, - 572883.9652012837, - 859325.9478019255, - 1145767.9304025674, - 293144.7830375692, - 586289.5660751384, - 879434.3491127077, - 1172579.1321502768, - 292984.6902295034, - 585969.3804590068, - 878954.0706885101, - 1171938.7609180135, - 285961.7041764444, - 571923.4083528888, - 857885.1125293332, - 1143846.8167057775 + 321295.94751414005, + 642591.8950282801, + 963887.8425424201, + 1285183.7900565602, + 303192.1191353608, + 606384.2382707216, + 909576.3574060824, + 1212768.4765414433, + 277639.0110634404, + 555278.0221268808, + 832917.0331903212, + 1110556.0442537616, + 244636.62329837866, + 489273.2465967573, + 733909.869895136, + 978546.4931935146, + 344598.09397187666, + 689196.1879437533, + 1033794.28191563, + 1378392.3758875066, + 331956.3467675146, + 663912.6935350292, + 995869.0403025438, + 1327825.3870700584, + 311865.31987001124, + 623730.6397400225, + 935595.9596100338, + 1247461.279480045, + 284325.0132793664, + 568650.0265587328, + 852975.0398380993, + 1137300.0531174657, + 353473.27226088895, + 706946.5445217779, + 1060419.8167826668, + 1413893.0890435558, + 346293.60623094375, + 692587.2124618875, + 1038880.8186928313, + 1385174.424923775, + 331664.66050785733, + 663329.3210157147, + 994993.981523572, + 1326658.6420314293, + 309586.4350916296, + 619172.8701832592, + 928759.3052748889, + 1238345.7403665185, + 347921.4823811768, + 695842.9647623536, + 1043764.4471435304, + 1391685.9295247071, + 346203.8975256487, + 692407.7950512974, + 1038611.6925769461, + 1384815.5901025948, + 337037.0329769793, + 674074.0659539585, + 1011111.0989309378, + 1348148.131907917, + 320420.8887351687, + 640841.7774703373, + 961262.6662055061, + 1281683.5549406747 ], "net_condenser_capacity": [ - 422315.0447183988, - 738112.9287495031, - 1084867.3357150042, - 1462578.2656149026, - 441068.681458148, - 755287.5427595153, - 1106372.101020602, - 1494322.3562414078, - 425923.1433335234, - 722899.6224603837, - 1057351.1933196103, - 1429277.8559112032, - 379522.71491727955, - 644454.1823629781, - 942688.7021764468, - 1274226.2743576858, - 439352.28958972264, - 775775.0209301494, - 1142111.629152123, - 1538362.1142556434, - 474350.6270841365, - 818550.2265609314, - 1200574.935579372, - 1620424.7541394588, - 474893.2357225524, - 811025.1823443766, - 1187484.5935806944, - 1604271.4694315055, - 442112.5785013131, - 754700.9745387879, - 1104932.3034063252, - 1492806.5651039258, - 436464.59836542845, - 776904.5584789717, - 1145251.6548429674, - 1541505.8874574155, - 484943.1814322161, - 841616.0543809584, - 1235567.4533507617, - 1666797.378341626, - 499599.61499966955, - 856867.1135411169, - 1255499.8474963713, - 1695497.816865432, - 480054.5404877203, - 822154.8939651842, - 1204348.1482158517, - 1626634.303239723, - 416192.8121243818, - 744869.4409567808, - 1098980.4384648772, - 1478525.8046486713, - 475356.42166979116, - 827812.1480376505, - 1215985.8579512485, - 1639877.5514105852, - 502521.59442081884, - 863711.7601259039, - 1265976.336622259, - 1709315.3239098855, - 495797.1502209845, - 850061.5069747106, - 1245458.7960997846, - 1681989.017596206 + 516690.78544595314, + 909142.4883940674, + 1335922.1300319918, + 1797029.7103597263, + 526693.2017176184, + 911276.3572784215, + 1335125.29662962, + 1798240.019771214, + 503251.53007131384, + 863050.4865831049, + 1262486.174556853, + 1701558.5939925588, + 448785.6956402152, + 767766.0509295982, + 1122612.3324282384, + 1513324.5401361356, + 531150.3667650742, + 943684.0727471162, + 1388992.211517011, + 1867074.783074759, + 554271.3686160174, + 967186.8312506105, + 1419159.7046163022, + 1910189.9887130917, + 544048.5756817516, + 940466.6664502933, + 1377675.8684614326, + 1855676.1817151695, + 502039.06271614594, + 865647.6835884098, + 1267505.3934339664, + 1707612.1922528162, + 529394.3460864159, + 946931.730978467, + 1395375.8066533916, + 1874726.5731111898, + 562858.0892346755, + 988016.6724087468, + 1451222.3829973964, + 1952475.221000624, + 563664.3788913751, + 979814.9725834515, + 1436724.4327482535, + 1934392.759385781, + 532507.4394310772, + 923273.6673655916, + 1353203.7680545435, + 1822297.741497933, + 513928.21171709965, + 922303.3599066999, + 1359843.397440655, + 1826548.3243189645, + 555366.366905838, + 977739.6948766075, + 1436859.7276277668, + 1932726.4651593156, + 565419.4580575533, + 985625.1364115526, + 1445954.1771275196, + 1946406.5802054545, + 543918.8591675012, + 945729.6509953113, + 1386805.6798555118, + 1867146.9457481024 ], "evaporator_liquid_entering_temperature": [ - 278.4288747660367, - 279.81886064318445, - 281.20884652033226, - 282.59883239748, - 278.3689871426398, - 279.69908539639067, - 281.0291836501416, - 282.3592819038925, - 278.2730194933812, - 279.5071500978735, - 280.74128070236577, - 281.97541130685806, - 278.1409718182609, - 279.2430547476328, - 280.3451376770048, - 281.4472206063768, - 282.43858599795556, - 283.94939421813336, - 285.4602024383111, - 286.9710106584889, - 282.4103455441042, - 283.89291331043063, - 285.375481076757, - 286.85804884308345, - 282.34594632438154, - 283.7641148709853, - 285.1822834175891, - 286.6004519641928, - 282.2453883387876, - 283.56299889979744, - 284.88060946080725, - 286.19822002181706, - 286.36909404731813, - 287.92152142796954, - 289.473948808621, - 291.02637618927247, - 286.37263807275855, - 287.9286094788504, - 289.48458088494226, - 291.04055229103415, - 286.3399557383366, - 287.8632448100065, - 289.3865338816765, - 290.9098229533464, - 286.2710470440523, - 287.7254274214379, - 289.17980779882356, - 290.6341881762092, - 290.220068515395, - 291.7345814752344, - 293.24909443507386, - 294.76360739491327, - 290.25550842555333, - 291.8054612955511, - 293.35541416554884, - 294.90536703554665, - 290.2546619622298, - 291.803768368904, - 293.35287477557824, - 294.9019811822525, - 290.2175291254244, - 291.7295026952932, - 293.241476265162, - 294.75344983503084 + 278.4867205018107, + 279.9345521147325, + 281.3823837276543, + 282.83021534057616, + 278.40514059006733, + 279.7713922912458, + 281.1376439924242, + 282.50389569360266, + 278.2899925529969, + 279.54109621710495, + 280.7921998812129, + 282.04330354532095, + 278.14127639059944, + 279.24366389231, + 280.34605139402055, + 281.4484388957311, + 282.48400295505405, + 284.0402281323303, + 285.5964533096065, + 287.15267848688273, + 282.42691208418637, + 283.92604639059493, + 285.42518069700355, + 286.9243150034121, + 282.33617982988153, + 283.7445818819852, + 285.1529839340889, + 286.56138598619265, + 282.2118061921394, + 283.4958346065011, + 284.7798630208627, + 286.0638914352243, + 286.4159567501674, + 288.0152468336682, + 289.61453691716895, + 291.21382700066965, + 286.38347234586973, + 287.95027802507286, + 289.51708370427593, + 291.08388938347906, + 286.31728367005456, + 287.8179006734425, + 289.3185176768304, + 290.8191346802184, + 286.2173907227219, + 287.61811477877717, + 289.0188388348324, + 290.4195628908877, + 290.28233437813526, + 291.85911320071494, + 293.4358920232946, + 295.0126708458743, + 290.27455029016335, + 291.84354502477106, + 293.41253975937883, + 294.9815344939866, + 290.2330060952178, + 291.7604566348799, + 293.2879071745421, + 294.81535771420425, + 290.15770179329854, + 291.60984803104145, + 293.0619942687844, + 294.5141405065274 ], "condenser_liquid_leaving_temperature": [ - 287.3041865028172, - 288.3334346159627, - 289.4635761942988, - 290.69461123782565, - 296.4445255329944, - 297.4722912764596, - 298.6206395345684, - 299.8895703073208, - 305.4735516814918, - 306.44805138295544, - 307.545521987074, - 308.7659634938475, - 314.3993916542249, - 315.27154805319134, - 316.25333835298386, - 317.34476255360255, - 287.359714272393, - 288.45618286499854, - 289.65014673193645, - 290.94160587320675, - 296.5533861005892, - 297.6792146259412, - 298.92876376968223, - 300.3020335318124, - 305.6342423212154, - 306.73722691648845, - 307.97254220119237, - 309.34018817532717, - 314.60543795956403, - 315.6344813286859, - 316.78744551801134, - 318.0643305275404, - 287.3503027123597, - 288.459864252524, - 289.66038070018305, - 290.9518520553369, - 296.5880328574696, - 297.7546597076906, - 299.04321937840695, - 300.4537118696187, - 305.7153139242615, - 306.88765279666956, - 308.19572770339335, - 309.63953864443283, - 314.73034318601685, - 315.8565401427268, - 317.1147232326794, - 318.50489245587477, - 287.2842329291415, - 288.3554554330499, - 289.50957360311776, - 290.7465874393451, - 296.5566759133516, - 297.7095090696707, - 298.9791707313249, - 300.36566089831433, - 305.72490211818837, - 306.9101128449303, - 308.23010529301115, - 309.68487946243084, - 314.782167976585, - 315.94840892428147, - 317.250059797125, - 318.6871205951156 + 287.3712046644711, + 288.4675573684873, + 289.6598085693711, + 290.94795826712254, + 296.4784856708934, + 297.55670063908144, + 298.74500091706074, + 300.0433865048314, + 305.49138713086955, + 306.5033690804315, + 307.6268345572611, + 308.86178356135827, + 314.41634792437117, + 315.3164214221676, + 316.3176985493398, + 317.4201793058878, + 287.41159893708885, + 288.56405270567654, + 289.80806509852204, + 291.14363611562527, + 296.5558036498925, + 297.71345089983424, + 298.98059926614064, + 300.3572487488116, + 305.6061341944894, + 306.7211122817714, + 307.95082074148223, + 309.2952595736218, + 314.5666140569986, + 315.59261605928657, + 316.7265463108502, + 317.9684048116895, + 287.4066933193914, + 288.5731253606221, + 289.82589830382227, + 291.16501214899193, + 296.57987732697586, + 297.7718493143174, + 299.0704899939347, + 300.47579936582775, + 305.66130622435503, + 306.8317845748171, + 308.1169026050461, + 309.51666031504215, + 314.6525873087906, + 315.75522049533475, + 316.96836319556155, + 318.292015409471, + 287.36348714113024, + 288.50432356662503, + 289.7266349992476, + 291.03042143899796, + 296.55887358035915, + 297.7430368433533, + 299.0302229417288, + 300.4204318754858, + 305.66624261564823, + 306.8481264257636, + 308.14286247664063, + 309.55045076827923, + 314.68478714902113, + 315.818585011039, + 317.06317840842917, + 318.4185673411917 ], "evaporator_liquid_differential_pressure": [ 15000.0, diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-C.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-C.RS0001.a205.json index 78e5b7a..b603605 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-C.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-C.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'C': 37.5 ton, 2.64 COP liquid-cooled, positive displacement compressor chiller", "id": "04e19f33-6165-491c-a56a-f579bce281b5", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-D.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-D.RS0001.a205.json index e12ae3c..038338f 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-D.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-D.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'D': 112.5 ton, 2.53 COP liquid-cooled, positive displacement compressor chiller", "id": "40edea78-3bde-417d-b3d4-f4fda4cf54c2", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-E.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-E.RS0001.a205.json index f3f64b6..6e4566e 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-E.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-E.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'E': 225.0 ton, 2.32 COP liquid-cooled, positive displacement compressor chiller", "id": "0b2012ae-a354-4a6f-bf9a-81de03d39030", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-F.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-F.RS0001.a205.json index 1475dc4..388b2ce 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-F.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-F.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'F': 450.0 ton, 2.15 COP liquid-cooled, positive displacement compressor chiller", "id": "eb8cb70c-ecc7-47ef-8d0c-141da84ce4a7", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-G.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-G.RS0001.a205.json index 6b2b5b2..b46b413 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-G.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-G.RS0001.a205.json @@ -3,13 +3,13 @@ "data_model": "ASHRAE_205", "schema": "RS0001", "schema_version": "1.0.0", - "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'F': 600.0 ton, 1.97 COP liquid-cooled, positive displacement compressor chiller", - "id": "24b01636-b001-43f8-8d09-0218be5aba33", - "data_timestamp": "2022-12-01T11:35Z", + "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'G': 650.0 ton, 1.97 COP liquid-cooled, positive displacement compressor chiller", + "id": "2b97164d-8b25-4ca5-aaf1-3ad3e0c315c9", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", - "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'F' for Energy Cost Budget (ECB) Path A" + "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'G' for Energy Cost Budget (ECB) Path A" }, "description": { "product_information": { @@ -40,12 +40,12 @@ "evaporator_fouling_factor": 0.0, "condenser_fouling_factor": 0.0, "compressor_speed_control_type": "CONTINUOUS", - "maximum_power": 1169486.498546819, + "maximum_power": 1219036.8567386542, "cycling_degradation_coefficient": 0.0, "performance_map_cooling": { "grid_variables": { "evaporator_liquid_volumetric_flow_rate": [ - 0.09041229226999208 + 0.09794664995915807 ], "evaporator_liquid_leaving_temperature": [ 277.0388888888889, @@ -54,7 +54,7 @@ 288.7055555555556 ], "condenser_liquid_volumetric_flow_rate": [ - 0.1479375604941207 + 0.1602656905352974 ], "condenser_liquid_entering_temperature": [ 285.9277777777778, @@ -71,334 +71,334 @@ }, "lookup_variables": { "input_power": [ - 270011.13444558834, - 395427.39633018494, - 574869.9295782193, - 808338.7341896917, - 324212.11216545105, - 474803.94330971205, - 690267.0679549965, - 970601.4861013041, - 365345.93857708474, - 535043.8364254083, - 777843.4560217032, - 1093744.7973659695, - 387701.7769897492, - 567783.6380430326, - 825440.3793128066, - 1160672.0007990713, - 260335.88988913456, - 381258.14078569814, - 554270.7525544976, - 779373.7251955327, - 316450.28642615344, - 463436.86191449076, - 673741.6745659043, - 947364.724380394, - 361650.60360249586, - 529632.0718677358, - 769975.8658166854, - 1082681.9854493446, - 390646.1027232219, - 572095.5604425499, - 831709.0257170823, - 1169486.498546819, - 256219.4927527292, - 375229.7367895, - 545506.6957063227, - 767050.3695031974, - 311738.4459232619, - 456536.4397307641, - 663709.8830116676, - 933258.7757659726, - 357833.1262846253, - 524041.43161708623, - 761848.2272235706, - 1071253.5131040786, - 389632.8931376794, - 570611.7296769391, - 829551.8416280454, - 1166453.2289909986, - 259499.2761846602, - 380032.9321306042, - 552489.5517074921, - 776869.1349153239, - 312772.04647161125, - 458050.13276612153, - 665910.480685766, - 936353.0902305447, - 357447.0851048548, - 523476.0798996234, - 761026.322355519, - 1070097.8124725414, - 389073.8493810506, - 569793.0181909397, - 828361.6038785389, - 1164779.6064438478 + 305679.45962815103, + 436786.9572991618, + 618003.9609305538, + 849330.4705223272, + 383302.2575332188, + 547702.573792485, + 774936.9672313342, + 1065005.4378497663, + 429973.04312619363, + 614390.7001674628, + 869293.0956780586, + 1194680.2296579808, + 438739.14873854246, + 626916.633713795, + 887015.8697138323, + 1219036.8567386542, + 288269.0067977225, + 411909.07140439394, + 582804.5765038467, + 800955.5220960809, + 368659.16365408315, + 526778.9813839729, + 745332.4591999729, + 1024319.5971020827, + 420753.93654094887, + 601217.4711932812, + 850654.4720922507, + 1169064.9392378577, + 437688.5998691519, + 625415.4990130421, + 884891.9345196771, + 1216117.9063890572, + 279073.4741868504, + 398769.5274038452, + 564213.6133318427, + 775405.731970843, + 359671.6130445069, + 513936.6239383519, + 727161.9812668511, + 999347.6850300046, + 413990.9335654737, + 591553.7813416425, + 836981.4479652353, + 1150273.9334362522, + 435254.6522399477, + 621937.6186854637, + 879971.1286618826, + 1209355.182169205, + 279674.0312215316, + 399627.66644983186, + 565427.78266677, + 777074.3798723466, + 359022.17092551885, + 513008.6327431313, + 725848.9790703083, + 997543.2099070501, + 413467.9952158286, + 590806.5520352495, + 835924.2033214626, + 1148820.949074468, + 436322.66266202234, + 623463.7042889558, + 882130.3665510104, + 1212322.6494481869 ], "net_evaporator_capacity": [ - 518894.93915308674, - 1037789.8783061735, - 1556684.81745926, - 2075579.756612347, - 514946.69238052145, - 1029893.3847610429, - 1544840.0771415643, - 2059786.7695220858, - 493884.6485286696, - 987769.2970573392, - 1481653.945586009, - 1975538.5941146784, - 455708.80759753095, - 911417.6151950619, - 1367126.4227925928, - 1822835.2303901238, - 547898.5588469139, - 1095797.1176938277, - 1643695.6765407417, - 2191594.2353876554, - 548939.2507443076, - 1097878.5014886153, - 1646817.752232923, - 2195757.0029772306, - 532866.1455624145, - 1065732.291124829, - 1598598.4366872436, - 2131464.582249658, - 499679.24330123485, - 999358.4866024697, - 1499037.7299037045, - 1998716.9732049394, - 558792.0120469137, - 1117584.0240938275, - 1676376.0361407413, - 2235168.048187655, - 564821.6426142663, - 1129643.2852285325, - 1694464.9278427986, - 2259286.570457065, - 553737.476102332, - 1107474.952204664, - 1661212.428306996, - 2214949.904409328, - 525539.5125111112, - 1051079.0250222224, - 1576618.5375333335, - 2102158.050044445, - 551575.2987530864, - 1103150.5975061727, - 1654725.896259259, - 2206301.1950123454, - 562593.8679903977, - 1125187.7359807955, - 1687781.603971193, - 2250375.471961591, - 556498.6401484223, - 1112997.2802968447, - 1669495.920445267, - 2225994.5605936893, - 533289.6152271604, - 1066579.2304543208, - 1599868.845681481, - 2133158.4609086416 + 552588.9296942553, + 1105177.8593885107, + 1657766.789082766, + 2210355.7187770214, + 558114.4215674743, + 1116228.8431349485, + 1674343.2647024228, + 2232457.686269897, + 538888.6138577486, + 1077777.2277154971, + 1616665.8415732458, + 2155554.4554309943, + 494911.50656507816, + 989823.0131301563, + 1484734.5196952345, + 1979646.0262603126, + 574936.9587271772, + 1149873.9174543545, + 1724810.8761815317, + 2299747.834908709, + 588065.307696624, + 1176130.615393248, + 1764195.9230898719, + 2352261.230786496, + 576442.357083126, + 1152884.714166252, + 1729327.071249378, + 2305769.428332504, + 540068.1068866834, + 1080136.2137733668, + 1620204.32066005, + 2160272.4275467335, + 580880.7936312923, + 1161761.5872625846, + 1742642.3808938768, + 2323523.174525169, + 601611.9996969667, + 1203223.9993939335, + 1804835.9990909002, + 2406447.998787867, + 597591.9061796964, + 1195183.8123593929, + 1792775.7185390894, + 2390367.6247187858, + 568820.5130794814, + 1137641.0261589629, + 1706461.5392384443, + 2275282.0523179257, + 570420.4344066008, + 1140840.8688132016, + 1711261.3032198022, + 2281681.737626403, + 598754.4975685029, + 1197508.9951370058, + 1796263.4927055086, + 2395017.9902740116, + 602337.2611474603, + 1204674.5222949206, + 1807011.7834423808, + 2409349.0445898413, + 581168.725143473, + 1162337.450286946, + 1743506.175430419, + 2324674.900573892 ], "net_condenser_capacity": [ - 788906.0735986751, - 1433217.2746363585, - 2131554.7470374797, - 2883918.4908020385, - 839158.8045459725, - 1504697.328070755, - 2235107.145096561, - 3030388.25562339, - 859230.5871057543, - 1522813.1334827475, - 2259497.4016077123, - 3069283.391480648, - 843410.5845872802, - 1479201.2532380945, - 2192566.8021053993, - 2983507.231189195, - 808234.4487360484, - 1477055.2584795258, - 2197966.4290952394, - 2970967.960583188, - 865389.5371704611, - 1561315.363403106, - 2320559.426798827, - 3143121.7273576246, - 894516.7491649104, - 1595364.362992565, - 2368574.302503929, - 3214146.567699003, - 890325.3460244567, - 1571454.0470450195, - 2330746.755620787, - 3168203.4717517584, - 815011.504799643, - 1492813.7608833276, - 2221882.731847064, - 3002218.417690852, - 876560.0885375282, - 1586179.7249592966, - 2358174.810854466, - 3192545.3462230377, - 911570.6023869573, - 1631516.3838217503, - 2423060.6555305663, - 3286203.417513407, - 915172.4056487905, - 1621690.7546991615, - 2406170.379161379, - 3268611.2790354434, - 811074.5749377466, - 1483183.529636777, - 2207215.447966751, - 2983170.3299276694, - 875365.914462009, - 1583237.868746917, - 2353692.084656959, - 3186728.5621921355, - 913945.7252532771, - 1636473.360196468, - 2430522.242800786, - 3296092.3730662307, - 922363.4646082111, - 1636372.2486452605, - 2428230.44956002, - 3297938.0673524896 + 858268.3893224064, + 1541964.8166876724, + 2275770.75001332, + 3059686.1892993487, + 941416.6791006931, + 1663931.4169274336, + 2449280.2319337567, + 3297463.1241196636, + 968861.6569839423, + 1692167.92788296, + 2485958.9372513043, + 3350234.6850889754, + 933650.6553036206, + 1616739.6468439512, + 2371750.3894090666, + 3198682.8829989666, + 863205.9655248998, + 1561782.9888587485, + 2307615.4526853785, + 3100703.3570047896, + 956724.4713507071, + 1702909.5967772207, + 2509528.3822898446, + 3376580.8278885786, + 997196.2936240749, + 1754102.1853595332, + 2579981.5433416287, + 3474834.3675703616, + 977756.7067558353, + 1705551.7127864088, + 2505096.255179727, + 3376390.3339357907, + 859954.2678181427, + 1560531.1146664298, + 2306855.9942257195, + 3098928.906496012, + 961283.6127414736, + 1717160.6233322853, + 2531997.9803577513, + 3405795.6838178714, + 1011582.8397451702, + 1786737.5937010352, + 2629757.166504325, + 3540641.558155038, + 1004075.1653194291, + 1759578.6448444265, + 2586432.6679003267, + 3484637.234487131, + 850094.4656281325, + 1540468.5352630334, + 2276689.0858865725, + 3058756.11749875, + 957776.6684940218, + 1710517.6278801372, + 2522112.4717758168, + 3392561.200181062, + 1015805.256363289, + 1795481.0743301702, + 2642935.9867638433, + 3558169.9936643094, + 1017491.3878054954, + 1785801.1545759018, + 2625636.5419814293, + 3536997.5500220787 ], "evaporator_liquid_entering_temperature": [ - 278.40287213588306, - 279.7668553828772, - 281.1308386298714, - 282.49482187686556, - 278.39249365259786, - 279.74609841630684, - 281.0997031800158, - 282.4533079437247, - 278.33712931428255, - 279.63536973967615, - 280.9336101650698, - 282.23185059046347, - 278.23677912093706, - 279.4346693529853, - 280.63255958503345, - 281.83044981708167, - 282.3711439357035, - 283.8145100936292, - 285.25787625155493, - 286.70124240948064, - 282.3738855006178, - 283.8199932234578, - 285.2661009462978, - 286.7122086691378, - 282.3315430346673, - 283.73530829155675, - 285.13907354844616, - 286.54283880533563, - 282.2441165378519, - 283.560455297926, - 284.8767940580001, - 286.19313281807416, - 286.2914820101366, - 287.76629735360643, - 289.24111269707635, - 290.71592804054626, - 286.30739596646464, - 287.79812526626256, - 289.28885456606054, - 290.7795838658585, - 286.2781416133441, - 287.73961656002143, - 289.20109150669884, - 290.6625664533762, - 286.2037189507748, - 287.590771234883, - 288.9778235189912, - 290.3648758030994, - 290.16373555191024, - 291.6219155482649, - 293.08009554461955, - 294.5382755409742, - 290.19286495144394, - 291.6801743473323, - 293.16748374322066, - 294.65479313910896, - 290.17675121442113, - 291.6479468732866, - 293.1191425321522, - 294.5903381910177, - 290.11539434084176, - 291.52523312612794, - 292.9350719114141, - 294.3449106967003 + 278.37970640592454, + 279.7205239229602, + 281.06134143999583, + 282.4021589570315, + 278.39311361677466, + 279.7473383446604, + 281.1015630725462, + 282.45578780043195, + 278.3464635693866, + 279.65403824988425, + 280.96161293038193, + 282.26918761087967, + 278.23975626376034, + 279.4406236386318, + 280.6414910135032, + 281.84235838837463, + 282.3258656915147, + 283.72395360525155, + 285.12204151898845, + 286.52012943272535, + 282.35779021079094, + 283.787802643804, + 285.21781507681715, + 286.6478275098303, + 282.32952640459786, + 283.7312750314179, + 285.13302365823796, + 286.534772285058, + 282.2410742729355, + 283.55437076809324, + 284.8676672632509, + 286.1809637584086, + 286.2318489037976, + 287.6470311409285, + 289.0622133780594, + 290.4773956151904, + 286.2823557115628, + 287.74804475645897, + 289.2137338013551, + 290.67942284625127, + 286.2725616798103, + 287.72845669295396, + 289.1843517060976, + 290.64024671924125, + 286.20246680854007, + 287.58826695041347, + 288.9740670922869, + 290.3598672341603, + 290.0975557504279, + 291.4895559453002, + 292.8815561401725, + 294.2735563350448, + 290.1666995241497, + 291.62784349274375, + 293.08898746133787, + 294.550131429932, + 290.1754425622656, + 291.6453295689755, + 293.1152165756855, + 294.58510358239545, + 290.12378486477553, + 291.5420141739954, + 292.9602434832154, + 294.37847279243533 ], "condenser_liquid_leaving_temperature": [ - 287.20091444845815, - 288.240703904799, - 289.3676809612291, - 290.5818456177485, - 296.3609314946124, - 297.43882027310735, - 298.62177290116125, - 299.9097893787739, - 305.47199931578496, - 306.5501847864539, - 307.74714555448395, - 309.06288161987504, - 314.5247975123208, - 315.56116514344984, - 316.72398334834355, - 318.0132521270018, - 287.23210658145797, - 288.3114496458538, - 289.47485613786785, - 290.72232605749986, - 296.4034141028285, - 297.53051736168754, - 298.7601691806972, - 300.0923695598573, - 305.52933208840767, - 306.66806564688903, - 307.92437313585117, - 309.2982545552941, - 314.6012707016471, - 315.71154138219777, - 316.9492229407996, - 318.31431537745254, - 287.24304339495524, - 288.336880718014, - 289.5134522687374, - 290.7727580471254, - 296.42150563553855, - 297.5707870310734, - 298.8210900724851, - 300.17241475977374, - 305.55704110044144, - 306.72680526233876, - 308.0129022789153, - 309.4153321501709, - 314.6417725359663, - 315.7934294945504, - 317.0721668685955, - 318.4779846581016, - 287.236689977299, - 288.3213394502289, - 289.4897822050984, - 290.74201824190754, - 296.41957158245214, - 297.5660224777272, - 298.8138299664288, - 300.1629940485568, - 305.56090018772375, - 306.73485933177574, - 308.02502582711105, - 309.43139967372974, - 314.65349428827653, - 315.8173609956758, - 317.10812578405125, - 318.52578865340286 + 287.20630723634355, + 288.22478354745726, + 289.31790606519075, + 290.4856747895439, + 296.4092615325461, + 297.48941473041907, + 298.6635043227317, + 299.9315303094839, + 305.52903489402416, + 306.6138572949817, + 307.804393452744, + 309.100643367311, + 314.5548242348877, + 315.5826390438312, + 316.71867143745817, + 317.96292141576873, + 287.2136625539893, + 288.25430591744185, + 289.3653438957948, + 290.5467764890481, + 296.43214654773755, + 297.54768676752474, + 298.7535747792442, + 300.04981058289593, + 305.5715314819661, + 306.70674694989066, + 307.9454095525442, + 309.28751928992676, + 314.62118872532454, + 315.7162707634446, + 316.919311262207, + 318.2303102216118, + 287.208818624794, + 288.25244104853465, + 289.3642125596937, + 290.54413315827134, + 296.43896242414115, + 297.5689919272682, + 298.787166631337, + 300.09348653634754, + 305.5931085761135, + 306.75569388075195, + 308.0200635590156, + 309.38621761090445, + 314.6607889850202, + 315.79756277889015, + 317.0416946859422, + 318.3931847061764, + 287.1941308561282, + 288.2225545944823, + 289.3192740748733, + 290.48428929730113, + 296.4337195732409, + 297.5590607073146, + 298.7723878826855, + 300.07370109935357, + 305.59944140124963, + 306.76880744554524, + 308.0398292931326, + 309.4125069440116, + 314.6809758015581, + 315.8370186684792, + 317.1006830796179, + 318.47196903497434 ], "evaporator_liquid_differential_pressure": [ 15000.0, diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-H.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-H.RS0001.a205.json index 5c5493b..671a73f 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-H.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-H.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'H': 150.0 ton, 2.15 COP liquid-cooled, centrifugal compressor chiller", "id": "1093c9f2-ab07-4a51-b82a-a0c85bc6402b", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-I.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-I.RS0001.a205.json index 5dfd599..21c2930 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-I.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-I.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'I': 350.0 ton, 1.97 COP liquid-cooled, centrifugal compressor chiller", "id": "a8e91e7d-0a1a-4282-9bd3-11f390474874", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-J.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-J.RS0001.a205.json index 8607bdb..99f2f5b 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-J.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-J.RS0001.a205.json @@ -3,13 +3,13 @@ "data_model": "ASHRAE_205", "schema": "RS0001", "schema_version": "1.0.0", - "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'I': 400.0 ton, 1.97 COP liquid-cooled, centrifugal compressor chiller", - "id": "44e27932-97a8-47df-b59b-55ce265d741a", - "data_timestamp": "2022-12-01T11:35Z", + "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'J': 450.0 ton, 1.97 COP liquid-cooled, centrifugal compressor chiller", + "id": "9758c91b-2950-4500-9623-b630efa97f03", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", - "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'I' for Energy Cost Budget (ECB) Path A" + "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'J' for Energy Cost Budget (ECB) Path A" }, "description": { "product_information": { @@ -40,12 +40,12 @@ "evaporator_fouling_factor": 0.0, "condenser_fouling_factor": 0.0, "compressor_speed_control_type": "CONTINUOUS", - "maximum_power": 733082.0535738644, + "maximum_power": 875073.8889655578, "cycling_degradation_coefficient": 0.0, "performance_map_cooling": { "grid_variables": { "evaporator_liquid_volumetric_flow_rate": [ - 0.06027486151332805 + 0.06780921920249407 ], "evaporator_liquid_leaving_temperature": [ 277.0388888888889, @@ -54,7 +54,7 @@ 288.7055555555556 ], "condenser_liquid_volumetric_flow_rate": [ - 0.0986250403294138 + 0.11095317037059053 ], "condenser_liquid_entering_temperature": [ 285.9277777777778, @@ -71,334 +71,334 @@ }, "lookup_variables": { "input_power": [ - 228590.3760615254, - 323679.2380416423, - 470800.53504796047, - 669954.2670804801, - 237760.87767155262, - 336664.4783861191, - 489687.9315300281, - 696831.2371032798, - 233857.4027764505, - 331137.2387816781, - 481648.4064160499, - 685390.9056795662, - 222094.57157095702, - 314481.31342119037, - 457421.8955688277, - 650916.3180138686, - 224176.12400198594, - 317428.7485513458, - 461709.0226786541, - 657016.9463839111, - 242170.63570523233, - 342908.6044288765, - 498770.1880863132, - 709755.3866775425, - 245651.0634574154, - 347836.81804090703, - 505938.4130840381, - 719955.8485868085, - 239041.22686344595, - 338477.42632382107, - 492324.9151816468, - 700583.6934369231, - 214798.3164958407, - 304149.96735159267, - 442394.6627850354, - 629532.4027961689, - 239760.679091398, - 339496.15577762894, - 493806.68576051894, - 702692.2690400679, - 249504.86693490657, - 353293.7239467832, - 513875.6358596996, - 731250.6026736557, - 247663.89904145, - 350686.951538951, - 510084.01223941107, - 725855.0811428303, - 202353.32656016428, - 286528.11935773195, - 416763.19036116585, - 593058.539570466, - 232517.64827148966, - 329240.1741510487, - 478889.0726740262, - 681464.3438404219, - 247495.7210747294, - 350448.8150213014, - 509737.6359917338, - 725362.1839860268, - 250129.76339514012, - 354178.5643918983, - 515162.66111813975, - 733082.0535738644 + 219230.7620246768, + 305707.2829772948, + 443571.43716459395, + 632823.2245865747, + 251956.34072662005, + 351341.6075421321, + 509785.3746741032, + 727287.6421225335, + 253713.67211076504, + 353792.1258807821, + 513340.9979837183, + 732360.2884195738, + 228561.9434142272, + 318719.1891679354, + 462451.2946315881, + 659758.2598051854, + 226888.38590053143, + 316385.4896647582, + 459065.1716957747, + 654927.431993581, + 272328.35839247913, + 379749.4555643645, + 551004.2486611875, + 786092.7376829479, + 285090.92087181006, + 397546.2659360086, + 576826.8482296846, + 822932.667752838, + 268098.66963543417, + 373851.34780880105, + 542446.2839695801, + 773883.4781177711, + 225882.99145298614, + 314983.5130350143, + 457030.9486884908, + 652025.2984134157, + 279481.62494820624, + 389724.35900842387, + 565477.5128018657, + 806741.0863285318, + 300296.72330151603, + 418750.0628089664, + 607592.875655281, + 866825.1618404598, + 290114.29186962, + 404551.12732017227, + 586990.6768472154, + 837432.9404507496, + 219658.08431911375, + 306303.16439640534, + 444436.0419423421, + 634056.7169569242, + 277049.5302438196, + 386332.91404351586, + 560556.6352143317, + 799720.6937562672, + 303154.35346284625, + 422734.89752972464, + 613374.7426972952, + 875073.8889655578, + 298621.9683926927, + 416414.69359298167, + 604204.3300198758, + 861990.877673375 ], "net_evaporator_capacity": [ - 383053.2683962469, - 766106.5367924938, - 1149159.8051887406, - 1532213.0735849875, - 345658.4487096261, - 691316.8974192522, - 1036975.3461288783, - 1382633.7948385044, - 319962.4006305041, - 639924.8012610083, - 959887.2018915124, - 1279849.6025220165, - 305965.12415888096, - 611930.2483177619, - 917895.372476643, - 1223860.4966355239, - 409966.48783591785, - 819932.9756718357, - 1229899.4635077536, - 1639865.9513436714, - 378516.1995495714, - 757032.3990991428, - 1135548.5986487141, - 1514064.7981982855, - 358764.6828707238, - 717529.3657414475, - 1076294.0486121713, - 1435058.731482895, - 350711.93779937504, - 701423.8755987501, - 1052135.813398125, - 1402847.7511975002, - 424667.97679986816, - 849335.9535997363, - 1274003.9303996046, - 1698671.9071994727, - 399162.21991379606, - 798324.4398275921, - 1197486.6597413882, - 1596648.8796551842, - 385355.23463522276, - 770710.4692704455, - 1156065.7039056683, - 1541420.938540891, - 383247.02096414834, - 766494.0419282967, - 1149741.062892445, - 1532988.0838565934, - 427157.7352880986, - 854315.4705761973, - 1281473.2058642958, - 1708630.9411523945, - 407596.5098023009, - 815193.0196046018, - 1222789.5294069026, - 1630386.0392092036, - 399734.05592400196, - 799468.1118480039, - 1199202.1677720058, - 1598936.2236960079, - 403570.3736532019, - 807140.7473064038, - 1210711.1209596058, - 1614281.4946128076 + 401365.9470278522, + 802731.8940557044, + 1204097.8410835564, + 1605463.7881114087, + 374998.9008808151, + 749997.8017616302, + 1124996.7026424455, + 1499995.6035232604, + 341790.679505383, + 683581.359010766, + 1025372.038516149, + 1367162.718021532, + 301741.2829015559, + 603482.5658031118, + 905223.8487046676, + 1206965.1316062235, + 452239.8437119264, + 904479.6874238529, + 1356719.5311357793, + 1808959.3748477057, + 432434.74115130916, + 864869.4823026183, + 1297304.2234539276, + 1729738.9646052367, + 405788.46336229687, + 811576.9267245937, + 1217365.3900868907, + 1623153.8534491875, + 372301.0103448895, + 744602.020689779, + 1116903.0310346684, + 1489204.041379558, + 472669.5133737778, + 945339.0267475556, + 1418008.5401213334, + 1890678.0534951112, + 459426.3543995802, + 918852.7087991604, + 1378279.0631987406, + 1837705.4175983209, + 439342.02019698755, + 878684.0403939751, + 1318026.0605909626, + 1757368.0807879502, + 412416.5107659999, + 824833.0215319998, + 1237249.5322979996, + 1649666.0430639996, + 462654.95601340715, + 925309.9120268143, + 1387964.8680402215, + 1850619.8240536286, + 455973.7406256294, + 911947.4812512588, + 1367921.221876888, + 1823894.9625025175, + 442451.35000945657, + 884902.7000189131, + 1327354.0500283698, + 1769805.4000378263, + 422087.7841648887, + 844175.5683297775, + 1266263.3524946661, + 1688351.136659555 ], "net_condenser_capacity": [ - 611643.6444577723, - 1089785.774834136, - 1619960.340236701, - 2202167.3406654675, - 583419.3263811787, - 1027981.3758053713, - 1526663.2776589063, - 2079465.031941784, - 553819.8034069546, - 971062.0400426863, - 1441535.6083075623, - 1965240.5082015828, - 528059.695729838, - 926411.5617389523, - 1375317.2680454706, - 1874776.8146493924, - 634142.6118379037, - 1137361.7242231816, - 1691608.4861864077, - 2296882.8977275826, - 620686.8352548038, - 1099941.0035280192, - 1634318.7867350273, - 2223820.184875828, - 604415.7463281392, - 1065366.1837823545, - 1582232.4616962094, - 2155014.5800697035, - 589753.164662821, - 1039901.3019225711, - 1544460.728579772, - 2103431.444634423, - 639466.2932957088, - 1153485.920951329, - 1716398.59318464, - 2328204.3099956415, - 638922.8990051941, - 1137820.595605221, - 1691293.3455019072, - 2299341.148695252, - 634860.1015701294, - 1124004.1932172286, - 1669941.339765368, - 2272671.5412145467, - 630910.9200055983, - 1117180.9934672476, - 1659825.075131856, - 2258843.1649994235, - 629511.0618482629, - 1140843.5899339293, - 1698236.3962254617, - 2301689.4807228604, - 640114.1580737906, - 1144433.1937556504, - 1701678.6020809289, - 2311850.3830496254, - 647229.7769987313, - 1149916.9268693053, - 1708939.8037637395, - 2324298.4076820347, - 653700.137048342, - 1161319.3116983022, - 1725873.7820777455, - 2347363.548186672 + 620596.709052529, + 1108439.1770329992, + 1647669.2782481504, + 2238287.0126979835, + 626955.2416074352, + 1101339.4093037623, + 1634782.0773165487, + 2227283.245645794, + 595504.351616148, + 1037373.484891548, + 1538713.0364998672, + 2099523.006441106, + 530303.2263157831, + 922201.7549710472, + 1367675.1433362558, + 1866723.3914114088, + 679128.2296124578, + 1220865.177088611, + 1815784.702831554, + 2463886.806841287, + 704763.0995437882, + 1244618.9378669828, + 1848308.472115115, + 2515831.7022881843, + 690879.3842341069, + 1209123.1926606023, + 1794192.2383165753, + 2446086.5212020255, + 640399.6799803236, + 1118453.36849858, + 1659349.3150042486, + 2263087.519497329, + 698552.5048267639, + 1260322.5397825697, + 1875039.4888098242, + 2542703.351908527, + 738907.9793477864, + 1308577.0678075843, + 1943756.5760006062, + 2644446.5039268527, + 739638.7434985036, + 1297434.1032029414, + 1925618.9362462438, + 2624193.24262841, + 702530.8026356199, + 1229384.148852172, + 1824240.2091452149, + 2487098.9835147494, + 682313.0403325208, + 1231613.0764232196, + 1832400.9099825637, + 2484676.541010553, + 733023.270869449, + 1298280.3952947746, + 1928477.8570912196, + 2623615.6562587847, + 745605.7034723028, + 1307637.5975486378, + 1940728.792725665, + 2644879.2890033843, + 720709.7525575814, + 1260590.261922759, + 1870467.6825145418, + 2550342.0143329296 ], "evaporator_liquid_entering_temperature": [ - 278.5492473488835, - 280.05960580887813, - 281.56996426887275, - 283.08032272886743, - 278.4018015836767, - 279.7647142784645, - 281.1276269732523, - 282.49053966804007, - 278.3004834464703, - 279.56207800405167, - 280.8236725616331, - 282.0852671192145, - 278.2452929372643, - 279.4516969856397, - 280.6581010340152, - 281.8645050823906, - 282.54778136659365, - 284.1677849554095, - 285.7877885442254, - 287.40779213304126, - 282.42350394049936, - 283.9192301032209, - 285.41495626594246, - 286.91068242866396, - 282.3454548100126, - 283.76313184224745, - 285.18080887448224, - 286.5984859067171, - 282.3136339751335, - 283.69949017248916, - 285.0853463698449, - 286.4712025672006, - 286.4979009217087, - 288.1791351767508, - 289.86036943179283, - 291.5416036868349, - 286.3969252076914, - 287.97718374871624, - 289.557442289741, - 291.13770083076577, - 286.3422642069159, - 287.86786174716514, - 289.39345928741443, - 290.91905682766367, - 286.33391791938215, - 287.8511691720976, - 289.3684204248131, - 290.88567167752853, - 290.3994481200704, - 292.0933406845852, - 293.78723324910004, - 295.4811258136149, - 290.32187814611024, - 291.93820073666484, - 293.5545233272195, - 295.1708459177741, - 290.2906996116648, - 291.87584366777406, - 293.4609877238833, - 295.0461317799926, - 290.3059125167343, - 291.90626947791293, - 293.50662643909163, - 295.1069834002703 + 278.4456127716424, + 279.85233665439597, + 281.2590605371495, + 282.665784419903, + 278.3532004636044, + 279.66751203831996, + 280.9818236130355, + 282.296135187751, + 278.23681092319, + 279.434732957491, + 280.6326549917921, + 281.8305770260932, + 278.096444150399, + 279.1539994119092, + 280.2115546734193, + 281.2691099349295, + 282.51626570774096, + 284.10475363770416, + 285.6932415676673, + 287.2817294976305, + 282.44670048298985, + 283.96562318820196, + 285.484545893414, + 287.0034685986261, + 282.3531056986408, + 283.77843361950374, + 285.2037615403667, + 286.6290894612297, + 282.23548135469366, + 283.5431849316095, + 284.8508885085254, + 286.1585920854412, + 286.48001721734363, + 288.1433677680206, + 289.80671831869756, + 291.47006886937453, + 286.433413797514, + 288.0501609283613, + 289.66690805920865, + 291.2836551900559, + 286.362735898029, + 287.9088051293913, + 289.4548743607536, + 291.0009435921159, + 286.26798351888857, + 287.71930037111053, + 289.17061722333244, + 290.62193407555435, + 290.33636148806244, + 291.96716742056935, + 293.5979733530762, + 295.22877928558313, + 290.3128109661257, + 291.92006637669584, + 293.527321787266, + 295.1345771978361, + 290.2651460820649, + 291.82473660857426, + 293.3843271350836, + 294.94391766159293, + 290.1933668358801, + 291.6811781162046, + 293.1689893965291, + 294.6568006768536 ], "condenser_liquid_leaving_temperature": [ - 287.4083836050259, - 288.5658223046721, - 289.8492159246445, - 291.2585644649431, - 296.41918786509916, - 297.49918945963026, - 298.71066769953666, - 300.0536225848184, - 305.4256912309259, - 306.44259075551304, - 307.58922526633575, - 308.865594763394, - 314.4411418874382, - 315.4151393053488, - 316.51274430268023, - 317.7339568794324, - 287.4628468574637, - 288.68098940980036, - 290.0226545982348, - 291.48784242276696, - 296.5097240884674, - 297.67400535492084, - 298.9722017679819, - 300.4043133276505, - 305.5490032683588, - 306.6724280790513, - 307.9321305399616, - 309.32811065108956, - 314.5919866168597, - 315.6926294424119, - 316.9263115729114, - 318.2930330083582, - 287.47573389366573, - 288.7200212543257, - 290.08266401256003, - 291.56366216836875, - 296.55402606600666, - 297.7660285492006, - 299.11061352489105, - 300.587780993078, - 305.6232020134848, - 306.8153401782622, - 308.14589393345153, - 309.61486327905277, - 314.6926201292177, - 315.88158354667036, - 317.20838525010134, - 318.67302523951065, - 287.45163526397135, - 288.68941796245144, - 290.03869878068514, - 291.49947771867244, - 296.5569200640329, - 297.7820929356135, - 299.1358430596196, - 300.61817043605134, - 305.65334928995435, - 306.8784944905965, - 308.2409406857155, - 309.7406878753114, - 314.7483413155603, - 315.9895047381001, - 317.3698788328129, - 318.8894635996986 + 287.26313645470987, + 288.31284339496784, + 289.47312282284287, + 290.74397473833506, + 296.3557189247264, + 297.3801191720078, + 298.53205222170556, + 299.8115180738196, + 305.366022424371, + 306.3232846510239, + 307.40938317961843, + 308.6243180101545, + 314.30255775322667, + 315.1543075923098, + 316.1224967002349, + 317.2071250770019, + 287.3890806834072, + 288.5547541761517, + 289.8348623997193, + 291.22940535411016, + 296.523739685827, + 297.6895215392986, + 298.99314790433544, + 300.43461878093757, + 305.5726422337571, + 306.6953620271178, + 307.96285155108336, + 309.37511080565383, + 314.5418407048983, + 315.580839635733, + 316.75641954152593, + 318.06858042227697, + 287.43087654547384, + 288.63965590198046, + 289.9623629027862, + 291.39899754789093, + 296.5974732243734, + 297.8276347576317, + 299.1992615731319, + 300.71235367087394, + 305.6782741715972, + 306.88667817141794, + 308.24757343823853, + 309.76095997205897, + 314.67687610272253, + 315.82193590787205, + 317.1147923913367, + 318.5554455531166, + 287.3959335470583, + 288.5778807903053, + 289.8706160478988, + 291.27413931983875, + 296.5847655978738, + 297.80539979578737, + 299.1662682219732, + 300.66737087643145, + 305.6912009523129, + 306.90878295082314, + 308.2803073265522, + 309.80577407950017, + 314.7163861200831, + 315.88975908107324, + 317.2152628961346, + 318.6928975652672 ], "evaporator_liquid_differential_pressure": [ 15000.0, diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-M.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-M.RS0001.a205.json index a3010f4..d4984aa 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-M.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-M.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'M': 37.5 ton, 2.74 COP liquid-cooled, positive displacement compressor chiller", "id": "8a5c95f4-cd8c-459d-bdf4-02077b5790a7", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-N.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-N.RS0001.a205.json index 1c2647e..57e8048 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-N.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-N.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'N': 112.5 ton, 2.64 COP liquid-cooled, positive displacement compressor chiller", "id": "dd55891b-2d56-4f94-ac63-7e6ec43561d8", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-O.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-O.RS0001.a205.json index 7127568..de2d1f6 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-O.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-O.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'O': 225.0 ton, 2.39 COP liquid-cooled, positive displacement compressor chiller", "id": "5f1cd888-7227-4807-8f81-d4ce0701d1fc", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-P.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-P.RS0001.a205.json index 43c0e55..9fbef2d 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-P.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-P.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'P': 450.0 ton, 2.20 COP liquid-cooled, positive displacement compressor chiller", "id": "ffe769c3-76fe-455f-b093-1b472e704598", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Q.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Q.RS0001.a205.json index e10ff58..d202334 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Q.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Q.RS0001.a205.json @@ -3,13 +3,13 @@ "data_model": "ASHRAE_205", "schema": "RS0001", "schema_version": "1.0.0", - "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'P': 600.0 ton, 2.06 COP liquid-cooled, positive displacement compressor chiller", - "id": "0b28764a-f376-4018-8fa9-6ddb944783b5", - "data_timestamp": "2022-12-01T11:35Z", + "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'Q': 650.0 ton, 2.06 COP liquid-cooled, positive displacement compressor chiller", + "id": "64e58cf4-ab9c-4592-9ef6-f8da9794b399", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", - "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'P' for Energy Cost Budget (ECB) Path B" + "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'Q' for Energy Cost Budget (ECB) Path B" }, "description": { "product_information": { @@ -40,12 +40,12 @@ "evaporator_fouling_factor": 0.0, "condenser_fouling_factor": 0.0, "compressor_speed_control_type": "CONTINUOUS", - "maximum_power": 1127059.3805602617, + "maximum_power": 1176816.6468833599, "cycling_degradation_coefficient": 0.0, "performance_map_cooling": { "grid_variables": { "evaporator_liquid_volumetric_flow_rate": [ - 0.09041229226999208 + 0.09794664995915807 ], "evaporator_liquid_leaving_temperature": [ 277.0388888888889, @@ -54,7 +54,7 @@ 288.7055555555556 ], "condenser_liquid_volumetric_flow_rate": [ - 0.14580849807760315 + 0.15795920625073676 ], "condenser_liquid_entering_temperature": [ 285.9277777777778, @@ -71,334 +71,334 @@ }, "lookup_variables": { "input_power": [ - 147359.59438201183, - 286412.39406224946, - 498749.6131640457, - 784371.2516874003, - 174051.89618446576, - 338292.328275791, - 589091.7130745553, - 926450.0505807583, - 195381.07619137375, - 379748.34296409483, - 661281.9245240664, - 1039981.8208712885, - 208372.53441843306, - 404998.9190719914, - 705252.4904879318, - 1109133.2486662539, - 143827.0678681632, - 279546.47277519095, - 486793.5119026213, - 765568.1852504541, - 171567.5557124133, - 333463.6918693844, - 580683.2761851876, - 913226.3086598227, - 195114.76919976127, - 379230.740948813, - 660380.5885126137, - 1038564.3118911629, - 211740.31149982996, - 411544.6285698767, - 716650.984923354, - 1127059.3805602617, - 142442.7854950236, - 276855.94128851173, - 482108.30425795744, - 758199.8744033605, - 169714.6263520214, - 329862.28446619696, - 574411.8976190928, - 903363.4658107089, - 193594.97516488042, - 376276.82505458675, - 655236.7314725296, - 1030474.6944187082, - 211601.63825714935, - 411275.0992216514, - 716181.6349198255, - 1126321.2453516712, - 144366.246290523, - 280594.4356406048, - 488618.4017627363, - 768438.1446569174, - 170113.16220377735, - 330636.89034034964, - 575760.7721374362, - 905484.8075950366, - 192902.30325977632, - 374930.5277912663, - 652892.3313934639, - 1026787.7140663688, - 210497.67893599387, - 409129.41177289403, - 712445.2016954795, - 1120445.0487037497 + 137783.85596047845, + 294205.7235769524, + 519441.0260559556, + 813489.7633974884, + 172672.8235706559, + 368703.0867771039, + 650971.3930001198, + 1019477.742239704, + 194339.2471435776, + 414966.7493822831, + 732653.1634312622, + 1147398.4892905161, + 199321.91240966102, + 425606.08466384385, + 751437.6628217433, + 1176816.6468833599, + 129831.12145720041, + 277224.48878248245, + 489459.4542561487, + 766536.0178781992, + 165809.93030165258, + 354048.9571915763, + 625098.4901370576, + 978958.529138097, + 189853.38559256573, + 405388.22413139994, + 715741.5992239801, + 1120913.510870306, + 198601.60369161807, + 424068.03112256824, + 748722.1204458309, + 1172563.8716614062, + 125805.33613379025, + 268628.350462917, + 474282.3637001042, + 742767.3758453521, + 161760.8624124514, + 345403.1043095352, + 609833.6250026388, + 955052.4244917629, + 186726.60563872854, + 398711.70493855304, + 703953.7320885278, + 1102452.6870886532, + 197444.01280556107, + 421596.2621198473, + 744358.0373432433, + 1165729.33847575, + 126367.55299846313, + 269828.83522454026, + 476401.9045056352, + 746086.7608417481, + 161688.56796340516, + 345248.73614685034, + 609561.0770867096, + 954625.5907829831, + 186623.75039455708, + 398492.0812291989, + 703565.9708867875, + 1101845.419367323, + 198015.87791611906, + 422817.3484907237, + 746513.9517478966, + 1169105.6876876384 ], "net_evaporator_capacity": [ - 523756.3245919015, - 1047512.649183803, - 1571268.9737757044, - 2095025.298367606, - 514631.0345321484, - 1029262.0690642968, - 1543893.1035964452, - 2058524.1381285936, - 490390.00492013193, - 980780.0098402639, - 1471170.0147603957, - 1961560.0196805277, - 451033.235755852, - 902066.471511704, - 1353099.707267556, - 1804132.943023408, - 558000.8372753584, - 1116001.6745507168, - 1674002.5118260751, - 2232003.3491014335, - 553194.3299448234, - 1106388.6598896468, - 1659582.9898344702, - 2212777.3197792936, - 533272.0830620249, - 1066544.1661240498, - 1599816.2491860748, - 2133088.3322480996, - 498234.0966269632, - 996468.1932539264, - 1494702.2898808895, - 1992936.3865078527, - 572188.540018074, - 1144377.080036148, - 1716565.620054222, - 2288754.160072296, - 571700.8154167573, - 1143401.6308335145, - 1715102.4462502718, - 2286803.261667029, - 556097.3512631768, - 1112194.7025263535, - 1668292.0537895304, - 2224389.405052707, - 525378.1475573331, - 1050756.2951146662, - 1576134.4426719993, - 2101512.5902293324, - 566319.4328200493, - 1132638.8656400987, - 1698958.298460148, - 2265277.7312801974, - 570150.4909479506, - 1140300.9818959013, - 1710451.472843852, - 2280601.9637918025, - 558865.8095235883, - 1117731.6190471766, - 1676597.4285707648, - 2235463.238094353, - 532465.3885469628, - 1064930.7770939255, - 1597396.1656408883, - 2129861.554187851 + 553665.0499090044, + 1107330.0998180087, + 1660995.149727013, + 2214660.1996360174, + 559421.0186930601, + 1118842.0373861203, + 1678263.0560791804, + 2237684.0747722406, + 539578.685246846, + 1079157.370493692, + 1618736.055740538, + 2158314.740987384, + 494138.0495703622, + 988276.0991407244, + 1482414.1487110867, + 1976552.1982814488, + 575077.918876206, + 1150155.837752412, + 1725233.756628618, + 2300311.675504824, + 588416.5780267912, + 1176833.1560535824, + 1765249.7340803738, + 2353666.312107165, + 576156.9349471068, + 1152313.8698942135, + 1728470.8048413203, + 2304627.739788427, + 538298.9896371524, + 1076597.9792743048, + 1614896.9689114573, + 2153195.9585486096, + 580449.5948491689, + 1160899.1896983378, + 1741348.7845475068, + 2321798.3793966756, + 601370.9443662837, + 1202741.8887325674, + 1804112.8330988511, + 2405483.777465135, + 596693.9916531284, + 1193387.9833062568, + 1790081.974959385, + 2386775.9666125136, + 566418.7367097036, + 1132837.4734194071, + 1699256.2101291106, + 2265674.9468388143, + 569780.077827893, + 1139560.155655786, + 1709340.233483679, + 2279120.311311572, + 598284.1177115372, + 1196568.2354230743, + 1794852.3531346116, + 2393136.4708461487, + 601189.8553649116, + 1202379.7107298232, + 1803569.5660947347, + 2404759.4214596464, + 578497.2907880164, + 1156994.5815760328, + 1735491.8723640493, + 2313989.1631520656 ], "net_condenser_capacity": [ - 671115.9189739133, - 1333925.0432460525, - 2070018.58693975, - 2879396.5500550065, - 688682.9307166141, - 1367554.3973400877, - 2132984.8166710003, - 2984974.1887093517, - 685771.0811115056, - 1360528.3528043586, - 2132451.939284462, - 3001541.8405518164, - 659405.770174285, - 1307065.3905836954, - 2058352.1977554879, - 2913266.1916896617, - 701827.9051435216, - 1395548.1473259078, - 2160796.0237286966, - 2997571.5343518876, - 724761.8856572367, - 1439852.3517590312, - 2240266.2660196577, - 3126003.6284391163, - 728386.8522617861, - 1445774.9070728628, - 2260196.8376986887, - 3171652.6441392624, - 709974.4081267931, - 1408012.821823803, - 2211353.2748042434, - 3119995.767068114, - 714631.3255130976, - 1421233.0213246597, - 2198673.9243121794, - 3046954.034475656, - 741415.4417687787, - 1473263.9152997115, - 2289514.343869365, - 3190166.7274777377, - 749692.3264280572, - 1488471.5275809402, - 2323528.78526206, - 3254864.0994714154, - 736979.7858144825, - 1462031.3943363177, - 2292316.077591825, - 3227833.8355810037, - 710685.6791105723, - 1413233.3012807034, - 2187576.7002228843, - 3033715.875937115, - 740263.653151728, - 1470937.872236251, - 2286212.244981288, - 3186086.771386839, - 751768.1127833646, - 1492662.146838443, - 2329489.7599642286, - 3262250.9521607216, - 742963.0674829567, - 1474060.1888668195, - 2309841.3673363677, - 3250306.6028916007 + 691448.9058694828, + 1401535.8233949612, + 2180436.1757829688, + 3028149.9630335057, + 732093.842263716, + 1487545.1241632241, + 2329234.4490793003, + 3257161.8170119445, + 733917.9323904237, + 1494124.1198759752, + 2351389.2191718, + 3305713.2302779006, + 693459.9619800232, + 1413882.1838045684, + 2233851.81153283, + 3153368.8451648084, + 704909.0403334064, + 1427380.3265348945, + 2214693.2108847667, + 3066847.693383023, + 754226.5083284439, + 1530882.1132451587, + 2390348.2242174316, + 3332624.841245262, + 766010.3205396725, + 1557702.0940256135, + 2444212.4040653002, + 3425541.250658733, + 736900.5933287705, + 1500666.010396873, + 2363619.089357288, + 3325759.830210016, + 706254.9309829591, + 1429527.5401612548, + 2215631.148247611, + 3064565.755242028, + 763131.8067787351, + 1548144.9930421025, + 2413946.45810149, + 3360536.201956898, + 783420.597291857, + 1592099.6882448099, + 2494035.7070479128, + 3489228.6537011666, + 763862.7495152646, + 1554433.7355392545, + 2443614.2474723537, + 3431404.2853145646, + 696147.6308263561, + 1409388.9908803261, + 2185742.1379893143, + 3025207.07215332, + 759972.6856749423, + 1541816.9715699246, + 2404413.430221321, + 3347762.061629132, + 787813.6057594686, + 1600871.7919590222, + 2507135.536981522, + 3506604.8408269696, + 776513.1687041355, + 1579811.9300667564, + 2482005.824111946, + 3483094.8508397043 ], "evaporator_liquid_entering_temperature": [ - 278.41565092364027, - 279.79241295839165, - 281.16917499314303, - 282.5459370278944, - 278.39166390463834, - 279.7444389203878, - 281.0972139361372, - 282.4499889518867, - 278.3279431862697, - 279.61699748365055, - 280.90605178103135, - 282.1951060784122, - 278.2244887685344, - 279.41008864817985, - 280.59568852782536, - 281.78128840747087, - 282.39775704969355, - 283.86773632160924, - 285.337715593525, - 286.80769486544074, - 282.3850949429829, - 283.842412108188, - 285.2997292733931, - 286.7570464385982, - 282.3326124232242, - 283.7374470686705, - 285.1422817141169, - 286.54711635956323, - 282.2403094904173, - 283.5528412030568, - 284.86537291569624, - 286.17790462833574, - 286.326839360591, - 287.83701205451536, - 289.3471847484397, - 290.85735744236405, - 286.3255521129033, - 287.83443755914, - 289.3433230053766, - 290.85220845161325, - 286.2843700132153, - 287.7520733597639, - 289.2197767063126, - 290.6874800528612, - 286.20329306152695, - 287.58991945638724, - 288.9765458512476, - 290.36317224610787, - 290.20271409465613, - 291.6998726337566, - 293.1970311728572, - 294.69418971195773, - 290.2128421267482, - 291.7201286979408, - 293.2274152691335, - 294.73470184032607, - 290.1830092158919, - 291.6604628762282, - 293.13791653656455, - 294.61537019690087, - 290.1132153620872, - 291.52087516861883, - 292.92853497515046, - 294.3361947816821 + 278.3823175346621, + 279.72574618043524, + 281.06917482620844, + 282.41260347198164, + 278.39628398125274, + 279.7536790736166, + 281.1110741659805, + 282.4684692583443, + 278.3481379782587, + 279.65738706762846, + 280.9666361569983, + 282.2758852463681, + 278.2378795256799, + 279.4368701624709, + 280.6358607992619, + 281.8348514360529, + 282.3262084676707, + 283.7246391575637, + 285.1230698474566, + 286.5215005373495, + 282.35864440322996, + 283.7895110286821, + 285.2203776541342, + 286.65124427958636, + 282.3288323367829, + 283.729886895788, + 285.1309414547931, + 286.5319960137982, + 282.2367722683296, + 283.54576675888137, + 284.8547612494332, + 286.163755739985, + 286.2307983872995, + 287.64493010793234, + 289.0590618285652, + 290.473193549198, + 286.28176843578115, + 287.7468702048956, + 289.21197197401005, + 290.6770737431245, + 286.2703741179174, + 287.72408156916816, + 289.1777890204189, + 290.63149647166966, + 286.19661543370836, + 287.5765642007501, + 288.9565129677918, + 290.3364617348335, + 290.09599308466665, + 291.48643061377777, + 292.87686814288884, + 294.26730567199996, + 290.16555165353867, + 291.6255477515218, + 293.0855438495049, + 294.545539947488, + 290.1726425414799, + 291.6397295274042, + 293.1068165133285, + 294.5739034992528, + 290.11726574849024, + 291.52897594142496, + 292.9406861343596, + 294.3523963272943 ], "condenser_liquid_leaving_temperature": [ - 287.02663909345574, - 288.1118991591901, - 289.31715252454313, - 290.6423991895148, - 296.1335111265538, - 297.2490479828768, - 298.50682045630435, - 299.9068285468365, - 305.20643305104653, - 306.31878369455757, - 307.59131492050244, - 309.02402672888115, - 314.2405561975469, - 315.3116860615632, - 316.55419942852967, - 317.9680962984464, - 287.0769258063399, - 288.21279863618196, - 289.46578826809144, - 290.83589470206834, - 296.19279687643814, - 297.3678496069784, - 298.6831077457723, - 300.1385712928199, - 305.2766859885863, - 306.4593143171617, - 307.80190489991804, - 309.3044577368552, - 314.32418898332924, - 315.4786376591148, - 316.8072397875225, - 318.30999536855256, - 287.09788967108324, - 288.25485413455016, - 289.5278081941482, - 290.91675184987736, - 296.2201623742454, - 297.42275223934615, - 298.7640332944887, - 300.244005539673, - 305.3118084821012, - 306.5297005364592, - 307.9063088620276, - 309.44163345880634, - 314.3688517438577, - 315.5679761085199, - 316.9411398689965, - 318.4883430252877, - 287.0914292101189, - 288.2417556777202, - 289.5096379944578, - 290.8950761603317, - 296.21826972929534, - 297.41893003309025, - 298.75860721135814, - 300.237301264099, - 305.3152304567652, - 306.53660885478837, - 307.9161356461529, - 309.45381083085874, - 314.3787471757759, - 315.5878698932236, - 316.97012401534346, - 318.5255095421353 + 286.9728428466552, + 288.0460776541347, + 289.2233180019134, + 290.50456388999146, + 296.1123069846385, + 297.25819116659204, + 298.5348830018555, + 299.94238249042905, + 305.1927365324979, + 306.34955025225565, + 307.6540595349478, + 309.1062643805744, + 314.20865533927343, + 315.3084720172084, + 316.560260544347, + 317.9640209206892, + 286.9931866728313, + 288.08513937977307, + 289.27509454020037, + 290.5630521541131, + 296.14587827183556, + 297.3239256109861, + 298.62758164425395, + 300.0568463716391, + 305.2415718557589, + 306.44629752159057, + 307.7953095478576, + 309.28860793456, + 314.27497301994737, + 315.4409586298777, + 316.75836689375984, + 318.2271978115938, + 286.9952208698521, + 288.08838470699436, + 289.27651215120005, + 290.5596032024693, + 296.15938601333295, + 297.35011030531155, + 298.66337593513373, + 300.09918290279944, + 305.2680652562905, + 306.49864070107856, + 307.8711261899775, + 309.38552172298745, + 314.3161342003617, + 315.5230419402682, + 316.880489735593, + 318.38847758633625, + 286.9799445620228, + 288.0579470358769, + 289.23133750373285, + 290.50011596559057, + 296.15459419288277, + 297.34051183101974, + 298.64891604061006, + 300.07980682165385, + 305.27475014329883, + 306.51198930320095, + 307.89106033842717, + 309.4119632489775, + 314.33544668349356, + 315.56178500058985, + 316.939099388379, + 318.467389846861 ], "evaporator_liquid_differential_pressure": [ 15000.0, diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-R.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-R.RS0001.a205.json index f16773b..76ff6ee 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-R.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-R.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'R': 75.0 ton, 2.44 COP liquid-cooled, centrifugal compressor chiller", "id": "5813ab96-0e75-4227-99b1-3ad492d0c671", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-S.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-S.RS0001.a205.json index 842a015..08be9c3 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-S.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-S.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'S': 225.0 ton, 2.23 COP liquid-cooled, centrifugal compressor chiller", "id": "1f227b30-91a6-416b-855f-d431ecf4e404", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-T.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-T.RS0001.a205.json index 88cedd8..6372d09 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-T.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-T.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'T': 350.0 ton, 2.09 COP liquid-cooled, centrifugal compressor chiller", "id": "a633d3a8-b925-4bb9-a9f1-d0a3c3fcf701", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-U.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-U.RS0001.a205.json index 298f6c6..54412fe 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-U.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-U.RS0001.a205.json @@ -3,13 +3,13 @@ "data_model": "ASHRAE_205", "schema": "RS0001", "schema_version": "1.0.0", - "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'T': 400.0 ton, 2.06 COP liquid-cooled, centrifugal compressor chiller", - "id": "d1e081fb-cf86-4dcf-80cc-f3dd524cf6ff", - "data_timestamp": "2022-12-01T11:35Z", + "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'U': 450.0 ton, 2.06 COP liquid-cooled, centrifugal compressor chiller", + "id": "96794f1d-b863-48e9-bf41-ce6611d44098", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", - "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'T' for Energy Cost Budget (ECB) Path B" + "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'U' for Energy Cost Budget (ECB) Path B" }, "description": { "product_information": { @@ -40,12 +40,12 @@ "evaporator_fouling_factor": 0.0, "condenser_fouling_factor": 0.0, "compressor_speed_control_type": "CONTINUOUS", - "maximum_power": 706885.1910480591, + "maximum_power": 828702.2431573835, "cycling_degradation_coefficient": 0.0, "performance_map_cooling": { "grid_variables": { "evaporator_liquid_volumetric_flow_rate": [ - 0.06027486151332805 + 0.06780921920249407 ], "evaporator_liquid_leaving_temperature": [ 277.0388888888889, @@ -54,7 +54,7 @@ 288.7055555555556 ], "condenser_liquid_volumetric_flow_rate": [ - 0.09720566538506879 + 0.1093563735582024 ], "condenser_liquid_entering_temperature": [ 285.9277777777778, @@ -71,334 +71,334 @@ }, "lookup_variables": { "input_power": [ - 98172.66571217755, - 203783.55882220462, - 364990.48768930277, - 581793.4523134719, - 110325.47399428526, - 229009.95461624974, - 410172.71218634915, - 653813.7467045836, - 109138.64245237697, - 226546.36912044996, - 405760.25969620125, - 646780.3141796308, - 96180.09259847272, - 199647.44173321084, - 357582.41511378647, - 569985.0127401995, - 95969.2104254409, - 199209.69952257784, - 356798.3884540081, - 568735.2772197316, - 112865.91398842297, - 234283.3155790398, - 419617.6674157833, - 668868.9694986535, - 116449.65266397831, - 241722.32129305962, - 432941.44259753154, - 690107.0165773939, - 107734.74245721451, - 223632.20013900005, - 400540.78093208536, - 638460.4848364706, - 91854.34820924811, - 190668.20520340325, - 341499.97971500404, - 544349.6717440506, - 112027.19820622803, - 232542.33721509154, - 416499.45441672386, - 663898.5498111249, - 119280.82600740349, - 247599.1768860129, - 443467.2985662315, - 706885.1910480591, - 114075.94211096985, - 236795.05176648826, - 424116.3611342669, - 676039.8702143058, - 86974.40036276722, - 180538.5715440895, - 323357.1032690558, - 515429.99553766585, - 109121.74257248605, - 226511.28891107754, - 405697.42860815325, - 646680.1616637132, - 119110.67303305579, - 247245.97899324694, - 442834.69664350245, - 705876.8259838223, - 116848.29673575943, - 242549.81341687648, - 434423.53838374995, - 692469.4716363796 + 101446.95363071008, + 224656.39885754415, + 407730.76492055244, + 650670.051819735, + 111189.68717744033, + 246231.8859007984, + 446888.29562261683, + 713158.9163428958, + 108750.97025770944, + 240831.29631765446, + 437086.72071553604, + 697517.2434513542, + 95956.77219282277, + 212498.27732931997, + 385664.889139096, + 615456.607622151, + 105256.70384872584, + 233093.17033164654, + 423042.7315686822, + 675105.3875598329, + 120168.8341563344, + 266116.39453211805, + 482976.85555479274, + 770750.2172243585, + 122331.8894659757, + 270906.5257189318, + 491670.5044461729, + 784623.8256476993, + 113116.60673113559, + 250499.0895212955, + 454632.87892896775, + 725517.9749541522, + 104512.443491699, + 231444.990217429, + 420051.4357849246, + 670331.7801941857, + 122959.62958427542, + 272296.66932944354, + 494193.4876353712, + 788650.0845020582, + 128654.90075438103, + 284908.96635563835, + 517083.65030176565, + 825178.952592763, + 122513.76158768224, + 271309.2853332215, + 492401.4762166124, + 785790.3342378549, + 100573.06756688021, + 222721.15990668835, + 404218.48366905405, + 645065.0388539775, + 120983.63006570793, + 267920.777101062, + 486251.64447149454, + 775976.2321770056, + 129204.22232456387, + 286125.4504525516, + 519291.45739682484, + 828702.2431573835, + 125695.11656129497, + 278354.4624063654, + 505187.82662390795, + 806195.2092139225 ], "net_evaporator_capacity": [ - 374117.15682416473, - 748234.3136483295, - 1122351.4704724941, - 1496468.627296659, - 347710.88527980266, - 695421.7705596053, - 1043132.655839408, - 1390843.5411192107, - 312443.662963424, - 624887.325926848, - 937330.988890272, - 1249774.651853696, - 268315.4898750289, - 536630.9797500578, - 804946.4696250868, - 1073261.9595001156, - 403033.70183453517, - 806067.4036690703, - 1209101.1055036054, - 1612134.8073381407, - 384483.14715107845, - 768966.2943021569, - 1153449.4414532352, - 1537932.5886043138, - 357071.64169560524, - 714143.2833912105, - 1071214.9250868158, - 1428286.566782421, - 320799.1854681155, - 641598.370936231, - 962397.5564043465, - 1283196.741872462, - 413419.90321362956, - 826839.8064272591, - 1240259.7096408887, - 1653679.6128545182, - 402725.0653910782, - 805450.1307821564, - 1208175.1961732346, - 1610900.2615643127, - 383169.27679651015, - 766338.5535930203, - 1149507.8303895304, - 1532677.1071860406, - 354752.53742992575, - 709505.0748598515, - 1064257.6122897773, - 1419010.149719703, - 405275.76096144837, - 810551.5219228967, - 1215827.2828843452, - 1621103.0438457935, - 402436.63999980234, - 804873.2799996047, - 1207309.9199994071, - 1609746.5599992094, - 390736.5682661398, - 781473.1365322795, - 1172209.7047984193, - 1562946.273064559, - 370175.5457604607, - 740351.0915209214, - 1110526.6372813822, - 1480702.183041843 + 411645.8753948152, + 823291.7507896303, + 1234937.6261844456, + 1646583.5015792607, + 380113.309806132, + 760226.619612264, + 1140339.929418396, + 1520453.239224528, + 341804.723038848, + 683609.446077696, + 1025414.1691165441, + 1367218.892155392, + 296720.1150929633, + 593440.2301859265, + 890160.3452788899, + 1186880.460371853, + 460386.898222593, + 920773.796445186, + 1381160.694667779, + 1841547.592890372, + 435974.7395042803, + 871949.4790085607, + 1307924.218512841, + 1743898.9580171213, + 404786.55960736674, + 809573.1192147335, + 1214359.6788221002, + 1619146.238429467, + 366822.35853185237, + 733644.7170637047, + 1100467.0755955572, + 1467289.4341274095, + 480562.5240762963, + 961125.0481525926, + 1441687.572228889, + 1922250.0963051852, + 463270.772228354, + 926541.544456708, + 1389812.316685062, + 1853083.088913416, + 439202.9992018108, + 878405.9984036216, + 1317608.9976054323, + 1756811.9968072432, + 408359.20499666675, + 816718.4099933335, + 1225077.6149900001, + 1633436.819986667, + 472172.7529559256, + 944345.5059118512, + 1416518.2588677767, + 1888691.0118237024, + 462001.4079783538, + 924002.8159567076, + 1386004.2239350614, + 1848005.6319134152, + 445054.041822181, + 890108.083644362, + 1335162.125466543, + 1780216.167288724, + 421330.6544874073, + 842661.3089748146, + 1263991.963462222, + 1685322.6179496292 ], "net_condenser_capacity": [ - 472289.8225363423, - 952017.872470534, - 1487341.958161797, - 2078262.0796101307, - 458036.35927408794, - 924431.7251758551, - 1453305.3680257571, - 2044657.2878237944, - 421582.30541580095, - 851433.695047298, - 1343091.2485864733, - 1896554.966033327, - 364495.5824735016, - 736278.4214832686, - 1162528.8847388732, - 1643246.972240315, - 499002.9122599761, - 1005277.1031916481, - 1565899.4939576136, - 2180870.0845578723, - 497349.0611395014, - 1003249.6098811966, - 1573067.1088690185, - 2206801.558102967, - 473521.2943595835, - 955865.6046842701, - 1504156.3676843473, - 2118393.5833598147, - 428533.92792533, - 865230.5710752311, - 1362938.3373364317, - 1921657.2267089325, - 505274.25142287766, - 1017508.0116306624, - 1581759.6893558928, - 2198029.284598569, - 514752.2635973062, - 1037992.4679972479, - 1624674.6505899585, - 2274798.811375438, - 502450.10280391364, - 1013937.7304790332, - 1592975.128955762, - 2239562.2982340995, - 468828.4795408956, - 946300.1266263397, - 1488373.9734240442, - 2095050.0199340088, - 492250.1613242156, - 991090.0934669862, - 1539184.3861534009, - 2136533.0393834594, - 511558.3825722884, - 1031384.5689106822, - 1613007.3486075604, - 2256426.7216629228, - 509847.24129919556, - 1028719.1155255265, - 1615044.4014419217, - 2268823.0990483817, - 487023.84249622014, - 982900.9049377979, - 1544950.1756651322, - 2173171.6546782227 + 513092.82902552525, + 1047948.1496471745, + 1642668.391104998, + 2297253.5533989957, + 491302.9969835723, + 1006458.5055130624, + 1587228.2250410127, + 2233612.155567424, + 450555.69329655747, + 924440.7423953505, + 1462500.88983208, + 2064736.1356067462, + 392676.88728578604, + 805938.5075152465, + 1275825.234417986, + 1802337.067994004, + 565643.6020713189, + 1153866.9667768325, + 1804203.4262364611, + 2516652.980450205, + 556143.5736606147, + 1138065.8735406788, + 1790901.0740676338, + 2514649.1752414797, + 527118.4490733425, + 1080479.6449336652, + 1706030.183268273, + 2403770.0640771664, + 479938.96526298794, + 984143.8065850002, + 1555099.954524525, + 2192807.4090815615, + 585074.9675679953, + 1192570.0383700216, + 1861739.0080138135, + 2592581.8764993707, + 586230.4018126294, + 1198838.2137861515, + 1884005.8043204332, + 2641733.173415474, + 567857.8999561919, + 1163314.96475926, + 1834692.647907198, + 2581990.9494000063, + 530872.966584349, + 1088027.695326555, + 1717479.0912066125, + 2419227.154224522, + 572745.8205228058, + 1167066.6658185394, + 1820736.7425368307, + 2533756.05067768, + 582985.0380440617, + 1191923.5930577696, + 1872255.8684065558, + 2623981.864090421, + 574258.2641467449, + 1176233.5340969136, + 1854453.5828633679, + 2608918.4104461074, + 547025.7710487023, + 1121015.77138118, + 1769179.79008613, + 2491517.827163552 ], "evaporator_liquid_entering_temperature": [ - 278.51401274099504, - 279.98913659310114, - 281.4642604452073, - 282.9393842973134, - 278.40989423081777, - 279.78089957274665, - 281.1519049146755, - 282.5229102566044, - 278.2708374677491, - 279.50278604660934, - 280.73473462546957, - 281.96668320432974, - 278.09684245178903, - 279.15479601468917, - 280.2127495775893, - 281.27070314048945, - 282.5203861073811, - 284.11299443698437, - 285.7056027665877, - 287.298211096191, - 282.4470826397724, - 283.96638750176703, - 285.48569236376164, - 287.00499722575626, - 282.3387646710352, - 283.74975156429264, - 285.16073845755, - 286.5717253508074, - 282.19543220116947, - 283.4630866245612, - 284.73074104795285, - 285.9983954713445, - 286.4533704940581, - 288.09007432144955, - 289.726778148841, - 291.36348197623244, - 286.4110302925791, - 288.0053939184915, - 289.59975754440393, - 291.19412117031635, - 286.3336101350308, - 287.850553603395, - 289.36749707175915, - 290.8844405401233, - 286.2211100214133, - 287.62555337616, - 289.0299967309066, - 290.43444008565325, - 290.3126752243769, - 291.9197948931983, - 293.5269145620196, - 295.13403423084094, - 290.3014166997398, - 291.897277843924, - 293.49313898810817, - 295.08900013229237, - 290.25502010457905, - 291.80448465360246, - 293.3539492026259, - 294.9034137516494, - 290.1734854388947, - 291.6414153222338, - 293.10934520557294, - 294.5772750889121 + 278.48164228748425, + 279.92439568607955, + 281.3671490846749, + 282.8099024832702, + 278.3711256544052, + 279.7033624199215, + 281.03559918543783, + 282.36783595095415, + 278.23686014354377, + 279.43483139819864, + 280.63280265285357, + 281.83077390750844, + 278.07884575489993, + 279.118802620911, + 280.15875948692207, + 281.19871635293316, + 282.544882155263, + 284.1619865327482, + 285.7790909102334, + 287.39619528771857, + 282.45913469181505, + 283.99049160585236, + 285.5218485198896, + 287.05320543392685, + 282.3495865217177, + 283.7713952656576, + 285.1932040095974, + 286.6150127535373, + 282.2162376449709, + 283.5046975121639, + 284.79315737935696, + 286.08161724654997, + 286.5077931650768, + 288.19891966348695, + 289.8900461618971, + 291.58117266030723, + 286.4469425196583, + 288.07721837264995, + 289.7074942256416, + 291.33777007863324, + 286.36224667534304, + 287.9078266840194, + 289.45340669269586, + 290.99898670137225, + 286.2537056321311, + 287.6907445975955, + 289.1277835630599, + 290.56482252852425, + 290.36991063633485, + 292.0342657171142, + 293.69862079789345, + 295.3629758786727, + 290.33405780580665, + 291.96256005605767, + 293.59106230630874, + 295.21956455655976, + 290.274320273746, + 291.84308499193645, + 293.4118497101269, + 294.9806144283173, + 290.190698040153, + 291.67584052475047, + 293.1609830093479, + 294.64612549394536 ], "condenser_liquid_leaving_temperature": [ - 287.0877435924028, - 288.2659780401662, - 289.58075894273253, - 291.0320863001019, - 296.13083531652956, - 297.2804223426335, - 298.58400793271124, - 300.0415920867628, - 305.1184060185353, - 306.1813337332774, - 307.3970944646016, - 308.76568821250777, - 314.0542298409215, - 314.9765376919352, - 316.0339672112912, - 317.22651839898936, - 287.15335218569413, - 288.39678519289697, - 289.77369991172264, - 291.28409634217115, - 296.22773458982783, - 297.47469532282713, - 298.8792007102614, - 300.44125075213066, - 305.2468396869047, - 306.43957082110387, - 307.7953729931743, - 309.31424620311594, - 314.2130942708491, - 315.29643836376437, - 316.53113704312204, - 317.9171903089222, - 287.16875488694615, - 288.42682487402936, - 289.81265329076535, - 291.3262401371541, - 296.27063059013324, - 297.56033069114335, - 299.0064047194539, - 300.60885267506484, - 305.3183742520862, - 306.5831703846976, - 308.0150022074136, - 309.61386972023416, - 314.3130558005612, - 315.49755331506805, - 316.84231405244464, - 318.347338012691, - 287.1367671146924, - 288.3619412358454, - 289.70808636193135, - 291.17520249295035, - 296.2627582044757, - 297.5440433186369, - 298.97764676007176, - 300.5635685287803, - 305.3366657446952, - 306.61972149098034, - 308.069574652532, - 309.68622522935027, - 314.3581943178484, - 315.58835144141455, - 316.98266661859986, - 318.5411398494044 + 287.0479376890093, + 288.21560843897305, + 289.5139734427175, + 290.94303270024267, + 296.07827869198815, + 297.20696550975595, + 298.4794106563896, + 299.8956141318889, + 305.0662591640668, + 306.107870938511, + 307.29054126329777, + 308.6142701384271, + 314.01590327722846, + 314.92719855050734, + 315.96335950096096, + 317.1243861285893, + 287.1626640424879, + 288.44684537327015, + 289.86662906442496, + 291.42201511595226, + 296.2203420164409, + 297.495312424337, + 298.9256503957059, + 300.5113559305476, + 305.2345461105587, + 306.45084854133756, + 307.8258250413946, + 309.3594756107298, + 314.2083274349641, + 315.32016426221645, + 316.57919634600376, + 317.98542368632604, + 287.20508567736283, + 288.5313400821955, + 289.99223801573066, + 291.5877794779682, + 296.2862611530149, + 297.62846239203463, + 299.12963944361127, + 300.78979230774496, + 305.32409249275554, + 306.63292274822436, + 308.10862851525764, + 309.75120979385537, + 314.32064348944687, + 315.5492416605179, + 316.9372633246294, + 318.4847084817813, + 287.17816926871626, + 288.4756623297163, + 289.9027238158456, + 291.45935372710414, + 296.2791506800727, + 297.61331271172105, + 299.10389576513745, + 300.7508998403219, + 305.33816066121597, + 306.66131810266035, + 308.1520635688925, + 309.8103970599125, + 314.3562625105173, + 315.6219846308582, + 317.0512700462987, + 318.64411875683885 ], "evaporator_liquid_differential_pressure": [ 15000.0, diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-V.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-V.RS0001.a205.json index 5f38079..1c25b19 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-V.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-V.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'V': 75.0 ton, 2.78 COP liquid-cooled, positive displacement compressor chiller", "id": "bcc86e2e-7cf6-4771-aeb3-f666b5ca64e7", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-X.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-X.RS0001.a205.json index 33e81b6..85b0c22 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-X.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-X.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'X': 225.0 ton, 2.52 COP liquid-cooled, positive displacement compressor chiller", "id": "109ceed9-dc6e-4551-bb45-bf3cc6ea5495", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Y.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Y.RS0001.a205.json index d12a054..be44cb3 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Y.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Y.RS0001.a205.json @@ -3,13 +3,13 @@ "data_model": "ASHRAE_205", "schema": "RS0001", "schema_version": "1.0.0", - "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'X': 300.0 ton, 2.25 COP liquid-cooled, positive displacement compressor chiller", - "id": "c9f3bf45-6502-4409-b94e-461e2b3b4195", - "data_timestamp": "2022-12-01T11:35Z", + "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'Y': 350.0 ton, 2.25 COP liquid-cooled, positive displacement compressor chiller", + "id": "8b0049db-1d50-48c3-b73d-939dde8a16fc", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", - "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'X' for Performance Rating Method (PRM)" + "notes": "Based on ASHRAE 90.1-2019 Addendum 'bd' curve set 'Y' for Performance Rating Method (PRM)" }, "description": { "product_information": { @@ -40,12 +40,12 @@ "evaporator_fouling_factor": 0.0, "condenser_fouling_factor": 0.0, "compressor_speed_control_type": "CONTINUOUS", - "maximum_power": 560931.8631656872, + "maximum_power": 602134.54035614, "cycling_degradation_coefficient": 0.0, "performance_map_cooling": { "grid_variables": { "evaporator_liquid_volumetric_flow_rate": [ - 0.04520614613499604 + 0.05274050382416204 ], "evaporator_liquid_leaving_temperature": [ 277.0388888888889, @@ -54,7 +54,7 @@ 288.7055555555556 ], "condenser_liquid_volumetric_flow_rate": [ - 0.07087206811562093 + 0.08268407946822441 ], "condenser_liquid_entering_temperature": [ 285.9277777777778, @@ -71,334 +71,334 @@ }, "lookup_variables": { "input_power": [ - 122172.54344648599, - 176582.02886142136, - 247819.3101392778, - 335884.3872800552, - 143497.75520133233, - 207404.41375528777, - 291076.15915441583, - 394512.9913987167, - 166196.26183207828, - 240211.68975946776, - 337118.65033728303, - 456917.1435655238, - 185482.90810181486, - 268087.63497734244, - 376240.3976516454, - 509941.196124724, - 128684.87695299808, - 185994.62706689155, - 261029.16852032757, - 353788.5013133061, - 150616.682114355, - 217693.75145879836, - 305516.45405823743, - 414084.7899126723, - 175832.59971736927, - 254139.56624117665, - 356665.3548556172, - 483409.96556069085, - 199908.80757655166, - 288938.10207526066, - 405502.4262148289, - 549601.7799952565, - 133732.19194950096, - 193289.7614501382, - 271267.3291184726, - 367664.8949545041, - 154067.43447103314, - 222681.29477295929, - 312516.0878905971, - 423571.81382394687, - 178854.18123077002, - 258506.80767656653, - 362794.4426609189, - 491717.08618382725, - 204029.9430946417, - 294894.583380047, - 413861.89007039554, - 560931.8631656872, - 138370.8576812134, - 199994.25480853766, - 280676.57041910256, - 380417.80451290816, - 155521.5961623214, - 224783.06669729276, - 315465.76330047246, - 427569.68597186054, - 177547.8049089709, - 256618.63726730552, - 360144.5405657534, - 488125.51480431465, - 200748.32783851173, - 290151.50229551643, - 407205.3401944992, - 551909.8415354597 + 159421.30509689174, + 215180.85443696316, + 302864.1950674814, + 422471.32698844635, + 186451.90730119884, + 251665.74003448966, + 354216.1870350617, + 494103.24830291496, + 208199.84756536927, + 281020.2881323365, + 395532.3236610947, + 551735.9541516434, + 222842.39851473103, + 300784.2501856233, + 423349.8377901989, + 590539.1613284575, + 156935.7400140418, + 211825.93259661525, + 298142.18712978665, + 415884.50361355586, + 185371.62510648373, + 250207.6159427909, + 352163.8967395502, + 491240.46749676176, + 209361.50924090846, + 282588.25517260935, + 397739.2164480348, + 554814.3930671847, + 227217.962818381, + 306690.22156712116, + 431662.4140797075, + 602134.54035614, + 155825.89787653476, + 210327.9096109562, + 296033.7396708742, + 412943.38805628876, + 183908.60120814515, + 248232.8815601131, + 349384.48431995243, + 487363.4094876627, + 208155.85128809826, + 280960.90361952333, + 395448.74074792274, + 551619.3626732965, + 227015.51629319586, + 306416.96689616825, + 431277.81175910094, + 601598.0508819937, + 157662.98758650536, + 212807.54389339147, + 299523.79199442564, + 417811.73188960756, + 184083.01240532656, + 248468.2952045445, + 349715.8258982501, + 487825.6044864434, + 207052.01840309057, + 279470.99169584905, + 393351.70950104104, + 548694.171818666, + 225153.17153233604, + 303903.2443002175, + 427739.7805869615, + 596662.780392568 ], "net_evaporator_capacity": [ - 264634.8868574324, - 529269.7737148647, - 793904.6605722972, - 1058539.5474297295, - 253839.43699880398, - 507678.87399760797, - 761518.310996412, - 1015357.7479952159, - 236050.78579559413, - 472101.57159118826, - 708152.3573867824, - 944203.1431823765, - 211268.93324780258, - 422537.86649560515, - 633806.7997434078, - 845075.7329912103, - 294361.2036295312, - 588722.4072590624, - 883083.6108885936, - 1177444.8145181248, - 284664.0648960057, - 569328.1297920113, - 853992.194688017, - 1138656.2595840227, - 267973.72481789865, - 535947.4496357973, - 803921.174453696, - 1071894.8992715946, - 244290.18339521, - 488580.36679042, - 732870.5501856301, - 977160.73358084, - 308522.35087323457, - 617044.7017464691, - 925567.0526197037, - 1234089.4034929383, - 299923.523264812, - 599847.046529624, - 899770.569794436, - 1199694.093059248, - 284331.4943118079, - 568662.9886236158, - 852994.4829354237, - 1137325.9772472316, - 261746.2640142221, - 523492.5280284442, - 785238.7920426663, - 1046985.0560568884, - 307118.32858854317, - 614236.6571770863, - 921354.9857656294, - 1228473.3143541727, - 299617.8121052235, - 599235.624210447, - 898853.4363156704, - 1198471.248420894, - 285124.0942773222, - 570248.1885546444, - 855372.2828319665, - 1140496.3771092887, - 263637.1751048393, - 527274.3502096786, - 790911.525314518, - 1054548.7004193573 + 303191.1415080249, + 606382.2830160498, + 909573.4245240747, + 1212764.5660320995, + 296784.01635421143, + 593568.0327084229, + 890352.0490626344, + 1187136.0654168457, + 284599.89878530876, + 569199.7975706175, + 853799.6963559263, + 1138399.595141235, + 266638.788801317, + 533277.577602634, + 799916.366403951, + 1066555.155205268, + 326700.584218066, + 653401.168436132, + 980101.7526541981, + 1306802.336872264, + 322226.36254148174, + 644452.7250829635, + 966679.0876244452, + 1288905.450165927, + 311975.14844980807, + 623950.2968996161, + 935925.4453494241, + 1247900.5937992323, + 295946.9419430454, + 591893.8838860908, + 887840.8258291362, + 1183787.7677721817, + 337262.98646185186, + 674525.9729237037, + 1011788.9593855556, + 1349051.9458474074, + 334721.66826249665, + 669443.3365249933, + 1004165.00478749, + 1338886.6730499866, + 326403.35764805204, + 652806.7152961041, + 979210.0729441561, + 1305613.4305922082, + 312308.05461851845, + 624616.1092370369, + 936924.1638555554, + 1249232.2184740738, + 334878.34823938255, + 669756.6964787651, + 1004635.0447181477, + 1339513.3929575302, + 334269.9335172564, + 668539.8670345128, + 1002809.8005517692, + 1337079.7340690256, + 327884.526380041, + 655769.052760082, + 983653.579140123, + 1311538.105520164, + 315722.12682773644, + 631444.2536554729, + 947166.3804832094, + 1262888.5073109458 ], "net_condenser_capacity": [ - 386807.4303039184, - 705851.8025762861, - 1041723.970711575, - 1394423.9347097846, - 397337.1922001363, - 715083.2877528957, - 1052594.470150828, - 1409870.7393939327, - 402247.04762767244, - 712313.261350656, - 1045271.0077240655, - 1401120.2867479003, - 396751.84134961746, - 690625.5014729477, - 1010047.1973950532, - 1355016.9291159343, - 423046.0805825293, - 774717.0343259539, - 1144112.7794089213, - 1531233.315831431, - 435280.7470103607, - 787021.8812508096, - 1159508.6487462544, - 1552741.049496695, - 443806.3245352679, - 790087.015876974, - 1160586.5293093133, - 1555304.8648322853, - 444198.99097176164, - 777518.4688656807, - 1138372.976400459, - 1526762.5135760964, - 442254.5428227355, - 810334.4631966073, - 1196834.3817381763, - 1601754.2984474422, - 453990.9577358451, - 822528.3413025833, - 1212286.657685033, - 1623265.906883195, - 463185.6755425779, - 827169.7963001824, - 1215788.9255963427, - 1629043.063431059, - 465776.2071088638, - 818387.1114084912, - 1199100.682113062, - 1607916.9192225756, - 445489.1862697566, - 814230.911985624, - 1202031.556184732, - 1608891.118867081, - 455139.4082675449, - 824018.6909077397, - 1214319.1996161428, - 1626040.9343927545, - 462671.89918629307, - 826866.8258219499, - 1215516.82339772, - 1628621.8919136033, - 464385.50294335105, - 817425.8525051951, - 1198116.8655090171, - 1606458.541954817 + 462612.4466049166, + 821563.1374530129, + 1212437.619591556, + 1635235.8930205458, + 483235.9236554103, + 845233.7727429125, + 1244568.236097696, + 1681239.3137197606, + 492799.74635067803, + 850220.0857029541, + 1249332.020017021, + 1690135.5492928785, + 489481.187316048, + 834061.8277882573, + 1223266.20419415, + 1657094.3165337255, + 483636.32423210784, + 865227.1010327473, + 1278243.9397839848, + 1722686.8404858198, + 507597.98764796543, + 894660.3410257543, + 1318842.9843639955, + 1780145.9176626888, + 521336.65769071656, + 906538.5520722255, + 1333664.661797459, + 1802714.9868664169, + 523164.9047614264, + 898584.105453212, + 1319503.2399088438, + 1785922.3081283215, + 493088.8843383866, + 884853.8825346599, + 1307822.6990564298, + 1761995.3339036962, + 518630.2694706418, + 917676.2180851065, + 1353549.4891074426, + 1826250.0825376492, + 534559.2089361503, + 933767.6189156275, + 1374658.813692079, + 1857232.7932655048, + 539323.5709117143, + 931033.0761332051, + 1368201.9756146562, + 1850830.2693560675, + 492541.3358258879, + 882564.2403721566, + 1304158.8367125734, + 1757325.1248471378, + 518352.945922583, + 917008.1622390572, + 1352525.6264500194, + 1824905.338555469, + 534936.5447831316, + 935240.044455931, + 1377005.288641164, + 1860232.2773388298, + 540875.2983600725, + 935347.4979556904, + 1374906.1610701708, + 1859551.2877035136 ], "evaporator_liquid_entering_temperature": [ - 278.43014374611636, - 279.82139860334377, - 281.21265346057123, - 282.60390831779864, - 278.37338924095593, - 279.70788959302297, - 281.04238994509, - 282.37689029715705, - 278.2798696461516, - 279.5208504034144, - 280.7618311606771, - 282.0028119179398, - 278.1495849617034, - 279.26028103451796, - 280.37097710733246, - 281.48167318014697, - 282.478688955275, - 284.0296001327722, - 285.5805113102694, - 287.1314224877666, - 282.42759730098726, - 283.9274168241967, - 285.42723634740616, - 286.9270558706156, - 282.3396603219826, - 283.7515428661873, - 285.1634254103921, - 286.57530795459684, - 282.21487801826095, - 283.5019782587441, - 284.7890784992272, - 286.0761787397103, - 286.44522787391975, - 288.07378908117283, - 289.70235028842586, - 291.33091149567895, - 286.39983823835104, - 287.9830098100354, - 289.5661813817198, - 291.14935295340416, - 286.3175344006441, - 287.8184021346216, - 289.319269868599, - 290.8201376025765, - 286.19831636079897, - 287.5799660549313, - 288.9616157490636, - 290.3432654431959, - 290.3293911561493, - 291.95322675674305, - 293.57706235733673, - 295.20089795793047, - 290.2897334589209, - 291.87391136228626, - 293.45808926565155, - 295.0422671690169, - 290.2131004064357, - 291.72064525731577, - 293.22819010819586, - 294.7357349590759, - 290.09949199869357, - 291.49342844183155, - 292.88736488496954, - 294.28130132810753 + 278.4051361846592, + 279.7713834804296, + 281.13763077619996, + 282.50387807197035, + 278.37626424146356, + 279.7136395940382, + 281.05101494661284, + 282.3883902991875, + 278.32135987454484, + 279.6038308602008, + 280.88630184585674, + 282.1687728315126, + 278.2404230839031, + 279.4419572789173, + 280.64349147393153, + 281.8450256689457, + 282.4031767526558, + 283.87857572753376, + 285.35397470241173, + 286.8293736772897, + 282.38297090548593, + 283.83816403319406, + 285.2933571609022, + 286.7485502886103, + 282.3366758221811, + 283.7455738665844, + 285.1544719109877, + 286.563369955391, + 282.2642915027413, + 283.6008052277048, + 284.9373189526683, + 286.2738326776318, + 286.34261330000135, + 287.868559933336, + 289.39450656667066, + 290.9204532000053, + 286.3311151039164, + 287.84556354116603, + 289.36001197841574, + 290.87446041566545, + 286.2934789013484, + 287.7702911360302, + 289.24710337071195, + 290.7239156053937, + 286.2297046922975, + 287.6427427179284, + 289.05578074355924, + 290.46881876919014, + 290.2232229442735, + 291.7408903329915, + 293.25855772170945, + 294.7762251104274, + 290.2204656110884, + 291.7353756666212, + 293.25028572215405, + 294.7651957776868, + 290.1915269704543, + 291.67749838535303, + 293.16346980025173, + 294.6494412151505, + 290.13640702237126, + 291.56725848918694, + 292.9981099560026, + 294.4289614228183 ], "condenser_liquid_leaving_temperature": [ - 287.2307881795728, - 288.30553003594935, - 289.43695847932196, - 290.6250735096907, - 296.3451218565502, - 297.4193198114475, - 298.56033720540205, - 299.76817403841375, - 305.4401783446639, - 306.49179223352957, - 307.62104455124427, - 308.827935297808, - 314.49996338225156, - 315.4998798005982, - 316.5867243922319, - 317.7604971571526, - 287.352862717342, - 288.5375113947907, - 289.78186830345646, - 291.08593344333934, - 296.4733968835266, - 297.6625211948641, - 298.9217798591566, - 300.25117287640404, - 305.58112989266544, - 306.7555680234393, - 308.01214618932596, - 309.3508643903253, - 314.6614041316233, - 315.7955364603287, - 317.0233577852034, - 318.3448681062474, - 287.41756888413363, - 288.65749326863215, - 289.95946777764533, - 291.32349241117316, - 296.5366501237027, - 297.78255718368376, - 299.1002054324652, - 300.48959487004714, - 305.64685648193745, - 306.8813371824282, - 308.1993694470201, - 309.60095327571315, - 314.7348214384641, - 315.9345935866358, - 317.22998613687355, - 318.62099908917736, - 287.4284651951333, - 288.67061895574255, - 289.9769751258327, - 291.3475337054038, - 296.5405326677519, - 297.78759557918363, - 299.1070768068619, - 300.49897635078685, - 305.64511396911877, - 306.8803096342829, - 308.1984465910668, - 309.59952483947035, - 314.7300895141141, - 315.93132286628855, - 317.2266386630829, - 318.6160369044972 + 287.2635229043144, + 288.2999555370421, + 289.4285647831525, + 290.6493506426458, + 296.4021371241554, + 297.45110768256995, + 298.6082695167503, + 299.8736226266965, + 305.5085279262795, + 306.5475728870672, + 307.7078181179088, + 308.9892636188043, + 314.57755303796796, + 315.5825092096817, + 316.71760878924914, + 317.9828517766704, + 287.32422715532954, + 288.4260306718227, + 289.6185736602103, + 290.9018561204924, + 296.4727317089984, + 297.5943323317298, + 298.823497381671, + 300.1602268588222, + 305.5914866464745, + 306.7112944558686, + 307.9529787784092, + 309.3165396140962, + 314.67579030308707, + 315.77068594840836, + 316.9982803988218, + 318.35857365432736, + 287.3515204354562, + 288.4827009536821, + 289.7039792385451, + 291.01535529004514, + 296.5047002382405, + 297.66102603577303, + 298.9240673208381, + 300.2938240934357, + 305.6299254920791, + 306.79045118416747, + 308.0721515345681, + 309.4750265432811, + 314.7229164308119, + 315.8653221221236, + 317.140308386625, + 318.54787522431633, + 287.3499394463097, + 288.47608985105717, + 289.6934002186635, + 291.0018705491287, + 296.5038966306008, + 297.65909019301694, + 298.9211004474542, + 300.2899273939126, + 305.6310224327598, + 306.79473162422454, + 308.0789728950309, + 309.48374624517885, + 314.7274419841741, + 315.87790496726524, + 317.15986088539745, + 318.57330973857074 ], "evaporator_liquid_differential_pressure": [ 15000.0, diff --git a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Z.RS0001.a205.json b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Z.RS0001.a205.json index 39a4621..4210776 100644 --- a/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Z.RS0001.a205.json +++ b/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-Z.RS0001.a205.json @@ -5,7 +5,7 @@ "schema_version": "1.0.0", "description": "ASHRAE 90.1-2019 Addendum 'bd' curve set 'Z': 75.0 ton, 2.47 COP liquid-cooled, centrifugal compressor chiller", "id": "5e82d941-e4e3-445b-adb0-6c04830b87e6", - "data_timestamp": "2022-12-01T11:35Z", + "data_timestamp": "2022-12-20T09:13Z", "data_version": 1, "data_source": "https://github.com/bigladder/chiller", "disclaimer": "This data is synthetic and does not represent any physical products.", diff --git a/include/libtk205/ashrae205.h b/include/libtk205/ashrae205.h index 6d5daa0..333667d 100644 --- a/include/libtk205/ashrae205.h +++ b/include/libtk205/ashrae205.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include /// @note This class has been auto-generated. Local changes will not be saved! @@ -111,9 +111,9 @@ namespace tk205 { const static std::string_view schema_version; const static std::string_view schema_description; }; - class Metadata : public RSInstanceBase { + static std::shared_ptr logger {}; + class Metadata { public: - void initialize (const nlohmann::json& j) override; std::string data_model; ashrae205_ns::SchemaType schema; ashrae205_ns::Version schema_version; @@ -165,9 +165,8 @@ namespace tk205 { const static std::string_view disclaimer_name; const static std::string_view notes_name; }; - class LiquidComponent : public RSInstanceBase { + class LiquidComponent { public: - void initialize (const nlohmann::json& j) override; ashrae205_ns::LiquidConstituent liquid_constituent; double concentration; bool liquid_constituent_is_set; @@ -179,9 +178,8 @@ namespace tk205 { const static std::string_view liquid_constituent_name; const static std::string_view concentration_name; }; - class LiquidMixture : public RSInstanceBase { + class LiquidMixture { public: - void initialize (const nlohmann::json& j) override; std::vector liquid_components; ashrae205_ns::ConcentrationType concentration_type; bool liquid_components_is_set; diff --git a/include/libtk205/grid_variables_base.h b/include/libtk205/grid_variables_base.h index 795d0bb..5e89a39 100644 --- a/include/libtk205/grid_variables_base.h +++ b/include/libtk205/grid_variables_base.h @@ -7,8 +7,7 @@ #include #include -#include -#include "griddeddata.h" +#include // ------------------------------------------------------------------------------------------------ /// @class GridVariablesBase grid_variables_base.h diff --git a/include/libtk205/loadobject_205.h b/include/libtk205/loadobject_205.h index 5d1b01a..59ee42f 100644 --- a/include/libtk205/loadobject_205.h +++ b/include/libtk205/loadobject_205.h @@ -2,12 +2,12 @@ #define LOADOBJECT_205_H_ #include -#include +#include namespace tk205 { template - void a205_json_get(nlohmann::json j, const char *subnode, T& a205_object, bool& object_is_set, bool required = false) + void a205_json_get(nlohmann::json j, Courierr::Courierr& logger, const char *subnode, T& a205_object, bool& object_is_set, bool required = false) { try { @@ -19,7 +19,7 @@ namespace tk205 { object_is_set = false; if (required) { - show_message(MsgSeverity::WARN_205, ex.what()); + logger.warning(ex.what()); } } } diff --git a/include/libtk205/lookup_variables_base.h b/include/libtk205/lookup_variables_base.h index fe78fbe..a41d429 100644 --- a/include/libtk205/lookup_variables_base.h +++ b/include/libtk205/lookup_variables_base.h @@ -5,7 +5,6 @@ #include #include #include -#include "error_handling_tk205.h" class PerformanceMapBase; diff --git a/include/libtk205/performance_map_base.h b/include/libtk205/performance_map_base.h index 8954ebb..8566b09 100644 --- a/include/libtk205/performance_map_base.h +++ b/include/libtk205/performance_map_base.h @@ -5,7 +5,8 @@ #include #include #include -#include +#include +#include // ------------------------------------------------------------------------------------------------ /// @class PerformanceMapBase performance_map_base.h @@ -15,8 +16,10 @@ class PerformanceMapBase { public: PerformanceMapBase() = default; virtual ~PerformanceMapBase() = default; - PerformanceMapBase(const PerformanceMapBase& other) = default; - PerformanceMapBase& operator=(const PerformanceMapBase& other) = default; + PerformanceMapBase(const PerformanceMapBase& other) = delete; + PerformanceMapBase& operator=(const PerformanceMapBase& other) = delete; + PerformanceMapBase(PerformanceMapBase&& other) = default; + PerformanceMapBase& operator=(PerformanceMapBase&& other) = default; // ---------------------------------------------------------------------------------------------- /// @brief @@ -29,7 +32,7 @@ class PerformanceMapBase { /// @param axis TBD // ---------------------------------------------------------------------------------------------- inline void add_grid_axis(std::vector& axis) { - _grid_axes.emplace_back(Btwxt::GridAxis(axis)); + grid_axes.emplace_back(axis); } // ---------------------------------------------------------------------------------------------- @@ -37,7 +40,7 @@ class PerformanceMapBase { /// @param axis TBD // ---------------------------------------------------------------------------------------------- inline void add_grid_axis(std::vector& axis) { - _grid_axes.emplace_back(Btwxt::GridAxis(std::vector(axis.begin(), axis.end()))); + grid_axes.emplace_back(std::vector(axis.begin(), axis.end())); } // ---------------------------------------------------------------------------------------------- @@ -45,15 +48,14 @@ class PerformanceMapBase { /// @param table TBD // ---------------------------------------------------------------------------------------------- inline void add_data_table(std::vector& table) { - _btwxt.add_value_table(table); + btwxt->add_grid_point_data_set(table); } // ---------------------------------------------------------------------------------------------- /// @brief // ---------------------------------------------------------------------------------------------- - inline void finalize_grid() { - auto gd = Btwxt::GriddedData(_grid_axes); - _btwxt = Btwxt::RegularGridInterpolator(gd); + inline void finalize_grid(const std::shared_ptr<::Courierr::Courierr>& logger) { + btwxt = std::make_unique(grid_axes, logger); } // ---------------------------------------------------------------------------------------------- @@ -62,13 +64,13 @@ class PerformanceMapBase { // ---------------------------------------------------------------------------------------------- inline double calculate_performance(const std::vector &target, std::size_t table_index, - Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR) + Btwxt::Method performance_interpolation_method = Btwxt::Method::linear) { - for (auto i = 0u; i < _grid_axes.size(); i++) + for (auto i = 0u; i < grid_axes.size(); i++) { - _btwxt.set_axis_interp_method(i, performance_interpolation_method); + btwxt->set_axis_interpolation_method(i, performance_interpolation_method); } - return _btwxt.get_value_at_target(target, table_index); + return btwxt->get_value_at_target(target, table_index); } // ---------------------------------------------------------------------------------------------- @@ -77,19 +79,18 @@ class PerformanceMapBase { /// @param target // ---------------------------------------------------------------------------------------------- inline std::vector calculate_performance(const std::vector &target, - Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR) + Btwxt::Method performance_interpolation_method = Btwxt::Method::linear) { - for (auto i = 0u; i < _grid_axes.size(); i++) + for (auto i = 0u; i < grid_axes.size(); i++) { - _btwxt.set_axis_interp_method(i, performance_interpolation_method); + btwxt->set_axis_interpolation_method(i, performance_interpolation_method); } - return _btwxt.get_values_at_target(target); + return btwxt->get_values_at_target(target); } private: - Btwxt::RegularGridInterpolator _btwxt; - std::vector _grid_axes; - + std::unique_ptr btwxt; + std::vector> grid_axes; }; #endif \ No newline at end of file diff --git a/include/libtk205/rs0001.h b/include/libtk205/rs0001.h index 476af32..4f930f8 100644 --- a/include/libtk205/rs0001.h +++ b/include/libtk205/rs0001.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -576,7 +577,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesCoolingStruct calculate_performance (double evaporator_liquid_volumetric_flow_rate, double evaporator_liquid_leaving_temperature, double condenser_liquid_volumetric_flow_rate, double condenser_liquid_entering_temperature, double compressor_sequence_number, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesCoolingStruct calculate_performance (double evaporator_liquid_volumetric_flow_rate, double evaporator_liquid_leaving_temperature, double condenser_liquid_volumetric_flow_rate, double condenser_liquid_entering_temperature, double compressor_sequence_number, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; class GridVariablesStandby : public GridVariablesBase { public: @@ -621,7 +622,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesStandbyStruct calculate_performance (double environment_dry_bulb_temperature, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesStandbyStruct calculate_performance (double environment_dry_bulb_temperature, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; class Performance { public: @@ -674,6 +675,7 @@ namespace tk205 { class RS0001 : public RSInstanceBase { public: void initialize (const nlohmann::json& j) override; + static std::shared_ptr logger; ashrae205_ns::Metadata metadata; rs0001_ns::Description description; rs0001_ns::Performance performance; diff --git a/include/libtk205/rs0001_factory.h b/include/libtk205/rs0001_factory.h index b5e0607..e8e1782 100644 --- a/include/libtk205/rs0001_factory.h +++ b/include/libtk205/rs0001_factory.h @@ -10,7 +10,7 @@ namespace tk205 { class RS0001Factory : public RSInstanceFactory { public: - std::shared_ptr create_instance(const char* RS_instance_file) const override; + std::shared_ptr create_instance(const char* RS_instance_file, std::shared_ptr logger) const override; }; } diff --git a/include/libtk205/rs0002.h b/include/libtk205/rs0002.h index 3d8a5bc..e517c04 100644 --- a/include/libtk205/rs0002.h +++ b/include/libtk205/rs0002.h @@ -7,6 +7,7 @@ #include #include #include +#include #include /// @note This class has been auto-generated. Local changes will not be saved! @@ -345,6 +346,7 @@ namespace tk205 { class RS0002 : public RSInstanceBase { public: void initialize (const nlohmann::json& j) override; + static std::shared_ptr logger; ashrae205_ns::Metadata metadata; rs0002_ns::Description description; rs0002_ns::Performance performance; diff --git a/include/libtk205/rs0002_factory.h b/include/libtk205/rs0002_factory.h index 2c3f53e..e4dd39a 100644 --- a/include/libtk205/rs0002_factory.h +++ b/include/libtk205/rs0002_factory.h @@ -10,7 +10,7 @@ namespace tk205 { class RS0002Factory : public RSInstanceFactory { public: - std::shared_ptr create_instance(const char* RS_instance_file) const override; + std::shared_ptr create_instance(const char* RS_instance_file, std::shared_ptr logger) const override; }; } diff --git a/include/libtk205/rs0003.h b/include/libtk205/rs0003.h index 42edf6e..70be1ab 100644 --- a/include/libtk205/rs0003.h +++ b/include/libtk205/rs0003.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -203,6 +204,7 @@ namespace tk205 { class RS0003 : public RSInstanceBase { public: void initialize (const nlohmann::json& j) override; + static std::shared_ptr logger; ashrae205_ns::Metadata metadata; rs0003_ns::Description description; rs0003_ns::Performance performance; @@ -275,7 +277,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesContinuousStruct calculate_performance (double standard_air_volumetric_flow_rate, double static_pressure_difference, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesContinuousStruct calculate_performance (double standard_air_volumetric_flow_rate, double static_pressure_difference, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; class GridVariablesDiscrete : public GridVariablesBase { public: @@ -340,7 +342,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesDiscreteStruct calculate_performance (double speed_number, double static_pressure_difference, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesDiscreteStruct calculate_performance (double speed_number, double static_pressure_difference, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; NLOHMANN_JSON_SERIALIZE_ENUM (InstallationSpeedControlType, { {InstallationSpeedControlType::UNKNOWN, "UNKNOWN"}, diff --git a/include/libtk205/rs0003_factory.h b/include/libtk205/rs0003_factory.h index 949610e..9377cfb 100644 --- a/include/libtk205/rs0003_factory.h +++ b/include/libtk205/rs0003_factory.h @@ -10,7 +10,7 @@ namespace tk205 { class RS0003Factory : public RSInstanceFactory { public: - std::shared_ptr create_instance(const char* RS_instance_file) const override; + std::shared_ptr create_instance(const char* RS_instance_file, std::shared_ptr logger) const override; }; } diff --git a/include/libtk205/rs0004.h b/include/libtk205/rs0004.h index 194b232..d2c14e8 100644 --- a/include/libtk205/rs0004.h +++ b/include/libtk205/rs0004.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -150,7 +151,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesCoolingStruct calculate_performance (double outdoor_coil_entering_dry_bulb_temperature, double indoor_coil_entering_relative_humidity, double indoor_coil_entering_dry_bulb_temperature, double indoor_coil_air_mass_flow_rate, double compressor_sequence_number, double ambient_absolute_air_pressure, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesCoolingStruct calculate_performance (double outdoor_coil_entering_dry_bulb_temperature, double indoor_coil_entering_relative_humidity, double indoor_coil_entering_dry_bulb_temperature, double indoor_coil_air_mass_flow_rate, double compressor_sequence_number, double ambient_absolute_air_pressure, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; class GridVariablesStandby : public GridVariablesBase { public: @@ -195,7 +196,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesStandbyStruct calculate_performance (double outdoor_coil_environment_dry_bulb_temperature, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesStandbyStruct calculate_performance (double outdoor_coil_environment_dry_bulb_temperature, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; class Performance { public: @@ -223,6 +224,7 @@ namespace tk205 { class RS0004 : public RSInstanceBase { public: void initialize (const nlohmann::json& j) override; + static std::shared_ptr logger; ashrae205_ns::Metadata metadata; rs0004_ns::Description description; rs0004_ns::Performance performance; diff --git a/include/libtk205/rs0004_factory.h b/include/libtk205/rs0004_factory.h index 28fd21b..17e3c7d 100644 --- a/include/libtk205/rs0004_factory.h +++ b/include/libtk205/rs0004_factory.h @@ -10,7 +10,7 @@ namespace tk205 { class RS0004Factory : public RSInstanceFactory { public: - std::shared_ptr create_instance(const char* RS_instance_file) const override; + std::shared_ptr create_instance(const char* RS_instance_file, std::shared_ptr logger) const override; }; } diff --git a/include/libtk205/rs0005.h b/include/libtk205/rs0005.h index 76070aa..356fccf 100644 --- a/include/libtk205/rs0005.h +++ b/include/libtk205/rs0005.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -110,7 +111,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesStruct calculate_performance (double shaft_power, double shaft_rotational_speed, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesStruct calculate_performance (double shaft_power, double shaft_rotational_speed, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; class Performance { public: @@ -143,6 +144,7 @@ namespace tk205 { class RS0005 : public RSInstanceBase { public: void initialize (const nlohmann::json& j) override; + static std::shared_ptr logger; ashrae205_ns::Metadata metadata; rs0005_ns::Description description; rs0005_ns::Performance performance; diff --git a/include/libtk205/rs0005_factory.h b/include/libtk205/rs0005_factory.h index d9d9092..b07578b 100644 --- a/include/libtk205/rs0005_factory.h +++ b/include/libtk205/rs0005_factory.h @@ -10,7 +10,7 @@ namespace tk205 { class RS0005Factory : public RSInstanceFactory { public: - std::shared_ptr create_instance(const char* RS_instance_file) const override; + std::shared_ptr create_instance(const char* RS_instance_file, std::shared_ptr logger) const override; }; } diff --git a/include/libtk205/rs0006.h b/include/libtk205/rs0006.h index bc14029..7483956 100644 --- a/include/libtk205/rs0006.h +++ b/include/libtk205/rs0006.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -104,7 +105,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesStruct calculate_performance (double output_power, double output_frequency, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesStruct calculate_performance (double output_power, double output_frequency, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; class Performance { public: @@ -132,6 +133,7 @@ namespace tk205 { class RS0006 : public RSInstanceBase { public: void initialize (const nlohmann::json& j) override; + static std::shared_ptr logger; ashrae205_ns::Metadata metadata; rs0006_ns::Description description; rs0006_ns::Performance performance; diff --git a/include/libtk205/rs0006_factory.h b/include/libtk205/rs0006_factory.h index e9c353b..f14ebc7 100644 --- a/include/libtk205/rs0006_factory.h +++ b/include/libtk205/rs0006_factory.h @@ -10,7 +10,7 @@ namespace tk205 { class RS0006Factory : public RSInstanceFactory { public: - std::shared_ptr create_instance(const char* RS_instance_file) const override; + std::shared_ptr create_instance(const char* RS_instance_file, std::shared_ptr logger) const override; }; } diff --git a/include/libtk205/rs0007.h b/include/libtk205/rs0007.h index 886f349..7aca3f1 100644 --- a/include/libtk205/rs0007.h +++ b/include/libtk205/rs0007.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -107,7 +108,7 @@ namespace tk205 { const static std::string_view grid_variables_name; const static std::string_view lookup_variables_name; using PerformanceMapBase::calculate_performance; - LookupVariablesStruct calculate_performance (double output_power, Btwxt::Method performance_interpolation_method = Btwxt::Method::LINEAR); + LookupVariablesStruct calculate_performance (double output_power, Btwxt::Method performance_interpolation_method = Btwxt::Method::linear); }; class Performance { public: @@ -125,6 +126,7 @@ namespace tk205 { class RS0007 : public RSInstanceBase { public: void initialize (const nlohmann::json& j) override; + static std::shared_ptr logger; ashrae205_ns::Metadata metadata; rs0007_ns::Description description; rs0007_ns::Performance performance; diff --git a/include/libtk205/rs0007_factory.h b/include/libtk205/rs0007_factory.h index 3105543..d118aa7 100644 --- a/include/libtk205/rs0007_factory.h +++ b/include/libtk205/rs0007_factory.h @@ -10,7 +10,7 @@ namespace tk205 { class RS0007Factory : public RSInstanceFactory { public: - std::shared_ptr create_instance(const char* RS_instance_file) const override; + std::shared_ptr create_instance(const char* RS_instance_file, std::shared_ptr logger) const override; }; } diff --git a/include/libtk205/rs_instance_base.h b/include/libtk205/rs_instance_base.h index 3d1a2c2..b94b6e6 100755 --- a/include/libtk205/rs_instance_base.h +++ b/include/libtk205/rs_instance_base.h @@ -1,8 +1,9 @@ #ifndef RS_INSTANCE_BASE_H_ #define RS_INSTANCE_BASE_H_ -#include #include +#include +#include /// @class RSInstanceBase RS_instance_base.h /// @brief This class is an abstract base for representation specification classes. It handles no resources. diff --git a/include/libtk205/rs_instance_factory.h b/include/libtk205/rs_instance_factory.h index 8462c2f..760fa27 100644 --- a/include/libtk205/rs_instance_factory.h +++ b/include/libtk205/rs_instance_factory.h @@ -3,10 +3,16 @@ #include #include -#include "rs_instance_base.h" // definition req'd for unique_ptr +#include +#include +#include + +namespace Courierr { class Courierr; } namespace tk205 { +class RSInstanceBase; + inline void read_binary_file(const char *filename, std::vector &bytes) { std::ifstream is(filename, std::ifstream::binary); @@ -242,10 +248,12 @@ class RSInstanceFactory { // Universal factory interface create(). Factory::create() will, through factory lookup and // delegation, actually return the requested object. static std::shared_ptr create(std::string const &RS_ID, - const char *RS_instance_file); + const char *RS_instance_file, + std::shared_ptr logger); // Derived factories override create_instance() for actual resource creation - virtual std::shared_ptr create_instance(const char *RS_instance_file) const = 0; + virtual std::shared_ptr create_instance(const char *RS_instance_file, + std::shared_ptr logger) const = 0; // Rule of five RSInstanceFactory(const RSInstanceFactory &other) = delete; diff --git a/src/ashrae205.cpp b/src/ashrae205.cpp index d0f61c2..9a67fa7 100644 --- a/src/ashrae205.cpp +++ b/src/ashrae205.cpp @@ -5,8 +5,6 @@ namespace tk205 { namespace ashrae205_ns { - void from_json(const nlohmann::json& j, Schema& x) { - } const std::string_view Schema::schema_title = "ASHRAE 205"; const std::string_view Schema::schema_version = "1.0.0"; @@ -14,28 +12,16 @@ namespace tk205 { const std::string_view Schema::schema_description = "Base schema for ASHRAE 205 representations"; void from_json(const nlohmann::json& j, Metadata& x) { - a205_json_get(j, "data_model", x.data_model, x.data_model_is_set, true); - a205_json_get(j, "schema", x.schema, x.schema_is_set, true); - a205_json_get(j, "schema_version", x.schema_version, x.schema_version_is_set, true); - a205_json_get(j, "id", x.id, x.id_is_set, true); - a205_json_get(j, "description", x.description, x.description_is_set, true); - a205_json_get(j, "data_timestamp", x.data_timestamp, x.data_timestamp_is_set, true); - a205_json_get(j, "data_version", x.data_version, x.data_version_is_set, true); - a205_json_get(j, "data_source", x.data_source, x.data_source_is_set, false); - a205_json_get(j, "disclaimer", x.disclaimer, x.disclaimer_is_set, false); - a205_json_get(j, "notes", x.notes, x.notes_is_set, false); - } - void Metadata::initialize(const nlohmann::json& j) { - a205_json_get(j, "data_model", data_model, data_model_is_set, true); - a205_json_get(j, "schema", schema, schema_is_set, true); - a205_json_get(j, "schema_version", schema_version, schema_version_is_set, true); - a205_json_get(j, "id", id, id_is_set, true); - a205_json_get(j, "description", description, description_is_set, true); - a205_json_get(j, "data_timestamp", data_timestamp, data_timestamp_is_set, true); - a205_json_get(j, "data_version", data_version, data_version_is_set, true); - a205_json_get(j, "data_source", data_source, data_source_is_set, false); - a205_json_get(j, "disclaimer", disclaimer, disclaimer_is_set, false); - a205_json_get(j, "notes", notes, notes_is_set, false); + a205_json_get(j, *logger, "data_model", x.data_model, x.data_model_is_set, true); + a205_json_get(j, *logger, "schema", x.schema, x.schema_is_set, true); + a205_json_get(j, *logger, "schema_version", x.schema_version, x.schema_version_is_set, true); + a205_json_get(j, *logger, "id", x.id, x.id_is_set, true); + a205_json_get(j, *logger, "description", x.description, x.description_is_set, true); + a205_json_get(j, *logger, "data_timestamp", x.data_timestamp, x.data_timestamp_is_set, true); + a205_json_get(j, *logger, "data_version", x.data_version, x.data_version_is_set, true); + a205_json_get(j, *logger, "data_source", x.data_source, x.data_source_is_set, false); + a205_json_get(j, *logger, "disclaimer", x.disclaimer, x.disclaimer_is_set, false); + a205_json_get(j, *logger, "notes", x.notes, x.notes_is_set, false); } const std::string_view Metadata::data_model_units = ""; @@ -98,12 +84,8 @@ namespace tk205 { const std::string_view Metadata::notes_name = "notes"; void from_json(const nlohmann::json& j, LiquidComponent& x) { - a205_json_get(j, "liquid_constituent", x.liquid_constituent, x.liquid_constituent_is_set, true); - a205_json_get(j, "concentration", x.concentration, x.concentration_is_set, false); - } - void LiquidComponent::initialize(const nlohmann::json& j) { - a205_json_get(j, "liquid_constituent", liquid_constituent, liquid_constituent_is_set, true); - a205_json_get(j, "concentration", concentration, concentration_is_set, false); + a205_json_get(j, *logger, "liquid_constituent", x.liquid_constituent, x.liquid_constituent_is_set, true); + a205_json_get(j, *logger, "concentration", x.concentration, x.concentration_is_set, false); } const std::string_view LiquidComponent::liquid_constituent_units = ""; @@ -118,12 +100,8 @@ namespace tk205 { const std::string_view LiquidComponent::concentration_name = "concentration"; void from_json(const nlohmann::json& j, LiquidMixture& x) { - a205_json_get>(j, "liquid_components", x.liquid_components, x.liquid_components_is_set, true); - a205_json_get(j, "concentration_type", x.concentration_type, x.concentration_type_is_set, true); - } - void LiquidMixture::initialize(const nlohmann::json& j) { - a205_json_get>(j, "liquid_components", liquid_components, liquid_components_is_set, true); - a205_json_get(j, "concentration_type", concentration_type, concentration_type_is_set, true); + a205_json_get>(j, *logger, "liquid_components", x.liquid_components, x.liquid_components_is_set, true); + a205_json_get(j, *logger, "concentration_type", x.concentration_type, x.concentration_type_is_set, true); } const std::string_view LiquidMixture::liquid_components_units = ""; diff --git a/src/rs0001.cpp b/src/rs0001.cpp index af0df95..a598774 100644 --- a/src/rs0001.cpp +++ b/src/rs0001.cpp @@ -5,8 +5,6 @@ namespace tk205 { namespace rs0001_ns { - void from_json(const nlohmann::json& j, Schema& x) { - } const std::string_view Schema::schema_title = "Liquid-Cooled Chiller"; const std::string_view Schema::schema_version = "1.0.0"; @@ -14,14 +12,14 @@ namespace tk205 { const std::string_view Schema::schema_description = "Schema for ASHRAE 205 annex RS0001: Liquid-Cooled Chiller"; void from_json(const nlohmann::json& j, ProductInformation& x) { - a205_json_get(j, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); - a205_json_get(j, "model_number", x.model_number, x.model_number_is_set, false); - a205_json_get(j, "nominal_voltage", x.nominal_voltage, x.nominal_voltage_is_set, false); - a205_json_get(j, "nominal_frequency", x.nominal_frequency, x.nominal_frequency_is_set, false); - a205_json_get(j, "compressor_type", x.compressor_type, x.compressor_type_is_set, false); - a205_json_get(j, "liquid_data_source", x.liquid_data_source, x.liquid_data_source_is_set, false); - a205_json_get(j, "refrigerant", x.refrigerant, x.refrigerant_is_set, false); - a205_json_get(j, "hot_gas_bypass_installed", x.hot_gas_bypass_installed, x.hot_gas_bypass_installed_is_set, false); + a205_json_get(j, *RS0001::logger, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); + a205_json_get(j, *RS0001::logger, "model_number", x.model_number, x.model_number_is_set, false); + a205_json_get(j, *RS0001::logger, "nominal_voltage", x.nominal_voltage, x.nominal_voltage_is_set, false); + a205_json_get(j, *RS0001::logger, "nominal_frequency", x.nominal_frequency, x.nominal_frequency_is_set, false); + a205_json_get(j, *RS0001::logger, "compressor_type", x.compressor_type, x.compressor_type_is_set, false); + a205_json_get(j, *RS0001::logger, "liquid_data_source", x.liquid_data_source, x.liquid_data_source_is_set, false); + a205_json_get(j, *RS0001::logger, "refrigerant", x.refrigerant, x.refrigerant_is_set, false); + a205_json_get(j, *RS0001::logger, "hot_gas_bypass_installed", x.hot_gas_bypass_installed, x.hot_gas_bypass_installed_is_set, false); } const std::string_view ProductInformation::manufacturer_units = ""; @@ -72,19 +70,19 @@ namespace tk205 { const std::string_view ProductInformation::hot_gas_bypass_installed_name = "hot_gas_bypass_installed"; void from_json(const nlohmann::json& j, RatingAHRI550590PartLoadPoint& x) { - a205_json_get(j, "percent_full_load_capacity", x.percent_full_load_capacity, x.percent_full_load_capacity_is_set, true); - a205_json_get(j, "cooling_capacity", x.cooling_capacity, x.cooling_capacity_is_set, true); - a205_json_get(j, "input_power", x.input_power, x.input_power_is_set, true); - a205_json_get(j, "evaporator_liquid_volumetric_flow_rate", x.evaporator_liquid_volumetric_flow_rate, x.evaporator_liquid_volumetric_flow_rate_is_set, true); - a205_json_get(j, "evaporator_liquid_entering_temperature", x.evaporator_liquid_entering_temperature, x.evaporator_liquid_entering_temperature_is_set, true); - a205_json_get(j, "evaporator_liquid_leaving_temperature", x.evaporator_liquid_leaving_temperature, x.evaporator_liquid_leaving_temperature_is_set, true); - a205_json_get(j, "evaporator_liquid_differential_pressure", x.evaporator_liquid_differential_pressure, x.evaporator_liquid_differential_pressure_is_set, true); - a205_json_get(j, "evaporator_fouling_factor", x.evaporator_fouling_factor, x.evaporator_fouling_factor_is_set, true); - a205_json_get(j, "condenser_liquid_volumetric_flow_rate", x.condenser_liquid_volumetric_flow_rate, x.condenser_liquid_volumetric_flow_rate_is_set, true); - a205_json_get(j, "condenser_liquid_entering_temperature", x.condenser_liquid_entering_temperature, x.condenser_liquid_entering_temperature_is_set, true); - a205_json_get(j, "condenser_liquid_leaving_temperature", x.condenser_liquid_leaving_temperature, x.condenser_liquid_leaving_temperature_is_set, true); - a205_json_get(j, "condenser_liquid_differential_pressure", x.condenser_liquid_differential_pressure, x.condenser_liquid_differential_pressure_is_set, true); - a205_json_get(j, "condenser_fouling_factor", x.condenser_fouling_factor, x.condenser_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "percent_full_load_capacity", x.percent_full_load_capacity, x.percent_full_load_capacity_is_set, true); + a205_json_get(j, *RS0001::logger, "cooling_capacity", x.cooling_capacity, x.cooling_capacity_is_set, true); + a205_json_get(j, *RS0001::logger, "input_power", x.input_power, x.input_power_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_volumetric_flow_rate", x.evaporator_liquid_volumetric_flow_rate, x.evaporator_liquid_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_entering_temperature", x.evaporator_liquid_entering_temperature, x.evaporator_liquid_entering_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_leaving_temperature", x.evaporator_liquid_leaving_temperature, x.evaporator_liquid_leaving_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_differential_pressure", x.evaporator_liquid_differential_pressure, x.evaporator_liquid_differential_pressure_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_fouling_factor", x.evaporator_fouling_factor, x.evaporator_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_volumetric_flow_rate", x.condenser_liquid_volumetric_flow_rate, x.condenser_liquid_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_entering_temperature", x.condenser_liquid_entering_temperature, x.condenser_liquid_entering_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_leaving_temperature", x.condenser_liquid_leaving_temperature, x.condenser_liquid_leaving_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_differential_pressure", x.condenser_liquid_differential_pressure, x.condenser_liquid_differential_pressure_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_fouling_factor", x.condenser_fouling_factor, x.condenser_fouling_factor_is_set, true); } const std::string_view RatingAHRI550590PartLoadPoint::percent_full_load_capacity_units = "%"; @@ -165,26 +163,26 @@ namespace tk205 { const std::string_view RatingAHRI550590PartLoadPoint::condenser_fouling_factor_name = "condenser_fouling_factor"; void from_json(const nlohmann::json& j, RatingAHRI550590& x) { - a205_json_get(j, "certified_reference_number", x.certified_reference_number, x.certified_reference_number_is_set, true); - a205_json_get(j, "test_standard_year", x.test_standard_year, x.test_standard_year_is_set, true); - a205_json_get(j, "rating_source", x.rating_source, x.rating_source_is_set, false); - a205_json_get(j, "net_refrigerating_capacity", x.net_refrigerating_capacity, x.net_refrigerating_capacity_is_set, true); - a205_json_get(j, "input_power", x.input_power, x.input_power_is_set, true); - a205_json_get(j, "cop", x.cop, x.cop_is_set, true); - a205_json_get(j, "part_load_value", x.part_load_value, x.part_load_value_is_set, true); - a205_json_get>(j, "part_load_rating_points", x.part_load_rating_points, x.part_load_rating_points_is_set, false); - a205_json_get(j, "full_load_evaporator_liquid_volumetric_flow_rate", x.full_load_evaporator_liquid_volumetric_flow_rate, x.full_load_evaporator_liquid_volumetric_flow_rate_is_set, true); - a205_json_get(j, "full_load_evaporator_liquid_entering_temperature", x.full_load_evaporator_liquid_entering_temperature, x.full_load_evaporator_liquid_entering_temperature_is_set, true); - a205_json_get(j, "full_load_evaporator_liquid_leaving_temperature", x.full_load_evaporator_liquid_leaving_temperature, x.full_load_evaporator_liquid_leaving_temperature_is_set, true); - a205_json_get(j, "full_load_evaporator_liquid_differential_pressure", x.full_load_evaporator_liquid_differential_pressure, x.full_load_evaporator_liquid_differential_pressure_is_set, true); - a205_json_get(j, "full_load_evaporator_fouling_factor", x.full_load_evaporator_fouling_factor, x.full_load_evaporator_fouling_factor_is_set, true); - a205_json_get(j, "full_load_condenser_liquid_volumetric_flow_rate", x.full_load_condenser_liquid_volumetric_flow_rate, x.full_load_condenser_liquid_volumetric_flow_rate_is_set, true); - a205_json_get(j, "full_load_condenser_liquid_entering_temperature", x.full_load_condenser_liquid_entering_temperature, x.full_load_condenser_liquid_entering_temperature_is_set, true); - a205_json_get(j, "full_load_condenser_liquid_leaving_temperature", x.full_load_condenser_liquid_leaving_temperature, x.full_load_condenser_liquid_leaving_temperature_is_set, true); - a205_json_get(j, "full_load_condenser_liquid_differential_pressure", x.full_load_condenser_liquid_differential_pressure, x.full_load_condenser_liquid_differential_pressure_is_set, true); - a205_json_get(j, "full_load_condenser_fouling_factor", x.full_load_condenser_fouling_factor, x.full_load_condenser_fouling_factor_is_set, true); - a205_json_get(j, "rating_recalculatable_from_performance_data", x.rating_recalculatable_from_performance_data, x.rating_recalculatable_from_performance_data_is_set, true); - a205_json_get(j, "rating_recalculatable_explanation", x.rating_recalculatable_explanation, x.rating_recalculatable_explanation_is_set, false); + a205_json_get(j, *RS0001::logger, "certified_reference_number", x.certified_reference_number, x.certified_reference_number_is_set, true); + a205_json_get(j, *RS0001::logger, "test_standard_year", x.test_standard_year, x.test_standard_year_is_set, true); + a205_json_get(j, *RS0001::logger, "rating_source", x.rating_source, x.rating_source_is_set, false); + a205_json_get(j, *RS0001::logger, "net_refrigerating_capacity", x.net_refrigerating_capacity, x.net_refrigerating_capacity_is_set, true); + a205_json_get(j, *RS0001::logger, "input_power", x.input_power, x.input_power_is_set, true); + a205_json_get(j, *RS0001::logger, "cop", x.cop, x.cop_is_set, true); + a205_json_get(j, *RS0001::logger, "part_load_value", x.part_load_value, x.part_load_value_is_set, true); + a205_json_get>(j, *RS0001::logger, "part_load_rating_points", x.part_load_rating_points, x.part_load_rating_points_is_set, false); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_liquid_volumetric_flow_rate", x.full_load_evaporator_liquid_volumetric_flow_rate, x.full_load_evaporator_liquid_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_liquid_entering_temperature", x.full_load_evaporator_liquid_entering_temperature, x.full_load_evaporator_liquid_entering_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_liquid_leaving_temperature", x.full_load_evaporator_liquid_leaving_temperature, x.full_load_evaporator_liquid_leaving_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_liquid_differential_pressure", x.full_load_evaporator_liquid_differential_pressure, x.full_load_evaporator_liquid_differential_pressure_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_fouling_factor", x.full_load_evaporator_fouling_factor, x.full_load_evaporator_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_liquid_volumetric_flow_rate", x.full_load_condenser_liquid_volumetric_flow_rate, x.full_load_condenser_liquid_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_liquid_entering_temperature", x.full_load_condenser_liquid_entering_temperature, x.full_load_condenser_liquid_entering_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_liquid_leaving_temperature", x.full_load_condenser_liquid_leaving_temperature, x.full_load_condenser_liquid_leaving_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_liquid_differential_pressure", x.full_load_condenser_liquid_differential_pressure, x.full_load_condenser_liquid_differential_pressure_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_fouling_factor", x.full_load_condenser_fouling_factor, x.full_load_condenser_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "rating_recalculatable_from_performance_data", x.rating_recalculatable_from_performance_data, x.rating_recalculatable_from_performance_data_is_set, true); + a205_json_get(j, *RS0001::logger, "rating_recalculatable_explanation", x.rating_recalculatable_explanation, x.rating_recalculatable_explanation_is_set, false); } const std::string_view RatingAHRI550590::certified_reference_number_units = ""; @@ -307,19 +305,19 @@ namespace tk205 { const std::string_view RatingAHRI550590::rating_recalculatable_explanation_name = "rating_recalculatable_explanation"; void from_json(const nlohmann::json& j, RatingAHRI551591PartLoadPoint& x) { - a205_json_get(j, "percent_full_load_capacity", x.percent_full_load_capacity, x.percent_full_load_capacity_is_set, true); - a205_json_get(j, "cooling_capacity", x.cooling_capacity, x.cooling_capacity_is_set, true); - a205_json_get(j, "input_power", x.input_power, x.input_power_is_set, true); - a205_json_get(j, "evaporator_liquid_volumetric_flow_rate", x.evaporator_liquid_volumetric_flow_rate, x.evaporator_liquid_volumetric_flow_rate_is_set, true); - a205_json_get(j, "evaporator_liquid_entering_temperature", x.evaporator_liquid_entering_temperature, x.evaporator_liquid_entering_temperature_is_set, true); - a205_json_get(j, "evaporator_liquid_leaving_temperature", x.evaporator_liquid_leaving_temperature, x.evaporator_liquid_leaving_temperature_is_set, true); - a205_json_get(j, "evaporator_liquid_differential_pressure", x.evaporator_liquid_differential_pressure, x.evaporator_liquid_differential_pressure_is_set, true); - a205_json_get(j, "evaporator_fouling_factor", x.evaporator_fouling_factor, x.evaporator_fouling_factor_is_set, true); - a205_json_get(j, "condenser_liquid_volumetric_flow_rate", x.condenser_liquid_volumetric_flow_rate, x.condenser_liquid_volumetric_flow_rate_is_set, true); - a205_json_get(j, "condenser_liquid_entering_temperature", x.condenser_liquid_entering_temperature, x.condenser_liquid_entering_temperature_is_set, true); - a205_json_get(j, "condenser_liquid_leaving_temperature", x.condenser_liquid_leaving_temperature, x.condenser_liquid_leaving_temperature_is_set, true); - a205_json_get(j, "condenser_liquid_differential_pressure", x.condenser_liquid_differential_pressure, x.condenser_liquid_differential_pressure_is_set, true); - a205_json_get(j, "condenser_fouling_factor", x.condenser_fouling_factor, x.condenser_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "percent_full_load_capacity", x.percent_full_load_capacity, x.percent_full_load_capacity_is_set, true); + a205_json_get(j, *RS0001::logger, "cooling_capacity", x.cooling_capacity, x.cooling_capacity_is_set, true); + a205_json_get(j, *RS0001::logger, "input_power", x.input_power, x.input_power_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_volumetric_flow_rate", x.evaporator_liquid_volumetric_flow_rate, x.evaporator_liquid_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_entering_temperature", x.evaporator_liquid_entering_temperature, x.evaporator_liquid_entering_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_leaving_temperature", x.evaporator_liquid_leaving_temperature, x.evaporator_liquid_leaving_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_differential_pressure", x.evaporator_liquid_differential_pressure, x.evaporator_liquid_differential_pressure_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_fouling_factor", x.evaporator_fouling_factor, x.evaporator_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_volumetric_flow_rate", x.condenser_liquid_volumetric_flow_rate, x.condenser_liquid_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_entering_temperature", x.condenser_liquid_entering_temperature, x.condenser_liquid_entering_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_leaving_temperature", x.condenser_liquid_leaving_temperature, x.condenser_liquid_leaving_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_differential_pressure", x.condenser_liquid_differential_pressure, x.condenser_liquid_differential_pressure_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_fouling_factor", x.condenser_fouling_factor, x.condenser_fouling_factor_is_set, true); } const std::string_view RatingAHRI551591PartLoadPoint::percent_full_load_capacity_units = "%"; @@ -400,26 +398,26 @@ namespace tk205 { const std::string_view RatingAHRI551591PartLoadPoint::condenser_fouling_factor_name = "condenser_fouling_factor"; void from_json(const nlohmann::json& j, RatingAHRI551591& x) { - a205_json_get(j, "certified_reference_number", x.certified_reference_number, x.certified_reference_number_is_set, true); - a205_json_get(j, "test_standard_year", x.test_standard_year, x.test_standard_year_is_set, true); - a205_json_get(j, "rating_source", x.rating_source, x.rating_source_is_set, false); - a205_json_get(j, "net_refrigerating_capacity", x.net_refrigerating_capacity, x.net_refrigerating_capacity_is_set, true); - a205_json_get(j, "input_power", x.input_power, x.input_power_is_set, true); - a205_json_get(j, "cop", x.cop, x.cop_is_set, true); - a205_json_get(j, "part_load_value", x.part_load_value, x.part_load_value_is_set, true); - a205_json_get>(j, "part_load_rating_points", x.part_load_rating_points, x.part_load_rating_points_is_set, false); - a205_json_get(j, "full_load_evaporator_liquid_volumetric_flow_rate", x.full_load_evaporator_liquid_volumetric_flow_rate, x.full_load_evaporator_liquid_volumetric_flow_rate_is_set, true); - a205_json_get(j, "full_load_evaporator_liquid_entering_temperature", x.full_load_evaporator_liquid_entering_temperature, x.full_load_evaporator_liquid_entering_temperature_is_set, true); - a205_json_get(j, "full_load_evaporator_liquid_leaving_temperature", x.full_load_evaporator_liquid_leaving_temperature, x.full_load_evaporator_liquid_leaving_temperature_is_set, true); - a205_json_get(j, "full_load_evaporator_liquid_differential_pressure", x.full_load_evaporator_liquid_differential_pressure, x.full_load_evaporator_liquid_differential_pressure_is_set, true); - a205_json_get(j, "full_load_evaporator_fouling_factor", x.full_load_evaporator_fouling_factor, x.full_load_evaporator_fouling_factor_is_set, true); - a205_json_get(j, "full_load_condenser_liquid_volumetric_flow_rate", x.full_load_condenser_liquid_volumetric_flow_rate, x.full_load_condenser_liquid_volumetric_flow_rate_is_set, true); - a205_json_get(j, "full_load_condenser_liquid_entering_temperature", x.full_load_condenser_liquid_entering_temperature, x.full_load_condenser_liquid_entering_temperature_is_set, true); - a205_json_get(j, "full_load_condenser_liquid_leaving_temperature", x.full_load_condenser_liquid_leaving_temperature, x.full_load_condenser_liquid_leaving_temperature_is_set, true); - a205_json_get(j, "full_load_condenser_liquid_differential_pressure", x.full_load_condenser_liquid_differential_pressure, x.full_load_condenser_liquid_differential_pressure_is_set, true); - a205_json_get(j, "full_load_condenser_fouling_factor", x.full_load_condenser_fouling_factor, x.full_load_condenser_fouling_factor_is_set, true); - a205_json_get(j, "rating_recalculatable_from_performance_data", x.rating_recalculatable_from_performance_data, x.rating_recalculatable_from_performance_data_is_set, true); - a205_json_get(j, "rating_recalculatable_explanation", x.rating_recalculatable_explanation, x.rating_recalculatable_explanation_is_set, false); + a205_json_get(j, *RS0001::logger, "certified_reference_number", x.certified_reference_number, x.certified_reference_number_is_set, true); + a205_json_get(j, *RS0001::logger, "test_standard_year", x.test_standard_year, x.test_standard_year_is_set, true); + a205_json_get(j, *RS0001::logger, "rating_source", x.rating_source, x.rating_source_is_set, false); + a205_json_get(j, *RS0001::logger, "net_refrigerating_capacity", x.net_refrigerating_capacity, x.net_refrigerating_capacity_is_set, true); + a205_json_get(j, *RS0001::logger, "input_power", x.input_power, x.input_power_is_set, true); + a205_json_get(j, *RS0001::logger, "cop", x.cop, x.cop_is_set, true); + a205_json_get(j, *RS0001::logger, "part_load_value", x.part_load_value, x.part_load_value_is_set, true); + a205_json_get>(j, *RS0001::logger, "part_load_rating_points", x.part_load_rating_points, x.part_load_rating_points_is_set, false); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_liquid_volumetric_flow_rate", x.full_load_evaporator_liquid_volumetric_flow_rate, x.full_load_evaporator_liquid_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_liquid_entering_temperature", x.full_load_evaporator_liquid_entering_temperature, x.full_load_evaporator_liquid_entering_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_liquid_leaving_temperature", x.full_load_evaporator_liquid_leaving_temperature, x.full_load_evaporator_liquid_leaving_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_liquid_differential_pressure", x.full_load_evaporator_liquid_differential_pressure, x.full_load_evaporator_liquid_differential_pressure_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_evaporator_fouling_factor", x.full_load_evaporator_fouling_factor, x.full_load_evaporator_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_liquid_volumetric_flow_rate", x.full_load_condenser_liquid_volumetric_flow_rate, x.full_load_condenser_liquid_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_liquid_entering_temperature", x.full_load_condenser_liquid_entering_temperature, x.full_load_condenser_liquid_entering_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_liquid_leaving_temperature", x.full_load_condenser_liquid_leaving_temperature, x.full_load_condenser_liquid_leaving_temperature_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_liquid_differential_pressure", x.full_load_condenser_liquid_differential_pressure, x.full_load_condenser_liquid_differential_pressure_is_set, true); + a205_json_get(j, *RS0001::logger, "full_load_condenser_fouling_factor", x.full_load_condenser_fouling_factor, x.full_load_condenser_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "rating_recalculatable_from_performance_data", x.rating_recalculatable_from_performance_data, x.rating_recalculatable_from_performance_data_is_set, true); + a205_json_get(j, *RS0001::logger, "rating_recalculatable_explanation", x.rating_recalculatable_explanation, x.rating_recalculatable_explanation_is_set, false); } const std::string_view RatingAHRI551591::certified_reference_number_units = ""; @@ -542,9 +540,9 @@ namespace tk205 { const std::string_view RatingAHRI551591::rating_recalculatable_explanation_name = "rating_recalculatable_explanation"; void from_json(const nlohmann::json& j, Description& x) { - a205_json_get(j, "product_information", x.product_information, x.product_information_is_set, false); - a205_json_get(j, "rating_ahri_550_590", x.rating_ahri_550_590, x.rating_ahri_550_590_is_set, false); - a205_json_get(j, "rating_ahri_551_591", x.rating_ahri_551_591, x.rating_ahri_551_591_is_set, false); + a205_json_get(j, *RS0001::logger, "product_information", x.product_information, x.product_information_is_set, false); + a205_json_get(j, *RS0001::logger, "rating_ahri_550_590", x.rating_ahri_550_590, x.rating_ahri_550_590_is_set, false); + a205_json_get(j, *RS0001::logger, "rating_ahri_551_591", x.rating_ahri_551_591, x.rating_ahri_551_591_is_set, false); } const std::string_view Description::product_information_units = ""; @@ -565,11 +563,11 @@ namespace tk205 { const std::string_view Description::rating_ahri_551_591_name = "rating_ahri_551_591"; void from_json(const nlohmann::json& j, GridVariablesCooling& x) { - a205_json_get>(j, "evaporator_liquid_volumetric_flow_rate", x.evaporator_liquid_volumetric_flow_rate, x.evaporator_liquid_volumetric_flow_rate_is_set, true); - a205_json_get>(j, "evaporator_liquid_leaving_temperature", x.evaporator_liquid_leaving_temperature, x.evaporator_liquid_leaving_temperature_is_set, true); - a205_json_get>(j, "condenser_liquid_volumetric_flow_rate", x.condenser_liquid_volumetric_flow_rate, x.condenser_liquid_volumetric_flow_rate_is_set, true); - a205_json_get>(j, "condenser_liquid_entering_temperature", x.condenser_liquid_entering_temperature, x.condenser_liquid_entering_temperature_is_set, true); - a205_json_get>(j, "compressor_sequence_number", x.compressor_sequence_number, x.compressor_sequence_number_is_set, true); + a205_json_get>(j, *RS0001::logger, "evaporator_liquid_volumetric_flow_rate", x.evaporator_liquid_volumetric_flow_rate, x.evaporator_liquid_volumetric_flow_rate_is_set, true); + a205_json_get>(j, *RS0001::logger, "evaporator_liquid_leaving_temperature", x.evaporator_liquid_leaving_temperature, x.evaporator_liquid_leaving_temperature_is_set, true); + a205_json_get>(j, *RS0001::logger, "condenser_liquid_volumetric_flow_rate", x.condenser_liquid_volumetric_flow_rate, x.condenser_liquid_volumetric_flow_rate_is_set, true); + a205_json_get>(j, *RS0001::logger, "condenser_liquid_entering_temperature", x.condenser_liquid_entering_temperature, x.condenser_liquid_entering_temperature_is_set, true); + a205_json_get>(j, *RS0001::logger, "compressor_sequence_number", x.compressor_sequence_number, x.compressor_sequence_number_is_set, true); } void GridVariablesCooling::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, evaporator_liquid_volumetric_flow_rate); @@ -577,7 +575,7 @@ namespace tk205 { add_grid_axis(performance_map, condenser_liquid_volumetric_flow_rate); add_grid_axis(performance_map, condenser_liquid_entering_temperature); add_grid_axis(performance_map, compressor_sequence_number); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0001::logger); } const std::string_view GridVariablesCooling::evaporator_liquid_volumetric_flow_rate_units = "m3/s"; @@ -610,15 +608,15 @@ namespace tk205 { const std::string_view GridVariablesCooling::compressor_sequence_number_name = "compressor_sequence_number"; void from_json(const nlohmann::json& j, LookupVariablesCooling& x) { - a205_json_get>(j, "input_power", x.input_power, x.input_power_is_set, true); - a205_json_get>(j, "net_evaporator_capacity", x.net_evaporator_capacity, x.net_evaporator_capacity_is_set, true); - a205_json_get>(j, "net_condenser_capacity", x.net_condenser_capacity, x.net_condenser_capacity_is_set, true); - a205_json_get>(j, "evaporator_liquid_entering_temperature", x.evaporator_liquid_entering_temperature, x.evaporator_liquid_entering_temperature_is_set, true); - a205_json_get>(j, "condenser_liquid_leaving_temperature", x.condenser_liquid_leaving_temperature, x.condenser_liquid_leaving_temperature_is_set, true); - a205_json_get>(j, "evaporator_liquid_differential_pressure", x.evaporator_liquid_differential_pressure, x.evaporator_liquid_differential_pressure_is_set, true); - a205_json_get>(j, "condenser_liquid_differential_pressure", x.condenser_liquid_differential_pressure, x.condenser_liquid_differential_pressure_is_set, true); - a205_json_get>(j, "oil_cooler_heat", x.oil_cooler_heat, x.oil_cooler_heat_is_set, true); - a205_json_get>(j, "auxiliary_heat", x.auxiliary_heat, x.auxiliary_heat_is_set, true); + a205_json_get>(j, *RS0001::logger, "input_power", x.input_power, x.input_power_is_set, true); + a205_json_get>(j, *RS0001::logger, "net_evaporator_capacity", x.net_evaporator_capacity, x.net_evaporator_capacity_is_set, true); + a205_json_get>(j, *RS0001::logger, "net_condenser_capacity", x.net_condenser_capacity, x.net_condenser_capacity_is_set, true); + a205_json_get>(j, *RS0001::logger, "evaporator_liquid_entering_temperature", x.evaporator_liquid_entering_temperature, x.evaporator_liquid_entering_temperature_is_set, true); + a205_json_get>(j, *RS0001::logger, "condenser_liquid_leaving_temperature", x.condenser_liquid_leaving_temperature, x.condenser_liquid_leaving_temperature_is_set, true); + a205_json_get>(j, *RS0001::logger, "evaporator_liquid_differential_pressure", x.evaporator_liquid_differential_pressure, x.evaporator_liquid_differential_pressure_is_set, true); + a205_json_get>(j, *RS0001::logger, "condenser_liquid_differential_pressure", x.condenser_liquid_differential_pressure, x.condenser_liquid_differential_pressure_is_set, true); + a205_json_get>(j, *RS0001::logger, "oil_cooler_heat", x.oil_cooler_heat, x.oil_cooler_heat_is_set, true); + a205_json_get>(j, *RS0001::logger, "auxiliary_heat", x.auxiliary_heat, x.auxiliary_heat_is_set, true); } void LookupVariablesCooling::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, input_power); @@ -686,15 +684,15 @@ namespace tk205 { const std::string_view LookupVariablesCooling::auxiliary_heat_name = "auxiliary_heat"; void from_json(const nlohmann::json& j, PerformanceMapCooling& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0001::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0001::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMapCooling::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0001::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0001::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMapCooling::grid_variables_units = ""; @@ -716,11 +714,11 @@ namespace tk205 { return s; } void from_json(const nlohmann::json& j, GridVariablesStandby& x) { - a205_json_get>(j, "environment_dry_bulb_temperature", x.environment_dry_bulb_temperature, x.environment_dry_bulb_temperature_is_set, true); + a205_json_get>(j, *RS0001::logger, "environment_dry_bulb_temperature", x.environment_dry_bulb_temperature, x.environment_dry_bulb_temperature_is_set, true); } void GridVariablesStandby::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, environment_dry_bulb_temperature); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0001::logger); } const std::string_view GridVariablesStandby::environment_dry_bulb_temperature_units = "K"; @@ -729,7 +727,7 @@ namespace tk205 { const std::string_view GridVariablesStandby::environment_dry_bulb_temperature_name = "environment_dry_bulb_temperature"; void from_json(const nlohmann::json& j, LookupVariablesStandby& x) { - a205_json_get>(j, "input_power", x.input_power, x.input_power_is_set, true); + a205_json_get>(j, *RS0001::logger, "input_power", x.input_power, x.input_power_is_set, true); } void LookupVariablesStandby::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, input_power); @@ -741,15 +739,15 @@ namespace tk205 { const std::string_view LookupVariablesStandby::input_power_name = "input_power"; void from_json(const nlohmann::json& j, PerformanceMapStandby& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0001::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0001::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMapStandby::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0001::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0001::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMapStandby::grid_variables_units = ""; @@ -771,15 +769,15 @@ namespace tk205 { return s; } void from_json(const nlohmann::json& j, Performance& x) { - a205_json_get(j, "evaporator_liquid_type", x.evaporator_liquid_type, x.evaporator_liquid_type_is_set, true); - a205_json_get(j, "condenser_liquid_type", x.condenser_liquid_type, x.condenser_liquid_type_is_set, true); - a205_json_get(j, "evaporator_fouling_factor", x.evaporator_fouling_factor, x.evaporator_fouling_factor_is_set, true); - a205_json_get(j, "condenser_fouling_factor", x.condenser_fouling_factor, x.condenser_fouling_factor_is_set, true); - a205_json_get(j, "compressor_speed_control_type", x.compressor_speed_control_type, x.compressor_speed_control_type_is_set, true); - a205_json_get(j, "maximum_power", x.maximum_power, x.maximum_power_is_set, false); - a205_json_get(j, "cycling_degradation_coefficient", x.cycling_degradation_coefficient, x.cycling_degradation_coefficient_is_set, true); - a205_json_get(j, "performance_map_cooling", x.performance_map_cooling, x.performance_map_cooling_is_set, true); - a205_json_get(j, "performance_map_standby", x.performance_map_standby, x.performance_map_standby_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_liquid_type", x.evaporator_liquid_type, x.evaporator_liquid_type_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_liquid_type", x.condenser_liquid_type, x.condenser_liquid_type_is_set, true); + a205_json_get(j, *RS0001::logger, "evaporator_fouling_factor", x.evaporator_fouling_factor, x.evaporator_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "condenser_fouling_factor", x.condenser_fouling_factor, x.condenser_fouling_factor_is_set, true); + a205_json_get(j, *RS0001::logger, "compressor_speed_control_type", x.compressor_speed_control_type, x.compressor_speed_control_type_is_set, true); + a205_json_get(j, *RS0001::logger, "maximum_power", x.maximum_power, x.maximum_power_is_set, false); + a205_json_get(j, *RS0001::logger, "cycling_degradation_coefficient", x.cycling_degradation_coefficient, x.cycling_degradation_coefficient_is_set, true); + a205_json_get(j, *RS0001::logger, "performance_map_cooling", x.performance_map_cooling, x.performance_map_cooling_is_set, true); + a205_json_get(j, *RS0001::logger, "performance_map_standby", x.performance_map_standby, x.performance_map_standby_is_set, true); } const std::string_view Performance::evaporator_liquid_type_units = ""; @@ -811,7 +809,7 @@ namespace tk205 { const std::string_view Performance::maximum_power_description = "Maximum input power at which the chiller operates reliably and continuously"; - const std::string_view Performance::cycling_degradation_coefficient_description = "Cycling degradation coefficient (CD) as described in AHRI 550/590 or AHRI 551/591"; + const std::string_view Performance::cycling_degradation_coefficient_description = "Cycling degradation coefficient (C~D~) as described in AHRI 550/590 or AHRI 551/591"; const std::string_view Performance::performance_map_cooling_description = "Data group describing cooling performance over a range of conditions"; @@ -836,15 +834,17 @@ namespace tk205 { const std::string_view Performance::performance_map_standby_name = "performance_map_standby"; void from_json(const nlohmann::json& j, RS0001& x) { - a205_json_get(j, "metadata", x.metadata, x.metadata_is_set, true); - a205_json_get(j, "description", x.description, x.description_is_set, false); - a205_json_get(j, "performance", x.performance, x.performance_is_set, true); + a205_json_get(j, *RS0001::logger, "metadata", x.metadata, x.metadata_is_set, true); + a205_json_get(j, *RS0001::logger, "description", x.description, x.description_is_set, false); + a205_json_get(j, *RS0001::logger, "performance", x.performance, x.performance_is_set, true); } void RS0001::initialize(const nlohmann::json& j) { - a205_json_get(j, "metadata", metadata, metadata_is_set, true); - a205_json_get(j, "description", description, description_is_set, false); - a205_json_get(j, "performance", performance, performance_is_set, true); + a205_json_get(j, *RS0001::logger, "metadata", metadata, metadata_is_set, true); + a205_json_get(j, *RS0001::logger, "description", description, description_is_set, false); + a205_json_get(j, *RS0001::logger, "performance", performance, performance_is_set, true); } + std::shared_ptr RS0001::logger {}; + const std::string_view RS0001::metadata_units = ""; const std::string_view RS0001::description_units = ""; diff --git a/src/rs0001_factory.cpp b/src/rs0001_factory.cpp index e4e7595..4633fbc 100644 --- a/src/rs0001_factory.cpp +++ b/src/rs0001_factory.cpp @@ -1,13 +1,13 @@ #include "rs0001_factory.h" #include "rs0001.h" #include -#include +#include /// @note This class has been generated from a template. Local changes will not be saved! using namespace tk205; -std::shared_ptr RS0001Factory::create_instance(const char* RS_instance_file) const +std::shared_ptr RS0001Factory::create_instance(const char* RS_instance_file, std::shared_ptr logger) const { auto p_rs = std::make_shared(); auto j = tk205::load_json(RS_instance_file); @@ -17,10 +17,11 @@ std::shared_ptr RS0001Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << "Schema version " << schema_version << " is not supported."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } else if (j["metadata"]["schema"] == "RS0001") { + rs0001_ns::RS0001::logger = logger; p_rs->initialize(j); } else @@ -28,7 +29,7 @@ std::shared_ptr RS0001Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << RS_instance_file << " is not a valid instance of RS0001; returning nullptr."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } return p_rs; } diff --git a/src/rs0002.cpp b/src/rs0002.cpp index 0199bf5..7aa9125 100644 --- a/src/rs0002.cpp +++ b/src/rs0002.cpp @@ -5,8 +5,6 @@ namespace tk205 { namespace rs0002_ns { - void from_json(const nlohmann::json& j, Schema& x) { - } const std::string_view Schema::schema_title = "Unitary Cooling Air-Conditioning Equipment"; const std::string_view Schema::schema_version = "1.0.0"; @@ -14,8 +12,8 @@ namespace tk205 { const std::string_view Schema::schema_description = "Schema for ASHRAE 205 annex RS0002: Unitary Cooling Air-Conditioning Equipment"; void from_json(const nlohmann::json& j, ProductInformation& x) { - a205_json_get(j, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); - a205_json_get(j, "model_number", x.model_number, x.model_number_is_set, false); + a205_json_get(j, *RS0002::logger, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); + a205_json_get(j, *RS0002::logger, "model_number", x.model_number, x.model_number_is_set, false); } const std::string_view ProductInformation::manufacturer_units = ""; @@ -30,31 +28,31 @@ namespace tk205 { const std::string_view ProductInformation::model_number_name = "model_number"; void from_json(const nlohmann::json& j, RatingAHRI210240& x) { - a205_json_get(j, "certified_reference_number", x.certified_reference_number, x.certified_reference_number_is_set, true); - a205_json_get(j, "test_standard_year", x.test_standard_year, x.test_standard_year_is_set, true); - a205_json_get(j, "rating_source", x.rating_source, x.rating_source_is_set, false); - a205_json_get(j, "staging_type", x.staging_type, x.staging_type_is_set, true); - a205_json_get(j, "seer", x.seer, x.seer_is_set, true); - a205_json_get(j, "eer_a_full", x.eer_a_full, x.eer_a_full_is_set, true); - a205_json_get(j, "eer_b_full", x.eer_b_full, x.eer_b_full_is_set, true); - a205_json_get(j, "cooling_a_full_capacity", x.cooling_a_full_capacity, x.cooling_a_full_capacity_is_set, true); - a205_json_get(j, "cooling_b_full_capacity", x.cooling_b_full_capacity, x.cooling_b_full_capacity_is_set, true); - a205_json_get(j, "cooling_b_low_capacity", x.cooling_b_low_capacity, x.cooling_b_low_capacity_is_set, true); - a205_json_get(j, "cooling_f_low_capacity", x.cooling_f_low_capacity, x.cooling_f_low_capacity_is_set, true); - a205_json_get(j, "cooling_g_low_capacity", x.cooling_g_low_capacity, x.cooling_g_low_capacity_is_set, true); - a205_json_get(j, "cooling_i_low_capacity", x.cooling_i_low_capacity, x.cooling_i_low_capacity_is_set, true); - a205_json_get(j, "cooling_a_full_power", x.cooling_a_full_power, x.cooling_a_full_power_is_set, true); - a205_json_get(j, "cooling_b_full_power", x.cooling_b_full_power, x.cooling_b_full_power_is_set, true); - a205_json_get(j, "cooling_b_low_power", x.cooling_b_low_power, x.cooling_b_low_power_is_set, true); - a205_json_get(j, "cooling_f_low_power", x.cooling_f_low_power, x.cooling_f_low_power_is_set, true); - a205_json_get(j, "cooling_g_low_power", x.cooling_g_low_power, x.cooling_g_low_power_is_set, true); - a205_json_get(j, "cooling_i_low_power", x.cooling_i_low_power, x.cooling_i_low_power_is_set, true); - a205_json_get(j, "cooling_full_fan_power", x.cooling_full_fan_power, x.cooling_full_fan_power_is_set, true); - a205_json_get(j, "cooling_full_air_volumetric_flow_rate", x.cooling_full_air_volumetric_flow_rate, x.cooling_full_air_volumetric_flow_rate_is_set, true); - a205_json_get(j, "cooling_low_fan_power", x.cooling_low_fan_power, x.cooling_low_fan_power_is_set, true); - a205_json_get(j, "cooling_low_air_volumetric_flow_rate", x.cooling_low_air_volumetric_flow_rate, x.cooling_low_air_volumetric_flow_rate_is_set, true); - a205_json_get(j, "rating_recalculatable_from_performance_data", x.rating_recalculatable_from_performance_data, x.rating_recalculatable_from_performance_data_is_set, true); - a205_json_get(j, "rating_recalculatable_explanation", x.rating_recalculatable_explanation, x.rating_recalculatable_explanation_is_set, false); + a205_json_get(j, *RS0002::logger, "certified_reference_number", x.certified_reference_number, x.certified_reference_number_is_set, true); + a205_json_get(j, *RS0002::logger, "test_standard_year", x.test_standard_year, x.test_standard_year_is_set, true); + a205_json_get(j, *RS0002::logger, "rating_source", x.rating_source, x.rating_source_is_set, false); + a205_json_get(j, *RS0002::logger, "staging_type", x.staging_type, x.staging_type_is_set, true); + a205_json_get(j, *RS0002::logger, "seer", x.seer, x.seer_is_set, true); + a205_json_get(j, *RS0002::logger, "eer_a_full", x.eer_a_full, x.eer_a_full_is_set, true); + a205_json_get(j, *RS0002::logger, "eer_b_full", x.eer_b_full, x.eer_b_full_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_a_full_capacity", x.cooling_a_full_capacity, x.cooling_a_full_capacity_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_b_full_capacity", x.cooling_b_full_capacity, x.cooling_b_full_capacity_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_b_low_capacity", x.cooling_b_low_capacity, x.cooling_b_low_capacity_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_f_low_capacity", x.cooling_f_low_capacity, x.cooling_f_low_capacity_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_g_low_capacity", x.cooling_g_low_capacity, x.cooling_g_low_capacity_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_i_low_capacity", x.cooling_i_low_capacity, x.cooling_i_low_capacity_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_a_full_power", x.cooling_a_full_power, x.cooling_a_full_power_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_b_full_power", x.cooling_b_full_power, x.cooling_b_full_power_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_b_low_power", x.cooling_b_low_power, x.cooling_b_low_power_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_f_low_power", x.cooling_f_low_power, x.cooling_f_low_power_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_g_low_power", x.cooling_g_low_power, x.cooling_g_low_power_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_i_low_power", x.cooling_i_low_power, x.cooling_i_low_power_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_full_fan_power", x.cooling_full_fan_power, x.cooling_full_fan_power_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_full_air_volumetric_flow_rate", x.cooling_full_air_volumetric_flow_rate, x.cooling_full_air_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_low_fan_power", x.cooling_low_fan_power, x.cooling_low_fan_power_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_low_air_volumetric_flow_rate", x.cooling_low_air_volumetric_flow_rate, x.cooling_low_air_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0002::logger, "rating_recalculatable_from_performance_data", x.rating_recalculatable_from_performance_data, x.rating_recalculatable_from_performance_data_is_set, true); + a205_json_get(j, *RS0002::logger, "rating_recalculatable_explanation", x.rating_recalculatable_explanation, x.rating_recalculatable_explanation_is_set, false); } const std::string_view RatingAHRI210240::certified_reference_number_units = ""; @@ -207,11 +205,11 @@ namespace tk205 { const std::string_view RatingAHRI210240::rating_recalculatable_explanation_name = "rating_recalculatable_explanation"; void from_json(const nlohmann::json& j, RatingAHRI340360CoolingPartLoadPoint& x) { - a205_json_get(j, "capacity", x.capacity, x.capacity_is_set, true); - a205_json_get(j, "net_power", x.net_power, x.net_power_is_set, true); - a205_json_get(j, "indoor_fan_power", x.indoor_fan_power, x.indoor_fan_power_is_set, false); - a205_json_get(j, "auxiliary_power", x.auxiliary_power, x.auxiliary_power_is_set, true); - a205_json_get(j, "air_volumetric_flow_rate", x.air_volumetric_flow_rate, x.air_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0002::logger, "capacity", x.capacity, x.capacity_is_set, true); + a205_json_get(j, *RS0002::logger, "net_power", x.net_power, x.net_power_is_set, true); + a205_json_get(j, *RS0002::logger, "indoor_fan_power", x.indoor_fan_power, x.indoor_fan_power_is_set, false); + a205_json_get(j, *RS0002::logger, "auxiliary_power", x.auxiliary_power, x.auxiliary_power_is_set, true); + a205_json_get(j, *RS0002::logger, "air_volumetric_flow_rate", x.air_volumetric_flow_rate, x.air_volumetric_flow_rate_is_set, true); } const std::string_view RatingAHRI340360CoolingPartLoadPoint::capacity_units = "Btu/h"; @@ -244,16 +242,16 @@ namespace tk205 { const std::string_view RatingAHRI340360CoolingPartLoadPoint::air_volumetric_flow_rate_name = "air_volumetric_flow_rate"; void from_json(const nlohmann::json& j, RatingAHRI340360& x) { - a205_json_get(j, "certified_reference_number", x.certified_reference_number, x.certified_reference_number_is_set, true); - a205_json_get(j, "test_standard_year", x.test_standard_year, x.test_standard_year_is_set, true); - a205_json_get(j, "rating_source", x.rating_source, x.rating_source_is_set, false); - a205_json_get(j, "capacity_control_type", x.capacity_control_type, x.capacity_control_type_is_set, true); - a205_json_get(j, "ieer", x.ieer, x.ieer_is_set, true); - a205_json_get(j, "eer", x.eer, x.eer_is_set, true); - a205_json_get(j, "cooling_capacity", x.cooling_capacity, x.cooling_capacity_is_set, true); - a205_json_get>(j, "part_load_points", x.part_load_points, x.part_load_points_is_set, false); - a205_json_get(j, "rating_recalculatable_from_performance_data", x.rating_recalculatable_from_performance_data, x.rating_recalculatable_from_performance_data_is_set, true); - a205_json_get(j, "rating_recalculatable_explanation", x.rating_recalculatable_explanation, x.rating_recalculatable_explanation_is_set, false); + a205_json_get(j, *RS0002::logger, "certified_reference_number", x.certified_reference_number, x.certified_reference_number_is_set, true); + a205_json_get(j, *RS0002::logger, "test_standard_year", x.test_standard_year, x.test_standard_year_is_set, true); + a205_json_get(j, *RS0002::logger, "rating_source", x.rating_source, x.rating_source_is_set, false); + a205_json_get(j, *RS0002::logger, "capacity_control_type", x.capacity_control_type, x.capacity_control_type_is_set, true); + a205_json_get(j, *RS0002::logger, "ieer", x.ieer, x.ieer_is_set, true); + a205_json_get(j, *RS0002::logger, "eer", x.eer, x.eer_is_set, true); + a205_json_get(j, *RS0002::logger, "cooling_capacity", x.cooling_capacity, x.cooling_capacity_is_set, true); + a205_json_get>(j, *RS0002::logger, "part_load_points", x.part_load_points, x.part_load_points_is_set, false); + a205_json_get(j, *RS0002::logger, "rating_recalculatable_from_performance_data", x.rating_recalculatable_from_performance_data, x.rating_recalculatable_from_performance_data_is_set, true); + a205_json_get(j, *RS0002::logger, "rating_recalculatable_explanation", x.rating_recalculatable_explanation, x.rating_recalculatable_explanation_is_set, false); } const std::string_view RatingAHRI340360::certified_reference_number_units = ""; @@ -316,9 +314,9 @@ namespace tk205 { const std::string_view RatingAHRI340360::rating_recalculatable_explanation_name = "rating_recalculatable_explanation"; void from_json(const nlohmann::json& j, Description& x) { - a205_json_get(j, "product_information", x.product_information, x.product_information_is_set, false); - a205_json_get(j, "rating_ahri_210_240", x.rating_ahri_210_240, x.rating_ahri_210_240_is_set, false); - a205_json_get(j, "rating_ahri_340_360", x.rating_ahri_340_360, x.rating_ahri_340_360_is_set, false); + a205_json_get(j, *RS0002::logger, "product_information", x.product_information, x.product_information_is_set, false); + a205_json_get(j, *RS0002::logger, "rating_ahri_210_240", x.rating_ahri_210_240, x.rating_ahri_210_240_is_set, false); + a205_json_get(j, *RS0002::logger, "rating_ahri_340_360", x.rating_ahri_340_360, x.rating_ahri_340_360_is_set, false); } const std::string_view Description::product_information_units = ""; @@ -339,10 +337,10 @@ namespace tk205 { const std::string_view Description::rating_ahri_340_360_name = "rating_ahri_340_360"; void from_json(const nlohmann::json& j, Performance& x) { - a205_json_get(j, "standby_power", x.standby_power, x.standby_power_is_set, true); - a205_json_get(j, "indoor_fan_representation", x.indoor_fan_representation, x.indoor_fan_representation_is_set, false); - a205_json_get(j, "fan_position", x.fan_position, x.fan_position_is_set, true); - a205_json_get(j, "dx_system_representation", x.dx_system_representation, x.dx_system_representation_is_set, false); + a205_json_get(j, *RS0002::logger, "standby_power", x.standby_power, x.standby_power_is_set, true); + a205_json_get(j, *RS0002::logger, "indoor_fan_representation", x.indoor_fan_representation, x.indoor_fan_representation_is_set, false); + a205_json_get(j, *RS0002::logger, "fan_position", x.fan_position, x.fan_position_is_set, true); + a205_json_get(j, *RS0002::logger, "dx_system_representation", x.dx_system_representation, x.dx_system_representation_is_set, false); } const std::string_view Performance::standby_power_units = "W"; @@ -369,15 +367,17 @@ namespace tk205 { const std::string_view Performance::dx_system_representation_name = "dx_system_representation"; void from_json(const nlohmann::json& j, RS0002& x) { - a205_json_get(j, "metadata", x.metadata, x.metadata_is_set, true); - a205_json_get(j, "description", x.description, x.description_is_set, false); - a205_json_get(j, "performance", x.performance, x.performance_is_set, true); + a205_json_get(j, *RS0002::logger, "metadata", x.metadata, x.metadata_is_set, true); + a205_json_get(j, *RS0002::logger, "description", x.description, x.description_is_set, false); + a205_json_get(j, *RS0002::logger, "performance", x.performance, x.performance_is_set, true); } void RS0002::initialize(const nlohmann::json& j) { - a205_json_get(j, "metadata", metadata, metadata_is_set, true); - a205_json_get(j, "description", description, description_is_set, false); - a205_json_get(j, "performance", performance, performance_is_set, true); + a205_json_get(j, *RS0002::logger, "metadata", metadata, metadata_is_set, true); + a205_json_get(j, *RS0002::logger, "description", description, description_is_set, false); + a205_json_get(j, *RS0002::logger, "performance", performance, performance_is_set, true); } + std::shared_ptr RS0002::logger {}; + const std::string_view RS0002::metadata_units = ""; const std::string_view RS0002::description_units = ""; diff --git a/src/rs0002_factory.cpp b/src/rs0002_factory.cpp index 71bed98..1bd545d 100644 --- a/src/rs0002_factory.cpp +++ b/src/rs0002_factory.cpp @@ -1,13 +1,13 @@ #include "rs0002_factory.h" #include "rs0002.h" #include -#include +#include /// @note This class has been generated from a template. Local changes will not be saved! using namespace tk205; -std::shared_ptr RS0002Factory::create_instance(const char* RS_instance_file) const +std::shared_ptr RS0002Factory::create_instance(const char* RS_instance_file, std::shared_ptr logger) const { auto p_rs = std::make_shared(); auto j = tk205::load_json(RS_instance_file); @@ -17,10 +17,11 @@ std::shared_ptr RS0002Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << "Schema version " << schema_version << " is not supported."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } else if (j["metadata"]["schema"] == "RS0002") { + rs0002_ns::RS0002::logger = logger; p_rs->initialize(j); } else @@ -28,7 +29,7 @@ std::shared_ptr RS0002Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << RS_instance_file << " is not a valid instance of RS0002; returning nullptr."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } return p_rs; } diff --git a/src/rs0003.cpp b/src/rs0003.cpp index 886cf38..8f4e833 100644 --- a/src/rs0003.cpp +++ b/src/rs0003.cpp @@ -5,8 +5,6 @@ namespace tk205 { namespace rs0003_ns { - void from_json(const nlohmann::json& j, Schema& x) { - } const std::string_view Schema::schema_title = "Fan Assembly"; const std::string_view Schema::schema_version = "1.0.0"; @@ -14,10 +12,10 @@ namespace tk205 { const std::string_view Schema::schema_description = "Schema for ASHRAE 205 annex RS0003: Fan Assembly"; void from_json(const nlohmann::json& j, ProductInformation& x) { - a205_json_get(j, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); - a205_json_get(j, "model_number", x.model_number, x.model_number_is_set, false); - a205_json_get(j, "impeller_type", x.impeller_type, x.impeller_type_is_set, false); - a205_json_get(j, "number_of_impellers", x.number_of_impellers, x.number_of_impellers_is_set, false); + a205_json_get(j, *RS0003::logger, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); + a205_json_get(j, *RS0003::logger, "model_number", x.model_number, x.model_number_is_set, false); + a205_json_get(j, *RS0003::logger, "impeller_type", x.impeller_type, x.impeller_type_is_set, false); + a205_json_get(j, *RS0003::logger, "number_of_impellers", x.number_of_impellers, x.number_of_impellers_is_set, false); } const std::string_view ProductInformation::manufacturer_units = ""; @@ -44,7 +42,7 @@ namespace tk205 { const std::string_view ProductInformation::number_of_impellers_name = "number_of_impellers"; void from_json(const nlohmann::json& j, Description& x) { - a205_json_get(j, "product_information", x.product_information, x.product_information_is_set, false); + a205_json_get(j, *RS0003::logger, "product_information", x.product_information, x.product_information_is_set, false); } const std::string_view Description::product_information_units = ""; @@ -53,10 +51,10 @@ namespace tk205 { const std::string_view Description::product_information_name = "product_information"; void from_json(const nlohmann::json& j, AssemblyComponent& x) { - a205_json_get(j, "component_type", x.component_type, x.component_type_is_set, true); - a205_json_get(j, "component_description", x.component_description, x.component_description_is_set, false); - a205_json_get(j, "component_id", x.component_id, x.component_id_is_set, false); - a205_json_get(j, "wet_pressure_difference", x.wet_pressure_difference, x.wet_pressure_difference_is_set, true); + a205_json_get(j, *RS0003::logger, "component_type", x.component_type, x.component_type_is_set, true); + a205_json_get(j, *RS0003::logger, "component_description", x.component_description, x.component_description_is_set, false); + a205_json_get(j, *RS0003::logger, "component_id", x.component_id, x.component_id_is_set, false); + a205_json_get(j, *RS0003::logger, "wet_pressure_difference", x.wet_pressure_difference, x.wet_pressure_difference_is_set, true); } const std::string_view AssemblyComponent::component_type_units = ""; @@ -83,8 +81,8 @@ namespace tk205 { const std::string_view AssemblyComponent::wet_pressure_difference_name = "wet_pressure_difference"; void from_json(const nlohmann::json& j, SystemCurve& x) { - a205_json_get>(j, "standard_air_volumetric_flow_rate", x.standard_air_volumetric_flow_rate, x.standard_air_volumetric_flow_rate_is_set, true); - a205_json_get>(j, "static_pressure_difference", x.static_pressure_difference, x.static_pressure_difference_is_set, true); + a205_json_get>(j, *RS0003::logger, "standard_air_volumetric_flow_rate", x.standard_air_volumetric_flow_rate, x.standard_air_volumetric_flow_rate_is_set, true); + a205_json_get>(j, *RS0003::logger, "static_pressure_difference", x.static_pressure_difference, x.static_pressure_difference_is_set, true); } const std::string_view SystemCurve::standard_air_volumetric_flow_rate_units = "m3/s"; @@ -99,17 +97,17 @@ namespace tk205 { const std::string_view SystemCurve::static_pressure_difference_name = "static_pressure_difference"; void from_json(const nlohmann::json& j, Performance& x) { - a205_json_get(j, "nominal_standard_air_volumetric_flow_rate", x.nominal_standard_air_volumetric_flow_rate, x.nominal_standard_air_volumetric_flow_rate_is_set, true); - a205_json_get(j, "is_enclosed", x.is_enclosed, x.is_enclosed_is_set, true); - a205_json_get>(j, "assembly_components", x.assembly_components, x.assembly_components_is_set, true); - a205_json_get(j, "heat_loss_fraction", x.heat_loss_fraction, x.heat_loss_fraction_is_set, true); - a205_json_get(j, "maximum_impeller_rotational_speed", x.maximum_impeller_rotational_speed, x.maximum_impeller_rotational_speed_is_set, true); - a205_json_get(j, "minimum_impeller_rotational_speed", x.minimum_impeller_rotational_speed, x.minimum_impeller_rotational_speed_is_set, true); - a205_json_get(j, "stability_curve", x.stability_curve, x.stability_curve_is_set, false); - a205_json_get(j, "operation_speed_control_type", x.operation_speed_control_type, x.operation_speed_control_type_is_set, true); - a205_json_get(j, "installation_speed_control_type", x.installation_speed_control_type, x.installation_speed_control_type_is_set, true); - a205_json_get(j, "motor_representation", x.motor_representation, x.motor_representation_is_set, false); - a205_json_get(j, "mechanical_drive_representation", x.mechanical_drive_representation, x.mechanical_drive_representation_is_set, false); + a205_json_get(j, *RS0003::logger, "nominal_standard_air_volumetric_flow_rate", x.nominal_standard_air_volumetric_flow_rate, x.nominal_standard_air_volumetric_flow_rate_is_set, true); + a205_json_get(j, *RS0003::logger, "is_enclosed", x.is_enclosed, x.is_enclosed_is_set, true); + a205_json_get>(j, *RS0003::logger, "assembly_components", x.assembly_components, x.assembly_components_is_set, true); + a205_json_get(j, *RS0003::logger, "heat_loss_fraction", x.heat_loss_fraction, x.heat_loss_fraction_is_set, true); + a205_json_get(j, *RS0003::logger, "maximum_impeller_rotational_speed", x.maximum_impeller_rotational_speed, x.maximum_impeller_rotational_speed_is_set, true); + a205_json_get(j, *RS0003::logger, "minimum_impeller_rotational_speed", x.minimum_impeller_rotational_speed, x.minimum_impeller_rotational_speed_is_set, true); + a205_json_get(j, *RS0003::logger, "stability_curve", x.stability_curve, x.stability_curve_is_set, false); + a205_json_get(j, *RS0003::logger, "operation_speed_control_type", x.operation_speed_control_type, x.operation_speed_control_type_is_set, true); + a205_json_get(j, *RS0003::logger, "installation_speed_control_type", x.installation_speed_control_type, x.installation_speed_control_type_is_set, true); + a205_json_get(j, *RS0003::logger, "motor_representation", x.motor_representation, x.motor_representation_is_set, false); + a205_json_get(j, *RS0003::logger, "mechanical_drive_representation", x.mechanical_drive_representation, x.mechanical_drive_representation_is_set, false); if (x.operation_speed_control_type == ashrae205_ns::SpeedControlType::CONTINUOUS) { x.performance_map = std::make_unique(); if (x.performance_map) { @@ -196,15 +194,17 @@ namespace tk205 { const std::string_view Performance::performance_map_name = "performance_map"; void from_json(const nlohmann::json& j, RS0003& x) { - a205_json_get(j, "metadata", x.metadata, x.metadata_is_set, true); - a205_json_get(j, "description", x.description, x.description_is_set, false); - a205_json_get(j, "performance", x.performance, x.performance_is_set, true); + a205_json_get(j, *RS0003::logger, "metadata", x.metadata, x.metadata_is_set, true); + a205_json_get(j, *RS0003::logger, "description", x.description, x.description_is_set, false); + a205_json_get(j, *RS0003::logger, "performance", x.performance, x.performance_is_set, true); } void RS0003::initialize(const nlohmann::json& j) { - a205_json_get(j, "metadata", metadata, metadata_is_set, true); - a205_json_get(j, "description", description, description_is_set, false); - a205_json_get(j, "performance", performance, performance_is_set, true); + a205_json_get(j, *RS0003::logger, "metadata", metadata, metadata_is_set, true); + a205_json_get(j, *RS0003::logger, "description", description, description_is_set, false); + a205_json_get(j, *RS0003::logger, "performance", performance, performance_is_set, true); } + std::shared_ptr RS0003::logger {}; + const std::string_view RS0003::metadata_units = ""; const std::string_view RS0003::description_units = ""; @@ -224,13 +224,13 @@ namespace tk205 { const std::string_view RS0003::performance_name = "performance"; void from_json(const nlohmann::json& j, GridVariablesContinuous& x) { - a205_json_get>(j, "standard_air_volumetric_flow_rate", x.standard_air_volumetric_flow_rate, x.standard_air_volumetric_flow_rate_is_set, true); - a205_json_get>(j, "static_pressure_difference", x.static_pressure_difference, x.static_pressure_difference_is_set, true); + a205_json_get>(j, *RS0003::logger, "standard_air_volumetric_flow_rate", x.standard_air_volumetric_flow_rate, x.standard_air_volumetric_flow_rate_is_set, true); + a205_json_get>(j, *RS0003::logger, "static_pressure_difference", x.static_pressure_difference, x.static_pressure_difference_is_set, true); } void GridVariablesContinuous::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, standard_air_volumetric_flow_rate); add_grid_axis(performance_map, static_pressure_difference); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0003::logger); } const std::string_view GridVariablesContinuous::standard_air_volumetric_flow_rate_units = "m3/s"; @@ -245,8 +245,8 @@ namespace tk205 { const std::string_view GridVariablesContinuous::static_pressure_difference_name = "static_pressure_difference"; void from_json(const nlohmann::json& j, LookupVariablesContinuous& x) { - a205_json_get>(j, "impeller_rotational_speed", x.impeller_rotational_speed, x.impeller_rotational_speed_is_set, true); - a205_json_get>(j, "shaft_power", x.shaft_power, x.shaft_power_is_set, true); + a205_json_get>(j, *RS0003::logger, "impeller_rotational_speed", x.impeller_rotational_speed, x.impeller_rotational_speed_is_set, true); + a205_json_get>(j, *RS0003::logger, "shaft_power", x.shaft_power, x.shaft_power_is_set, true); } void LookupVariablesContinuous::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, impeller_rotational_speed); @@ -265,15 +265,15 @@ namespace tk205 { const std::string_view LookupVariablesContinuous::shaft_power_name = "shaft_power"; void from_json(const nlohmann::json& j, PerformanceMapContinuous& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0003::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0003::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMapContinuous::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0003::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0003::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMapContinuous::grid_variables_units = ""; @@ -295,13 +295,13 @@ namespace tk205 { return s; } void from_json(const nlohmann::json& j, GridVariablesDiscrete& x) { - a205_json_get>(j, "speed_number", x.speed_number, x.speed_number_is_set, true); - a205_json_get>(j, "static_pressure_difference", x.static_pressure_difference, x.static_pressure_difference_is_set, true); + a205_json_get>(j, *RS0003::logger, "speed_number", x.speed_number, x.speed_number_is_set, true); + a205_json_get>(j, *RS0003::logger, "static_pressure_difference", x.static_pressure_difference, x.static_pressure_difference_is_set, true); } void GridVariablesDiscrete::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, speed_number); add_grid_axis(performance_map, static_pressure_difference); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0003::logger); } const std::string_view GridVariablesDiscrete::speed_number_units = "-"; @@ -316,9 +316,9 @@ namespace tk205 { const std::string_view GridVariablesDiscrete::static_pressure_difference_name = "static_pressure_difference"; void from_json(const nlohmann::json& j, LookupVariablesDiscrete& x) { - a205_json_get>(j, "standard_air_volumetric_flow_rate", x.standard_air_volumetric_flow_rate, x.standard_air_volumetric_flow_rate_is_set, true); - a205_json_get>(j, "shaft_power", x.shaft_power, x.shaft_power_is_set, true); - a205_json_get>(j, "impeller_rotational_speed", x.impeller_rotational_speed, x.impeller_rotational_speed_is_set, true); + a205_json_get>(j, *RS0003::logger, "standard_air_volumetric_flow_rate", x.standard_air_volumetric_flow_rate, x.standard_air_volumetric_flow_rate_is_set, true); + a205_json_get>(j, *RS0003::logger, "shaft_power", x.shaft_power, x.shaft_power_is_set, true); + a205_json_get>(j, *RS0003::logger, "impeller_rotational_speed", x.impeller_rotational_speed, x.impeller_rotational_speed_is_set, true); } void LookupVariablesDiscrete::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, standard_air_volumetric_flow_rate); @@ -344,15 +344,15 @@ namespace tk205 { const std::string_view LookupVariablesDiscrete::impeller_rotational_speed_name = "impeller_rotational_speed"; void from_json(const nlohmann::json& j, PerformanceMapDiscrete& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0003::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0003::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMapDiscrete::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0003::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0003::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMapDiscrete::grid_variables_units = ""; diff --git a/src/rs0003_factory.cpp b/src/rs0003_factory.cpp index eac5170..347b1b6 100644 --- a/src/rs0003_factory.cpp +++ b/src/rs0003_factory.cpp @@ -1,13 +1,13 @@ #include "rs0003_factory.h" #include "rs0003.h" #include -#include +#include /// @note This class has been generated from a template. Local changes will not be saved! using namespace tk205; -std::shared_ptr RS0003Factory::create_instance(const char* RS_instance_file) const +std::shared_ptr RS0003Factory::create_instance(const char* RS_instance_file, std::shared_ptr logger) const { auto p_rs = std::make_shared(); auto j = tk205::load_json(RS_instance_file); @@ -17,10 +17,11 @@ std::shared_ptr RS0003Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << "Schema version " << schema_version << " is not supported."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } else if (j["metadata"]["schema"] == "RS0003") { + rs0003_ns::RS0003::logger = logger; p_rs->initialize(j); } else @@ -28,7 +29,7 @@ std::shared_ptr RS0003Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << RS_instance_file << " is not a valid instance of RS0003; returning nullptr."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } return p_rs; } diff --git a/src/rs0004.cpp b/src/rs0004.cpp index beef381..3bf94d8 100644 --- a/src/rs0004.cpp +++ b/src/rs0004.cpp @@ -5,8 +5,6 @@ namespace tk205 { namespace rs0004_ns { - void from_json(const nlohmann::json& j, Schema& x) { - } const std::string_view Schema::schema_title = "Air-to-Air Direct Expansion Refrigerant System"; const std::string_view Schema::schema_version = "1.0.0"; @@ -14,12 +12,12 @@ namespace tk205 { const std::string_view Schema::schema_description = "Schema for ASHRAE 205 annex RS0004: Air-to-Air Direct Expansion Refrigerant System"; void from_json(const nlohmann::json& j, ProductInformation& x) { - a205_json_get(j, "outdoor_unit_manufacturer", x.outdoor_unit_manufacturer, x.outdoor_unit_manufacturer_is_set, false); - a205_json_get(j, "outdoor_unit_model_number", x.outdoor_unit_model_number, x.outdoor_unit_model_number_is_set, false); - a205_json_get(j, "indoor_unit_manufacturer", x.indoor_unit_manufacturer, x.indoor_unit_manufacturer_is_set, false); - a205_json_get(j, "indoor_unit_model_number", x.indoor_unit_model_number, x.indoor_unit_model_number_is_set, false); - a205_json_get(j, "refrigerant", x.refrigerant, x.refrigerant_is_set, false); - a205_json_get(j, "compressor_type", x.compressor_type, x.compressor_type_is_set, false); + a205_json_get(j, *RS0004::logger, "outdoor_unit_manufacturer", x.outdoor_unit_manufacturer, x.outdoor_unit_manufacturer_is_set, false); + a205_json_get(j, *RS0004::logger, "outdoor_unit_model_number", x.outdoor_unit_model_number, x.outdoor_unit_model_number_is_set, false); + a205_json_get(j, *RS0004::logger, "indoor_unit_manufacturer", x.indoor_unit_manufacturer, x.indoor_unit_manufacturer_is_set, false); + a205_json_get(j, *RS0004::logger, "indoor_unit_model_number", x.indoor_unit_model_number, x.indoor_unit_model_number_is_set, false); + a205_json_get(j, *RS0004::logger, "refrigerant", x.refrigerant, x.refrigerant_is_set, false); + a205_json_get(j, *RS0004::logger, "compressor_type", x.compressor_type, x.compressor_type_is_set, false); } const std::string_view ProductInformation::outdoor_unit_manufacturer_units = ""; @@ -58,7 +56,7 @@ namespace tk205 { const std::string_view ProductInformation::compressor_type_name = "compressor_type"; void from_json(const nlohmann::json& j, Description& x) { - a205_json_get(j, "product_information", x.product_information, x.product_information_is_set, false); + a205_json_get(j, *RS0004::logger, "product_information", x.product_information, x.product_information_is_set, false); } const std::string_view Description::product_information_units = ""; @@ -67,12 +65,12 @@ namespace tk205 { const std::string_view Description::product_information_name = "product_information"; void from_json(const nlohmann::json& j, GridVariablesCooling& x) { - a205_json_get>(j, "outdoor_coil_entering_dry_bulb_temperature", x.outdoor_coil_entering_dry_bulb_temperature, x.outdoor_coil_entering_dry_bulb_temperature_is_set, true); - a205_json_get>(j, "indoor_coil_entering_relative_humidity", x.indoor_coil_entering_relative_humidity, x.indoor_coil_entering_relative_humidity_is_set, true); - a205_json_get>(j, "indoor_coil_entering_dry_bulb_temperature", x.indoor_coil_entering_dry_bulb_temperature, x.indoor_coil_entering_dry_bulb_temperature_is_set, true); - a205_json_get>(j, "indoor_coil_air_mass_flow_rate", x.indoor_coil_air_mass_flow_rate, x.indoor_coil_air_mass_flow_rate_is_set, true); - a205_json_get>(j, "compressor_sequence_number", x.compressor_sequence_number, x.compressor_sequence_number_is_set, true); - a205_json_get>(j, "ambient_absolute_air_pressure", x.ambient_absolute_air_pressure, x.ambient_absolute_air_pressure_is_set, true); + a205_json_get>(j, *RS0004::logger, "outdoor_coil_entering_dry_bulb_temperature", x.outdoor_coil_entering_dry_bulb_temperature, x.outdoor_coil_entering_dry_bulb_temperature_is_set, true); + a205_json_get>(j, *RS0004::logger, "indoor_coil_entering_relative_humidity", x.indoor_coil_entering_relative_humidity, x.indoor_coil_entering_relative_humidity_is_set, true); + a205_json_get>(j, *RS0004::logger, "indoor_coil_entering_dry_bulb_temperature", x.indoor_coil_entering_dry_bulb_temperature, x.indoor_coil_entering_dry_bulb_temperature_is_set, true); + a205_json_get>(j, *RS0004::logger, "indoor_coil_air_mass_flow_rate", x.indoor_coil_air_mass_flow_rate, x.indoor_coil_air_mass_flow_rate_is_set, true); + a205_json_get>(j, *RS0004::logger, "compressor_sequence_number", x.compressor_sequence_number, x.compressor_sequence_number_is_set, true); + a205_json_get>(j, *RS0004::logger, "ambient_absolute_air_pressure", x.ambient_absolute_air_pressure, x.ambient_absolute_air_pressure_is_set, true); } void GridVariablesCooling::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, outdoor_coil_entering_dry_bulb_temperature); @@ -81,7 +79,7 @@ namespace tk205 { add_grid_axis(performance_map, indoor_coil_air_mass_flow_rate); add_grid_axis(performance_map, compressor_sequence_number); add_grid_axis(performance_map, ambient_absolute_air_pressure); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0004::logger); } const std::string_view GridVariablesCooling::outdoor_coil_entering_dry_bulb_temperature_units = "K"; @@ -120,9 +118,9 @@ namespace tk205 { const std::string_view GridVariablesCooling::ambient_absolute_air_pressure_name = "ambient_absolute_air_pressure"; void from_json(const nlohmann::json& j, LookupVariablesCooling& x) { - a205_json_get>(j, "gross_total_capacity", x.gross_total_capacity, x.gross_total_capacity_is_set, true); - a205_json_get>(j, "gross_sensible_capacity", x.gross_sensible_capacity, x.gross_sensible_capacity_is_set, true); - a205_json_get>(j, "gross_power", x.gross_power, x.gross_power_is_set, true); + a205_json_get>(j, *RS0004::logger, "gross_total_capacity", x.gross_total_capacity, x.gross_total_capacity_is_set, true); + a205_json_get>(j, *RS0004::logger, "gross_sensible_capacity", x.gross_sensible_capacity, x.gross_sensible_capacity_is_set, true); + a205_json_get>(j, *RS0004::logger, "gross_power", x.gross_power, x.gross_power_is_set, true); } void LookupVariablesCooling::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, gross_total_capacity); @@ -148,15 +146,15 @@ namespace tk205 { const std::string_view LookupVariablesCooling::gross_power_name = "gross_power"; void from_json(const nlohmann::json& j, PerformanceMapCooling& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0004::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0004::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMapCooling::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0004::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0004::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMapCooling::grid_variables_units = ""; @@ -178,11 +176,11 @@ namespace tk205 { return s; } void from_json(const nlohmann::json& j, GridVariablesStandby& x) { - a205_json_get>(j, "outdoor_coil_environment_dry_bulb_temperature", x.outdoor_coil_environment_dry_bulb_temperature, x.outdoor_coil_environment_dry_bulb_temperature_is_set, true); + a205_json_get>(j, *RS0004::logger, "outdoor_coil_environment_dry_bulb_temperature", x.outdoor_coil_environment_dry_bulb_temperature, x.outdoor_coil_environment_dry_bulb_temperature_is_set, true); } void GridVariablesStandby::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, outdoor_coil_environment_dry_bulb_temperature); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0004::logger); } const std::string_view GridVariablesStandby::outdoor_coil_environment_dry_bulb_temperature_units = "K"; @@ -191,7 +189,7 @@ namespace tk205 { const std::string_view GridVariablesStandby::outdoor_coil_environment_dry_bulb_temperature_name = "outdoor_coil_environment_dry_bulb_temperature"; void from_json(const nlohmann::json& j, LookupVariablesStandby& x) { - a205_json_get>(j, "gross_power", x.gross_power, x.gross_power_is_set, true); + a205_json_get>(j, *RS0004::logger, "gross_power", x.gross_power, x.gross_power_is_set, true); } void LookupVariablesStandby::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, gross_power); @@ -203,15 +201,15 @@ namespace tk205 { const std::string_view LookupVariablesStandby::gross_power_name = "gross_power"; void from_json(const nlohmann::json& j, PerformanceMapStandby& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0004::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0004::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMapStandby::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0004::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0004::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMapStandby::grid_variables_units = ""; @@ -233,10 +231,10 @@ namespace tk205 { return s; } void from_json(const nlohmann::json& j, Performance& x) { - a205_json_get(j, "compressor_speed_control_type", x.compressor_speed_control_type, x.compressor_speed_control_type_is_set, true); - a205_json_get(j, "cycling_degradation_coefficient", x.cycling_degradation_coefficient, x.cycling_degradation_coefficient_is_set, true); - a205_json_get(j, "performance_map_cooling", x.performance_map_cooling, x.performance_map_cooling_is_set, true); - a205_json_get(j, "performance_map_standby", x.performance_map_standby, x.performance_map_standby_is_set, true); + a205_json_get(j, *RS0004::logger, "compressor_speed_control_type", x.compressor_speed_control_type, x.compressor_speed_control_type_is_set, true); + a205_json_get(j, *RS0004::logger, "cycling_degradation_coefficient", x.cycling_degradation_coefficient, x.cycling_degradation_coefficient_is_set, true); + a205_json_get(j, *RS0004::logger, "performance_map_cooling", x.performance_map_cooling, x.performance_map_cooling_is_set, true); + a205_json_get(j, *RS0004::logger, "performance_map_standby", x.performance_map_standby, x.performance_map_standby_is_set, true); } const std::string_view Performance::compressor_speed_control_type_units = ""; @@ -248,7 +246,7 @@ namespace tk205 { const std::string_view Performance::compressor_speed_control_type_description = "Method used to control different speeds of the compressor"; - const std::string_view Performance::cycling_degradation_coefficient_description = "Cycling degradation coefficient (CD) as described in AHRI 210/240"; + const std::string_view Performance::cycling_degradation_coefficient_description = "Cycling degradation coefficient (C~D~) as described in AHRI 210/240"; const std::string_view Performance::performance_map_cooling_description = "Data group describing cooling performance over a range of conditions"; @@ -263,15 +261,17 @@ namespace tk205 { const std::string_view Performance::performance_map_standby_name = "performance_map_standby"; void from_json(const nlohmann::json& j, RS0004& x) { - a205_json_get(j, "metadata", x.metadata, x.metadata_is_set, true); - a205_json_get(j, "description", x.description, x.description_is_set, false); - a205_json_get(j, "performance", x.performance, x.performance_is_set, true); + a205_json_get(j, *RS0004::logger, "metadata", x.metadata, x.metadata_is_set, true); + a205_json_get(j, *RS0004::logger, "description", x.description, x.description_is_set, false); + a205_json_get(j, *RS0004::logger, "performance", x.performance, x.performance_is_set, true); } void RS0004::initialize(const nlohmann::json& j) { - a205_json_get(j, "metadata", metadata, metadata_is_set, true); - a205_json_get(j, "description", description, description_is_set, false); - a205_json_get(j, "performance", performance, performance_is_set, true); + a205_json_get(j, *RS0004::logger, "metadata", metadata, metadata_is_set, true); + a205_json_get(j, *RS0004::logger, "description", description, description_is_set, false); + a205_json_get(j, *RS0004::logger, "performance", performance, performance_is_set, true); } + std::shared_ptr RS0004::logger {}; + const std::string_view RS0004::metadata_units = ""; const std::string_view RS0004::description_units = ""; diff --git a/src/rs0004_factory.cpp b/src/rs0004_factory.cpp index 31c76ab..b3a972b 100644 --- a/src/rs0004_factory.cpp +++ b/src/rs0004_factory.cpp @@ -1,13 +1,13 @@ #include "rs0004_factory.h" #include "rs0004.h" #include -#include +#include /// @note This class has been generated from a template. Local changes will not be saved! using namespace tk205; -std::shared_ptr RS0004Factory::create_instance(const char* RS_instance_file) const +std::shared_ptr RS0004Factory::create_instance(const char* RS_instance_file, std::shared_ptr logger) const { auto p_rs = std::make_shared(); auto j = tk205::load_json(RS_instance_file); @@ -17,10 +17,11 @@ std::shared_ptr RS0004Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << "Schema version " << schema_version << " is not supported."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } else if (j["metadata"]["schema"] == "RS0004") { + rs0004_ns::RS0004::logger = logger; p_rs->initialize(j); } else @@ -28,7 +29,7 @@ std::shared_ptr RS0004Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << RS_instance_file << " is not a valid instance of RS0004; returning nullptr."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } return p_rs; } diff --git a/src/rs0005.cpp b/src/rs0005.cpp index 3ec7b1c..0d15beb 100644 --- a/src/rs0005.cpp +++ b/src/rs0005.cpp @@ -5,8 +5,6 @@ namespace tk205 { namespace rs0005_ns { - void from_json(const nlohmann::json& j, Schema& x) { - } const std::string_view Schema::schema_title = "Motor"; const std::string_view Schema::schema_version = "1.0.0"; @@ -14,10 +12,10 @@ namespace tk205 { const std::string_view Schema::schema_description = "Schema for ASHRAE 205 annex RS0005: Motor"; void from_json(const nlohmann::json& j, ProductInformation& x) { - a205_json_get(j, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); - a205_json_get(j, "model_number", x.model_number, x.model_number_is_set, false); - a205_json_get(j, "nominal_voltage", x.nominal_voltage, x.nominal_voltage_is_set, false); - a205_json_get(j, "nominal_frequency", x.nominal_frequency, x.nominal_frequency_is_set, false); + a205_json_get(j, *RS0005::logger, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); + a205_json_get(j, *RS0005::logger, "model_number", x.model_number, x.model_number_is_set, false); + a205_json_get(j, *RS0005::logger, "nominal_voltage", x.nominal_voltage, x.nominal_voltage_is_set, false); + a205_json_get(j, *RS0005::logger, "nominal_frequency", x.nominal_frequency, x.nominal_frequency_is_set, false); } const std::string_view ProductInformation::manufacturer_units = ""; @@ -44,7 +42,7 @@ namespace tk205 { const std::string_view ProductInformation::nominal_frequency_name = "nominal_frequency"; void from_json(const nlohmann::json& j, Description& x) { - a205_json_get(j, "product_information", x.product_information, x.product_information_is_set, false); + a205_json_get(j, *RS0005::logger, "product_information", x.product_information, x.product_information_is_set, false); } const std::string_view Description::product_information_units = ""; @@ -53,13 +51,13 @@ namespace tk205 { const std::string_view Description::product_information_name = "product_information"; void from_json(const nlohmann::json& j, GridVariables& x) { - a205_json_get>(j, "shaft_power", x.shaft_power, x.shaft_power_is_set, true); - a205_json_get>(j, "shaft_rotational_speed", x.shaft_rotational_speed, x.shaft_rotational_speed_is_set, true); + a205_json_get>(j, *RS0005::logger, "shaft_power", x.shaft_power, x.shaft_power_is_set, true); + a205_json_get>(j, *RS0005::logger, "shaft_rotational_speed", x.shaft_rotational_speed, x.shaft_rotational_speed_is_set, true); } void GridVariables::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, shaft_power); add_grid_axis(performance_map, shaft_rotational_speed); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0005::logger); } const std::string_view GridVariables::shaft_power_units = "W"; @@ -74,8 +72,8 @@ namespace tk205 { const std::string_view GridVariables::shaft_rotational_speed_name = "shaft_rotational_speed"; void from_json(const nlohmann::json& j, LookupVariables& x) { - a205_json_get>(j, "efficiency", x.efficiency, x.efficiency_is_set, true); - a205_json_get>(j, "power_factor", x.power_factor, x.power_factor_is_set, true); + a205_json_get>(j, *RS0005::logger, "efficiency", x.efficiency, x.efficiency_is_set, true); + a205_json_get>(j, *RS0005::logger, "power_factor", x.power_factor, x.power_factor_is_set, true); } void LookupVariables::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, efficiency); @@ -94,15 +92,15 @@ namespace tk205 { const std::string_view LookupVariables::power_factor_name = "power_factor"; void from_json(const nlohmann::json& j, PerformanceMap& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0005::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0005::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMap::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0005::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0005::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMap::grid_variables_units = ""; @@ -124,11 +122,11 @@ namespace tk205 { return s; } void from_json(const nlohmann::json& j, Performance& x) { - a205_json_get(j, "maximum_power", x.maximum_power, x.maximum_power_is_set, true); - a205_json_get(j, "standby_power", x.standby_power, x.standby_power_is_set, true); - a205_json_get(j, "number_of_poles", x.number_of_poles, x.number_of_poles_is_set, true); - a205_json_get(j, "drive_representation", x.drive_representation, x.drive_representation_is_set, false); - a205_json_get(j, "performance_map", x.performance_map, x.performance_map_is_set, false); + a205_json_get(j, *RS0005::logger, "maximum_power", x.maximum_power, x.maximum_power_is_set, true); + a205_json_get(j, *RS0005::logger, "standby_power", x.standby_power, x.standby_power_is_set, true); + a205_json_get(j, *RS0005::logger, "number_of_poles", x.number_of_poles, x.number_of_poles_is_set, true); + a205_json_get(j, *RS0005::logger, "drive_representation", x.drive_representation, x.drive_representation_is_set, false); + a205_json_get(j, *RS0005::logger, "performance_map", x.performance_map, x.performance_map_is_set, false); } const std::string_view Performance::maximum_power_units = "W"; @@ -161,15 +159,17 @@ namespace tk205 { const std::string_view Performance::performance_map_name = "performance_map"; void from_json(const nlohmann::json& j, RS0005& x) { - a205_json_get(j, "metadata", x.metadata, x.metadata_is_set, true); - a205_json_get(j, "description", x.description, x.description_is_set, false); - a205_json_get(j, "performance", x.performance, x.performance_is_set, true); + a205_json_get(j, *RS0005::logger, "metadata", x.metadata, x.metadata_is_set, true); + a205_json_get(j, *RS0005::logger, "description", x.description, x.description_is_set, false); + a205_json_get(j, *RS0005::logger, "performance", x.performance, x.performance_is_set, true); } void RS0005::initialize(const nlohmann::json& j) { - a205_json_get(j, "metadata", metadata, metadata_is_set, true); - a205_json_get(j, "description", description, description_is_set, false); - a205_json_get(j, "performance", performance, performance_is_set, true); + a205_json_get(j, *RS0005::logger, "metadata", metadata, metadata_is_set, true); + a205_json_get(j, *RS0005::logger, "description", description, description_is_set, false); + a205_json_get(j, *RS0005::logger, "performance", performance, performance_is_set, true); } + std::shared_ptr RS0005::logger {}; + const std::string_view RS0005::metadata_units = ""; const std::string_view RS0005::description_units = ""; diff --git a/src/rs0005_factory.cpp b/src/rs0005_factory.cpp index 9e74bcc..a01cf45 100644 --- a/src/rs0005_factory.cpp +++ b/src/rs0005_factory.cpp @@ -1,13 +1,13 @@ #include "rs0005_factory.h" #include "rs0005.h" #include -#include +#include /// @note This class has been generated from a template. Local changes will not be saved! using namespace tk205; -std::shared_ptr RS0005Factory::create_instance(const char* RS_instance_file) const +std::shared_ptr RS0005Factory::create_instance(const char* RS_instance_file, std::shared_ptr logger) const { auto p_rs = std::make_shared(); auto j = tk205::load_json(RS_instance_file); @@ -17,10 +17,11 @@ std::shared_ptr RS0005Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << "Schema version " << schema_version << " is not supported."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } else if (j["metadata"]["schema"] == "RS0005") { + rs0005_ns::RS0005::logger = logger; p_rs->initialize(j); } else @@ -28,7 +29,7 @@ std::shared_ptr RS0005Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << RS_instance_file << " is not a valid instance of RS0005; returning nullptr."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } return p_rs; } diff --git a/src/rs0006.cpp b/src/rs0006.cpp index efccde4..148d7df 100644 --- a/src/rs0006.cpp +++ b/src/rs0006.cpp @@ -5,8 +5,6 @@ namespace tk205 { namespace rs0006_ns { - void from_json(const nlohmann::json& j, Schema& x) { - } const std::string_view Schema::schema_title = "Electronic Motor Drive"; const std::string_view Schema::schema_version = "1.0.0"; @@ -14,8 +12,8 @@ namespace tk205 { const std::string_view Schema::schema_description = "Schema for ASHRAE 205 annex RS0006: Electronic Motor Drive"; void from_json(const nlohmann::json& j, ProductInformation& x) { - a205_json_get(j, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); - a205_json_get(j, "model_number", x.model_number, x.model_number_is_set, false); + a205_json_get(j, *RS0006::logger, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); + a205_json_get(j, *RS0006::logger, "model_number", x.model_number, x.model_number_is_set, false); } const std::string_view ProductInformation::manufacturer_units = ""; @@ -30,7 +28,7 @@ namespace tk205 { const std::string_view ProductInformation::model_number_name = "model_number"; void from_json(const nlohmann::json& j, Description& x) { - a205_json_get(j, "product_information", x.product_information, x.product_information_is_set, false); + a205_json_get(j, *RS0006::logger, "product_information", x.product_information, x.product_information_is_set, false); } const std::string_view Description::product_information_units = ""; @@ -39,13 +37,13 @@ namespace tk205 { const std::string_view Description::product_information_name = "product_information"; void from_json(const nlohmann::json& j, GridVariables& x) { - a205_json_get>(j, "output_power", x.output_power, x.output_power_is_set, true); - a205_json_get>(j, "output_frequency", x.output_frequency, x.output_frequency_is_set, true); + a205_json_get>(j, *RS0006::logger, "output_power", x.output_power, x.output_power_is_set, true); + a205_json_get>(j, *RS0006::logger, "output_frequency", x.output_frequency, x.output_frequency_is_set, true); } void GridVariables::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, output_power); add_grid_axis(performance_map, output_frequency); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0006::logger); } const std::string_view GridVariables::output_power_units = "W"; @@ -60,7 +58,7 @@ namespace tk205 { const std::string_view GridVariables::output_frequency_name = "output_frequency"; void from_json(const nlohmann::json& j, LookupVariables& x) { - a205_json_get>(j, "efficiency", x.efficiency, x.efficiency_is_set, true); + a205_json_get>(j, *RS0006::logger, "efficiency", x.efficiency, x.efficiency_is_set, true); } void LookupVariables::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, efficiency); @@ -72,15 +70,15 @@ namespace tk205 { const std::string_view LookupVariables::efficiency_name = "efficiency"; void from_json(const nlohmann::json& j, PerformanceMap& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0006::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0006::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMap::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0006::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0006::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMap::grid_variables_units = ""; @@ -102,10 +100,10 @@ namespace tk205 { return s; } void from_json(const nlohmann::json& j, Performance& x) { - a205_json_get(j, "maximum_power", x.maximum_power, x.maximum_power_is_set, true); - a205_json_get(j, "standby_power", x.standby_power, x.standby_power_is_set, true); - a205_json_get(j, "cooling_method", x.cooling_method, x.cooling_method_is_set, true); - a205_json_get(j, "performance_map", x.performance_map, x.performance_map_is_set, true); + a205_json_get(j, *RS0006::logger, "maximum_power", x.maximum_power, x.maximum_power_is_set, true); + a205_json_get(j, *RS0006::logger, "standby_power", x.standby_power, x.standby_power_is_set, true); + a205_json_get(j, *RS0006::logger, "cooling_method", x.cooling_method, x.cooling_method_is_set, true); + a205_json_get(j, *RS0006::logger, "performance_map", x.performance_map, x.performance_map_is_set, true); } const std::string_view Performance::maximum_power_units = "W"; @@ -132,15 +130,17 @@ namespace tk205 { const std::string_view Performance::performance_map_name = "performance_map"; void from_json(const nlohmann::json& j, RS0006& x) { - a205_json_get(j, "metadata", x.metadata, x.metadata_is_set, true); - a205_json_get(j, "description", x.description, x.description_is_set, false); - a205_json_get(j, "performance", x.performance, x.performance_is_set, true); + a205_json_get(j, *RS0006::logger, "metadata", x.metadata, x.metadata_is_set, true); + a205_json_get(j, *RS0006::logger, "description", x.description, x.description_is_set, false); + a205_json_get(j, *RS0006::logger, "performance", x.performance, x.performance_is_set, true); } void RS0006::initialize(const nlohmann::json& j) { - a205_json_get(j, "metadata", metadata, metadata_is_set, true); - a205_json_get(j, "description", description, description_is_set, false); - a205_json_get(j, "performance", performance, performance_is_set, true); + a205_json_get(j, *RS0006::logger, "metadata", metadata, metadata_is_set, true); + a205_json_get(j, *RS0006::logger, "description", description, description_is_set, false); + a205_json_get(j, *RS0006::logger, "performance", performance, performance_is_set, true); } + std::shared_ptr RS0006::logger {}; + const std::string_view RS0006::metadata_units = ""; const std::string_view RS0006::description_units = ""; diff --git a/src/rs0006_factory.cpp b/src/rs0006_factory.cpp index f490b44..a91e1d3 100644 --- a/src/rs0006_factory.cpp +++ b/src/rs0006_factory.cpp @@ -1,13 +1,13 @@ #include "rs0006_factory.h" #include "rs0006.h" #include -#include +#include /// @note This class has been generated from a template. Local changes will not be saved! using namespace tk205; -std::shared_ptr RS0006Factory::create_instance(const char* RS_instance_file) const +std::shared_ptr RS0006Factory::create_instance(const char* RS_instance_file, std::shared_ptr logger) const { auto p_rs = std::make_shared(); auto j = tk205::load_json(RS_instance_file); @@ -17,10 +17,11 @@ std::shared_ptr RS0006Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << "Schema version " << schema_version << " is not supported."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } else if (j["metadata"]["schema"] == "RS0006") { + rs0006_ns::RS0006::logger = logger; p_rs->initialize(j); } else @@ -28,7 +29,7 @@ std::shared_ptr RS0006Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << RS_instance_file << " is not a valid instance of RS0006; returning nullptr."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } return p_rs; } diff --git a/src/rs0007.cpp b/src/rs0007.cpp index 89acfa2..bb59661 100644 --- a/src/rs0007.cpp +++ b/src/rs0007.cpp @@ -5,8 +5,6 @@ namespace tk205 { namespace rs0007_ns { - void from_json(const nlohmann::json& j, Schema& x) { - } const std::string_view Schema::schema_title = "Mechanical Drive"; const std::string_view Schema::schema_version = "1.0.0"; @@ -14,9 +12,9 @@ namespace tk205 { const std::string_view Schema::schema_description = "Schema for ASHRAE 205 annex RS0007: Mechanical Drive"; void from_json(const nlohmann::json& j, ProductInformation& x) { - a205_json_get(j, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); - a205_json_get(j, "model_number", x.model_number, x.model_number_is_set, false); - a205_json_get(j, "drive_type", x.drive_type, x.drive_type_is_set, false); + a205_json_get(j, *RS0007::logger, "manufacturer", x.manufacturer, x.manufacturer_is_set, false); + a205_json_get(j, *RS0007::logger, "model_number", x.model_number, x.model_number_is_set, false); + a205_json_get(j, *RS0007::logger, "drive_type", x.drive_type, x.drive_type_is_set, false); } const std::string_view ProductInformation::manufacturer_units = ""; @@ -37,7 +35,7 @@ namespace tk205 { const std::string_view ProductInformation::drive_type_name = "drive_type"; void from_json(const nlohmann::json& j, Description& x) { - a205_json_get(j, "product_information", x.product_information, x.product_information_is_set, false); + a205_json_get(j, *RS0007::logger, "product_information", x.product_information, x.product_information_is_set, false); } const std::string_view Description::product_information_units = ""; @@ -46,11 +44,11 @@ namespace tk205 { const std::string_view Description::product_information_name = "product_information"; void from_json(const nlohmann::json& j, GridVariables& x) { - a205_json_get>(j, "output_power", x.output_power, x.output_power_is_set, true); + a205_json_get>(j, *RS0007::logger, "output_power", x.output_power, x.output_power_is_set, true); } void GridVariables::populate_performance_map(PerformanceMapBase* performance_map) { add_grid_axis(performance_map, output_power); - performance_map->finalize_grid(); + performance_map->finalize_grid(RS0007::logger); } const std::string_view GridVariables::output_power_units = "W"; @@ -59,7 +57,7 @@ namespace tk205 { const std::string_view GridVariables::output_power_name = "output_power"; void from_json(const nlohmann::json& j, LookupVariables& x) { - a205_json_get>(j, "efficiency", x.efficiency, x.efficiency_is_set, true); + a205_json_get>(j, *RS0007::logger, "efficiency", x.efficiency, x.efficiency_is_set, true); } void LookupVariables::populate_performance_map(PerformanceMapBase* performance_map) { add_data_table(performance_map, efficiency); @@ -71,15 +69,15 @@ namespace tk205 { const std::string_view LookupVariables::efficiency_name = "efficiency"; void from_json(const nlohmann::json& j, PerformanceMap& x) { - a205_json_get(j, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); + a205_json_get(j, *RS0007::logger, "grid_variables", x.grid_variables, x.grid_variables_is_set, true); x.grid_variables.populate_performance_map(&x); - a205_json_get(j, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); + a205_json_get(j, *RS0007::logger, "lookup_variables", x.lookup_variables, x.lookup_variables_is_set, true); x.lookup_variables.populate_performance_map(&x); } void PerformanceMap::initialize(const nlohmann::json& j) { - a205_json_get(j, "grid_variables", grid_variables, grid_variables_is_set, true); + a205_json_get(j, *RS0007::logger, "grid_variables", grid_variables, grid_variables_is_set, true); grid_variables.populate_performance_map(this); - a205_json_get(j, "lookup_variables", lookup_variables, lookup_variables_is_set, true); + a205_json_get(j, *RS0007::logger, "lookup_variables", lookup_variables, lookup_variables_is_set, true); lookup_variables.populate_performance_map(this); } const std::string_view PerformanceMap::grid_variables_units = ""; @@ -101,8 +99,8 @@ namespace tk205 { return s; } void from_json(const nlohmann::json& j, Performance& x) { - a205_json_get(j, "speed_ratio", x.speed_ratio, x.speed_ratio_is_set, true); - a205_json_get(j, "performance_map", x.performance_map, x.performance_map_is_set, true); + a205_json_get(j, *RS0007::logger, "speed_ratio", x.speed_ratio, x.speed_ratio_is_set, true); + a205_json_get(j, *RS0007::logger, "performance_map", x.performance_map, x.performance_map_is_set, true); } const std::string_view Performance::speed_ratio_units = "-"; @@ -117,15 +115,17 @@ namespace tk205 { const std::string_view Performance::performance_map_name = "performance_map"; void from_json(const nlohmann::json& j, RS0007& x) { - a205_json_get(j, "metadata", x.metadata, x.metadata_is_set, true); - a205_json_get(j, "description", x.description, x.description_is_set, false); - a205_json_get(j, "performance", x.performance, x.performance_is_set, true); + a205_json_get(j, *RS0007::logger, "metadata", x.metadata, x.metadata_is_set, true); + a205_json_get(j, *RS0007::logger, "description", x.description, x.description_is_set, false); + a205_json_get(j, *RS0007::logger, "performance", x.performance, x.performance_is_set, true); } void RS0007::initialize(const nlohmann::json& j) { - a205_json_get(j, "metadata", metadata, metadata_is_set, true); - a205_json_get(j, "description", description, description_is_set, false); - a205_json_get(j, "performance", performance, performance_is_set, true); + a205_json_get(j, *RS0007::logger, "metadata", metadata, metadata_is_set, true); + a205_json_get(j, *RS0007::logger, "description", description, description_is_set, false); + a205_json_get(j, *RS0007::logger, "performance", performance, performance_is_set, true); } + std::shared_ptr RS0007::logger {}; + const std::string_view RS0007::metadata_units = ""; const std::string_view RS0007::description_units = ""; diff --git a/src/rs0007_factory.cpp b/src/rs0007_factory.cpp index 8d99ed9..24a1496 100644 --- a/src/rs0007_factory.cpp +++ b/src/rs0007_factory.cpp @@ -1,13 +1,13 @@ #include "rs0007_factory.h" #include "rs0007.h" #include -#include +#include /// @note This class has been generated from a template. Local changes will not be saved! using namespace tk205; -std::shared_ptr RS0007Factory::create_instance(const char* RS_instance_file) const +std::shared_ptr RS0007Factory::create_instance(const char* RS_instance_file, std::shared_ptr logger) const { auto p_rs = std::make_shared(); auto j = tk205::load_json(RS_instance_file); @@ -17,10 +17,11 @@ std::shared_ptr RS0007Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << "Schema version " << schema_version << " is not supported."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } else if (j["metadata"]["schema"] == "RS0007") { + rs0007_ns::RS0007::logger = logger; p_rs->initialize(j); } else @@ -28,7 +29,7 @@ std::shared_ptr RS0007Factory::create_instance(const char* RS_in p_rs = nullptr; std::ostringstream oss; oss << RS_instance_file << " is not a valid instance of RS0007; returning nullptr."; - tk205::show_message(tk205::MsgSeverity::ERR_205, oss.str()); + logger->error(oss.str()); } return p_rs; } diff --git a/src/rs_instance_factory.cpp b/src/rs_instance_factory.cpp index 6b30716..ba0790b 100644 --- a/src/rs_instance_factory.cpp +++ b/src/rs_instance_factory.cpp @@ -1,5 +1,7 @@ -#include "rs_instance_factory.h" #include +#include +#include "rs_instance_factory.h" +#include "rs_instance_base.h" namespace { @@ -23,10 +25,11 @@ namespace tk205 { //static std::shared_ptr RSInstanceFactory::create(std::string const& RS_ID, - const char* RS_instance_file) + const char* RS_instance_file, + std::shared_ptr logger) { const auto factory = get_RS_factory_map()[RS_ID]; - return (factory == nullptr) ? nullptr : factory->create_instance(RS_instance_file); + return (factory == nullptr) ? nullptr : factory->create_instance(RS_instance_file, logger); } } \ No newline at end of file diff --git a/test/fixtures_libtk205.hpp b/test/fixtures_libtk205.hpp index 2238749..314c2e6 100644 --- a/test/fixtures_libtk205.hpp +++ b/test/fixtures_libtk205.hpp @@ -4,6 +4,7 @@ #ifndef FIXTURE_LIBTK205_HPP_ #define FIXTURE_LIBTK205_HPP_ +#include #include "gtest/gtest.h" // The following headers are necessary to create an RS instance #include "rs0001.h" @@ -38,7 +39,7 @@ class RS0001BadFixture : public RSFixture RS0001BadFixture() : RSFixture() { RSInstanceFactory::register_factory("RS0001", std::make_shared()); - rs_ = RSInstanceFactory::create("RS0001", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0002/Unitary-Constant-Efficiency.RS0002.a205.json"); + rs_ = RSInstanceFactory::create("RS0001", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0002/Unitary-Constant-Efficiency.RS0002.a205.json", std::make_shared()); } }; @@ -48,7 +49,7 @@ class RS0001UnsupportedFixture : public RSFixture RS0001UnsupportedFixture() : RSFixture() { RSInstanceFactory::register_factory("RS0001", std::make_shared()); - rs_ = RSInstanceFactory::create("RS0001", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0001/Chiller-Unsupported.RS0001.a205.json"); + rs_ = RSInstanceFactory::create("RS0001", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0001/Chiller-Unsupported.RS0001.a205.json", std::make_shared()); } }; @@ -58,7 +59,7 @@ class RS0001Fixture : public RSFixture RS0001Fixture() : RSFixture() { RSInstanceFactory::register_factory("RS0001", std::make_shared()); - rs_ = RSInstanceFactory::create("RS0001", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0001/Chiller-Constant-Efficiency.RS0001.a205.json"); + rs_ = RSInstanceFactory::create("RS0001", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0001/Chiller-Constant-Efficiency.RS0001.a205.json", std::make_shared()); } }; @@ -68,7 +69,7 @@ class ASHRAEChillerFixture : public RSFixture ASHRAEChillerFixture() : RSFixture() { RSInstanceFactory::register_factory("RS0001", std::make_shared()); - rs_ = RSInstanceFactory::create("RS0001", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-C.RS0001.a205.json"); + rs_ = RSInstanceFactory::create("RS0001", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0001/ASHRAE90-1-2019-bd-Curve-Set-C.RS0001.a205.json", std::make_shared()); } }; @@ -78,7 +79,7 @@ class RS0002Fixture : public RSFixture RS0002Fixture() : RSFixture() { RSInstanceFactory::register_factory("RS0002", std::make_shared()); - rs_ = RSInstanceFactory::create("RS0002", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0002/Unitary-Constant-Efficiency.RS0002.a205.json"); + rs_ = RSInstanceFactory::create("RS0002", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0002/Unitary-Constant-Efficiency.RS0002.a205.json", std::make_shared()); } }; @@ -88,7 +89,7 @@ class RS0003Fixture : public RSFixture RS0003Fixture() : RSFixture() { RSInstanceFactory::register_factory("RS0003", std::make_shared()); - rs_= RSInstanceFactory::create("RS0003", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0003/Fan-Continuous.RS0003.a205.json"); + rs_= RSInstanceFactory::create("RS0003", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0003/Fan-Continuous.RS0003.a205.json", std::make_shared()); } }; @@ -98,7 +99,7 @@ class RS0004Fixture : public RSFixture RS0004Fixture() : RSFixture() { RSInstanceFactory::register_factory("RS0004", std::make_shared()); - rs_= RSInstanceFactory::create("RS0004", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0004/DX-Constant-Efficiency.RS0004.a205.json"); + rs_= RSInstanceFactory::create("RS0004", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0004/DX-Constant-Efficiency.RS0004.a205.json", std::make_shared()); } }; @@ -108,7 +109,7 @@ class RS0005Fixture : public RSFixture RS0005Fixture() : RSFixture() { RSInstanceFactory::register_factory("RS0005", std::make_shared()); - rs_= RSInstanceFactory::create("RS0005", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0005/Motor-Constant-Efficiency.RS0005.a205.json"); + rs_= RSInstanceFactory::create("RS0005", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0005/Motor-Constant-Efficiency.RS0005.a205.json", std::make_shared()); } }; @@ -118,7 +119,7 @@ class RS0006Fixture : public RSFixture RS0006Fixture() : RSFixture() { RSInstanceFactory::register_factory("RS0006", std::make_shared()); - rs_ = RSInstanceFactory::create("RS0006", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0006/Drive-Constant-Efficiency.RS0006.a205.json"); + rs_ = RSInstanceFactory::create("RS0006", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0006/Drive-Constant-Efficiency.RS0006.a205.json", std::make_shared()); } }; @@ -128,7 +129,7 @@ class RS0007Fixture : public RSFixture RS0007Fixture() : RSFixture() { RSInstanceFactory::register_factory("RS0007", std::make_shared()); - rs_ = RSInstanceFactory::create("RS0007", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0007/Belt-Drive-Constant-Efficiency.RS0007.a205.json"); + rs_ = RSInstanceFactory::create("RS0007", TEST205_INPUT_EXAMPLES_DIR "/examples/RS0007/Belt-Drive-Constant-Efficiency.RS0007.a205.json", std::make_shared()); } }; diff --git a/test/main_libtk205.cpp b/test/main_libtk205.cpp index 0917c46..c507307 100644 --- a/test/main_libtk205.cpp +++ b/test/main_libtk205.cpp @@ -50,7 +50,7 @@ TEST_F(RS0001Fixture, Calculate_performance_cooling_3) { auto rs = dynamic_cast(rs_.get()); EXPECT_TRUE(rs != nullptr); - auto result = rs->performance.performance_map_cooling.calculate_performance(0.0755, 280.0, 0.0957, 295.0, 0.5, Btwxt::Method::LINEAR).condenser_liquid_leaving_temperature; + auto result = rs->performance.performance_map_cooling.calculate_performance(0.0755, 280.0, 0.0957, 295.0, 0.5, Btwxt::Method::linear).condenser_liquid_leaving_temperature; EXPECT_NEAR(result, 296.03, 0.001); } @@ -59,8 +59,8 @@ TEST_F(ASHRAEChillerFixture, Calculate_performance_cubic) auto rs = dynamic_cast(rs_.get()); EXPECT_TRUE(rs != nullptr); std::vector target {0.00565, 280.0, 0.00845, 297.0, 1.5}; //NOLINT : Magic numbers necessary! - auto result1 = rs->performance.performance_map_cooling.calculate_performance(target, Btwxt::Method::LINEAR); - auto result2 = rs->performance.performance_map_cooling.calculate_performance(target, Btwxt::Method::CUBIC); + auto result1 = rs->performance.performance_map_cooling.calculate_performance(target, Btwxt::Method::linear); + auto result2 = rs->performance.performance_map_cooling.calculate_performance(target, Btwxt::Method::cubic); EXPECT_NE(result1, result2); } @@ -78,6 +78,7 @@ TEST_F(RS0003Fixture, Verify_grid_variable_index) auto rs = dynamic_cast(rs_.get()); EXPECT_TRUE(rs != nullptr); auto pm = dynamic_cast(rs->performance.performance_map.get()); + EXPECT_TRUE(pm != nullptr); auto result = pm->grid_variables.static_pressure_difference_index; EXPECT_EQ(result, 1u); } @@ -96,33 +97,8 @@ TEST_F(RS0001Fixture, Verify_element_metadata) EXPECT_THAT(result, "gpm"); } -void Display_message(MsgSeverity severity, const std::string &message, void *) -{ - static std::map severity_str { - {MsgSeverity::DEBUG_205, "DEBUG"}, - {MsgSeverity::INFO_205, "INFO"}, - {MsgSeverity::WARN_205, "WARN"}, - {MsgSeverity::ERR_205, "ERR"} - }; - std::cout << severity_str[severity] << ": " << message << std::endl; -} - -void Btwxt_message(const Btwxt::MsgLevel messageType, const std::string message, - void *) -{ - static std::map severity { - {Btwxt::MsgLevel::MSG_DEBUG, MsgSeverity::DEBUG_205}, - {Btwxt::MsgLevel::MSG_INFO, MsgSeverity::INFO_205}, - {Btwxt::MsgLevel::MSG_WARN, MsgSeverity::WARN_205}, - {Btwxt::MsgLevel::MSG_ERR, MsgSeverity::ERR_205} - }; - Display_message(severity[messageType], message, nullptr); -} - int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); - tk205::set_error_handler(Display_message, nullptr); - Btwxt::setMessageCallback(Btwxt_message, nullptr); return RUN_ALL_TESTS(); } From 99729efd90caac904539b9019228b79e07870cac Mon Sep 17 00:00:00 2001 From: Tanaya Mankad Date: Tue, 16 May 2023 11:56:49 -0600 Subject: [PATCH 2/5] Manual merge from branch that was created in toolkit repo. --- .gitignore | 3 +++ .gitmodules | 3 +++ CMakeLists.txt | 14 ++++++++------ cmake/compiler-flags.cmake | 7 +++++++ src/CMakeLists.txt | 31 +++++++++++++++++++++++++------ test/CMakeLists.txt | 16 +++++----------- vendor/CMakeLists.txt | 10 +++++++++- vendor/btwxt | 2 +- 8 files changed, 61 insertions(+), 25 deletions(-) create mode 100644 .gitignore create mode 100644 cmake/compiler-flags.cmake diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e5ea118 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build/ +.vscode/ +__pycache__/ diff --git a/.gitmodules b/.gitmodules index 42f6ab8..476b999 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "vendor/btwxt"] path = vendor/btwxt url = https://github.com/bigladder/btwxt.git +[submodule "vendor/courierr"] + path = vendor/courierr + url = https://github.com/bigladder/courierr.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 6414cc5..acbd7cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,20 +12,22 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) "MinSizeRel" "RelWithDebInfo") endif() +find_package(Git QUIET) + include(CTest) set(JSON_BuildTests OFF CACHE INTERNAL "") -option( LIBTK205_BUILD_TESTING "Build libtk205 testing targets." ON ) + +option(${PROJECT_NAME}_BUILD_TESTING "Build ${PROJECT_NAME} testing targets" OFF) +option(${PROJECT_NAME}_COVERAGE "Add ${PROJECT_NAME} coverage reports" OFF) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) +include(compiler-flags) + add_subdirectory(src) add_subdirectory(vendor) -if (LIBTK205_BUILD_TESTING) +if (${PROJECT_NAME}_BUILD_TESTING) add_compile_definitions(TEST205_INPUT_EXAMPLES_DIR="${PROJECT_SOURCE_DIR}") enable_testing() add_subdirectory(test) endif() - -# set(CPACK_PROJECT_NAME ${PROJECT_NAME}) -# set(CPACK_PROJECT_VERSION ${PROJECT_VERSION}) -# include(CPack) diff --git a/cmake/compiler-flags.cmake b/cmake/compiler-flags.cmake new file mode 100644 index 0000000..a213da0 --- /dev/null +++ b/cmake/compiler-flags.cmake @@ -0,0 +1,7 @@ +if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + if (UNIX) + add_definitions("-fPIC") + endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") +endif() + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 031d223..0e7e348 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,15 +1,34 @@ file(GLOB lib_headers "${PROJECT_SOURCE_DIR}/include/libtk205/*.h") file(GLOB lib_src "${PROJECT_SOURCE_DIR}/src/*.cpp") -set (SOURCES "${lib_headers}" +set (sources "${lib_headers}" "${lib_src}") -add_library(libtk205 ${SOURCES}) +option(${PROJECT_NAME}_STATIC_LIB "Make ${PROJECT_NAME} a static library" ON) + +if (${PROJECT_NAME}_STATIC_LIB) + add_library(${PROJECT_NAME} STATIC ${sources}) + set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-D${PROJECT_NAME}_STATIC_DEFINE") +else () + set(CMAKE_MACOSX_RPATH 1) + add_library(${PROJECT_NAME} SHARED ${sources}) +endif () + +target_link_libraries(libtk205 PUBLIC courierr fmt nlohmann_json) target_include_directories(libtk205 PUBLIC ${PROJECT_SOURCE_DIR}/include/libtk205) -target_include_directories(libtk205 PUBLIC ${PROJECT_SOURCE_DIR}/vendor/btwxt/src) -target_include_directories(libtk205 PRIVATE ${PROJECT_SOURCE_DIR}/vendor/json/single_include) -target_include_directories(libtk205 PRIVATE ${PROJECT_SOURCE_DIR}/vendor/json/include) +target_include_directories(libtk205 PUBLIC ${PROJECT_SOURCE_DIR}/vendor/btwxt/include/btwxt) target_include_directories(libtk205 PRIVATE ${PROJECT_SOURCE_DIR}/vendor/valijson/include) -# target_compile_features(libtk205 PUBLIC cxx_std_17) +target_compile_options(${PROJECT_NAME} PRIVATE + $<$:/W4> + $<$,$,$>: + -Wall -Wextra -Wpedantic> + ) + +target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) +include(GenerateExportHeader) +generate_export_header(${PROJECT_NAME}) +if (${PROJECT_NAME}_COVERAGE) + add_coverage(${PROJECT_NAME}) +endif () diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0b6bdf1..c22b186 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,20 +1,14 @@ # Test Executable -include_directories(${PROJECT_SOURCE_DIR}/vendor/json/single_include) -include_directories(${PROJECT_SOURCE_DIR}/vendor/json/include) -include_directories(${gtest_SOURCE_DIR}/include) - include(GoogleTest) set (SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/fixtures_libtk205.hpp ${CMAKE_CURRENT_SOURCE_DIR}/main_libtk205.cpp) -#Does the following command do anything? -set_source_files_properties(${SOURCES} PROPERTIES GENERATED TRUE) +set_source_files_properties(${SOURCES} PROPERTIES GENERATED TRUE) #TODO: Check if GENERATED property is used -add_executable(libtk205_tests ${SOURCES}) -# target_compile_features(libtk205_tests PUBLIC cxx_std_17) -target_include_directories(libtk205_tests PRIVATE ${PROJECT_SOURCE_DIR}/include/libtk205) -target_link_libraries(libtk205_tests PRIVATE libtk205 btwxt gtest gmock) +add_executable(${PROJECT_NAME}_tests ${SOURCES}) +target_include_directories(${PROJECT_NAME}_tests PRIVATE ${gtest_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/include/libtk205) +target_link_libraries(${PROJECT_NAME}_tests PRIVATE libtk205 btwxt nlohmann_json gtest gmock) -gtest_discover_tests(libtk205_tests TEST_PREFIX libtk205:) +gtest_discover_tests(${PROJECT_NAME}_tests TEST_PREFIX ${PROJECT_NAME}:) diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 7937766..b2af044 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -5,7 +5,15 @@ if (NOT TARGET btwxt) add_subdirectory(btwxt) endif() -if (LIBTK205_BUILD_TESTING AND NOT TARGET gtest) +if (NOT TARGET courierr) + add_subdirectory(courierr) +endif() + +if (NOT TARGET nlohmann_json) + add_subdirectory(json) +endif() + +if (${PROJECT_NAME}_BUILD_TESTING AND NOT TARGET gtest) # Prevent GoogleTest from overriding our compiler/linker options # when building with Visual Studio diff --git a/vendor/btwxt b/vendor/btwxt index 1b748c9..eaeab04 160000 --- a/vendor/btwxt +++ b/vendor/btwxt @@ -1 +1 @@ -Subproject commit 1b748c9276cc73c0d213fd50025719234713afdd +Subproject commit eaeab04afb8201478a2df08d2ed292462ab46717 From 663328fa9b2802a491d1f10a5055fa779ece0d54 Mon Sep 17 00:00:00 2001 From: Tanaya Mankad Date: Tue, 16 May 2023 12:25:59 -0600 Subject: [PATCH 3/5] Merge courierr submodule from prior branch. --- vendor/courierr | 1 + 1 file changed, 1 insertion(+) create mode 160000 vendor/courierr diff --git a/vendor/courierr b/vendor/courierr new file mode 160000 index 0000000..63ac2cf --- /dev/null +++ b/vendor/courierr @@ -0,0 +1 @@ +Subproject commit 63ac2cffada8afe76529a2c443adac5acda61192 From c0118305ecb2eae8cd6d88b6e0327ac2c06a03cd Mon Sep 17 00:00:00 2001 From: Tanaya Mankad Date: Tue, 16 May 2023 15:52:41 -0600 Subject: [PATCH 4/5] Update include paths. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0e7e348..b1b2a0c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ endif () target_link_libraries(libtk205 PUBLIC courierr fmt nlohmann_json) target_include_directories(libtk205 PUBLIC ${PROJECT_SOURCE_DIR}/include/libtk205) -target_include_directories(libtk205 PUBLIC ${PROJECT_SOURCE_DIR}/vendor/btwxt/include/btwxt) +target_include_directories(libtk205 PUBLIC ${PROJECT_SOURCE_DIR}/vendor/btwxt/include) target_include_directories(libtk205 PRIVATE ${PROJECT_SOURCE_DIR}/vendor/valijson/include) target_compile_options(${PROJECT_NAME} PRIVATE From 904d2627dc9147dcf6f990a6c9e1228262c122ab Mon Sep 17 00:00:00 2001 From: Tanaya Mankad Date: Tue, 22 Aug 2023 12:22:50 -0600 Subject: [PATCH 5/5] Update btwxt. --- vendor/btwxt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/btwxt b/vendor/btwxt index eaeab04..5363cdd 160000 --- a/vendor/btwxt +++ b/vendor/btwxt @@ -1 +1 @@ -Subproject commit eaeab04afb8201478a2df08d2ed292462ab46717 +Subproject commit 5363cdde123c5916999a2010397714495e73f50d