Merge pull request #535 from NREL/develop

Update CHP Defaults, Fix heating load bugs

.helm/secret/development-keys.py

@@ -1 +1 @@
-1000ce22f243495fe947e4257eced3daf6bcaabd50c691fafac406fbe5acfb8f80a24040a8b08c167860fd05a7aa976360fe60f7e328e29eb0cb829228ce371c14dd99c9f2afe18e5bfc87017a7675b3666e0a6d3bb0ae23dab423d1efb4b3627e54675f3c8aca959afd370895153d34b368f774f841ca76296dc17b6d11906a4b7fa549b945c4eff85f03e0fc71a048d69d9c5b05b65f6625bf908c60b8b936c40c830f19248620f35e67ca66580b2659c532beada0ff9db95f447ac442fa65f17e1f5c9e36bbaad3f6d8189da5006ba544e600edd60e36393fc8091bd669764fb6f67baac991230e491b6a3f97c7e91c60205fc3b24b4c1843e079521188f9e683c8b45914fdc4c9f53927f6d692e38e1b1714ec2d20f24b0b3cbd0dfe1456c0d23628f6fd533f5551e1e84486d20d7d57ca4345472cda65de7481d2f2c6f794fb2bd1f8daf498d0311ef2dfdf149dc81edbef122d7a1e7a67b1276db7965751de6a0f25838614eef97a5a69a1d5e9b0898231b87f4e47e0d28c3c2dcb87b8d02a242f4c8a1b69d2e3d8427e1fdde7b5fbd57c17ca8336e45faead05aa0b4c46eb4d12894454a89f9994bef8312e2521d3f1f17894820285cf4fa1462ab69105e7e393afc5517b5ce2a8353117eb57337b565ba749c4fe781be2b620de3dc0a22766f0426410f9c3538124e189f1910fa2a9c35dee8d2ae67fbb2e429b89564bb978db2a02a368254cb4b572ca31aa7870dd47a171bcf87fc234dbb42710931f36713a953b5eee15d58e59d659d76d67be2df3fbc236272c8a60d9ae51a045b9a479bda18b5963679d9e5ef66686fba798ff4006f76b2969e0357076dff5f9804188eb147a3c96e1b136df5786d5d965351f1cb2aefa7a07118795db99e5fcbdfab11adfa69ce711f3db927e916204f386ba31082f6dc147e0850ac584db247c773cc9242ca991b820b92d1a1868bf639732263d86d2ceec227f2ef5796413aac8082a6bb2ccb6d2315d748ec491e9b70a64309ee7e20980e64ae272f37349b1903db5f6b7b4413a6c5cfef758befcf3f50e6e2d9419430baacb12d17dd0e8a298c0abdab573e9c8761d57a2e68fbe6df3dc7ebabf48315b168c8aeb68f4d1675a7988e6e2d9c6a4af2beaf2fea7e2bc76f3545ccb9df5c95d00c76a2c71e4d8cc3aaf35b40d809b88317d047be260830ebaf1ac641b5a322dcada052dbf7e3dec87685fd13ef5e10c8cc423b8faaadb21329d7709fd6534f58bfd36c3df48d19dd23f8ddb37b3e5f2111653e5b9c8d6f4
+1000a287d4991b6127153631eee92ee306ab1a68dc7a9bdb8524a3de50ca2a666e9efb35319928d708a9da1f06efb7b15b0601339cb7995ddd6b3a0ffa00aa5597abdb6f553608acdc8e21fd3c6146f17d7f98ca01295a58b45a05e2a35e019fc23f7457409ec8d0a76cc4abb3e973348ac7b24e6d965769ebdd6104394b473c83b0725339f9346e0055d303178e5d855572027bb6b7ea4b871af5cc9367186d4baad982656a36805a122d9be9276f4bc91f57c3a373e0d9ef19084b8871ec8a4dea5f4e930f0097c7f1bb454f20bd8809cec4a96825304ca6061140551e792a983538fccde5137a069e0db683fba346b82b064bcf19abbba922a4a868425d1c47983a43f55046c0ad6e4cb56278aa59a2153141bf97e61a3b307ce8a325e816856604808d0b70d129366bb0ee7d333ae777164afa80fbe9c0101637f05094fb157da0935f5a580a3e5dc0ddf08c3d17e8d3256acb231af9ac4c6f8f013fb2f6497b640c3bf3ee2d2e4cc5ba2b396584faf6b5957948956799481ab6888fcc036ecb70425117ab15931e66184448f5e294e6c54d1b9d2142ec552d18b899f5c3e24bf2870e49a709e46355b62eb9a436baee47aad53a6504ee47d8c2e54724ed5b1120a222361e18bf7162eabae1d87c613bd87ef4b9d578bae3ffca241eb2a89cb90d7d7648767819a89bfaf96eb6ec53dac17271dd030706cec9ddac2454459a25d40384f7f5026fd085df6e16f2eaf1c49bd307e2fe62bc95f76d79fe4c71b8776fe60bd92e4a370b1cd2707bdbee5576fa0139c8277a47160fddc92bb167efc41726acebc32e63fa6fb6896b0102b179da146be946193996e22e2271574e70bf9d4191c9410536416611cf358e23acc324db381228aa03a9119d2dad8fad493ee3570302eb2d6df8dc78d1fec6fac406ce55ee6ba2b36ade3a68e47a5a2b76d563b47b583cc2d8e258bded75ea8edba123a95fd88eac3f4f5a45520f1fb417311c6f469e580150e0f4bb96e35f1cbec5ccd0d2d330a1ec799504bec44cfa256f9977ea55e1877f760f05e5457ef10cd6b2a34fd42ab5c02ad7fd6658f3d38fcb6a144cf27ee0581a90803e136155e9e891a60fcf2eba3a9d60e23a346e251cfc8a60a35c636f01b273179c3d514b4610f541237661b134a052159597f8e312856f22567831afbd9893dad5664a65474146abb8c3028b9520a8d7df4ae1424a976903aa14abe433b41d283b5e00e9b2d0b5e5eabe301bf16e8f22896b3455e53b914d90709b1241245c6606ae3b981a1c

.helm/secret/production-keys.py

@@ -1 +1 @@
-1000bbd8ada408f979c3e96d7e2a955c065c70c959144cef87e7e7d763267f7e8f4b6e4ccbd24ab5d2f33939bb2400c8f47a132064f2b6085fe1a06e434b8cb73dec5cb644668c1f3fd73fa076ae79d5535c1267ad6f92a7761a6f528cc8a325b43c36a5ca414d8695074d9553f105a7b841dde9901c1ed180e12d36563689df51a6d11673863a4fa1498e3003d0d8646809f3741272afae6f2cd385c838585a5ea78b04759f869679c8d68b097524275227b246b6c85210bcda564bedfe9fe78d4aa6d081842b7ca1b9a2eb491bfd1cd42a24eef89a27d6aa5f541f385e3f5e399b9ed688bdbb9b91cc6f7abb44f2092582443868fc99c58eeb7bdcce701f7a26dad7bdaa85be3b67168f22bb93b6737274d945d01dadd386d1016520b16cc7ea0da3a573b4be9f91a7860efd41f5e8dd44a3efdf00cf6f302fa40f86d5df68971163348b886d093958af28151a3c616fb997f2b32e822495374fca1d9700b741f267d8b7abdd0293361ed7b1e8fe968b162b9786530dd377b9c5d8d5b3de97a3dd9ac4bf36bcdfd8053e7cc5b3e53a35998fd58a12e31817102b4b4f9b0a5d9780b25b5d1e66dbff0a97ee4ccc0f186b081e69d79cbf74c251de26cab8d3b1d9d170033ae024f2577b1373ad6c862d64aab82da167af6ad58eccc17e1c32c849dc9f542d8f45e542f98ecc1ca119d263972df0ed461367b76d85fe151f8d98ed38455ca9c4dd58972d40c454c4a6c539bb8fb6b9dd64121539087c4a72a149c76d13625a88c964ecdcdfc39110e190748f071c63f52f6ed2135a8828f479852aa665240aade2dd8b3920d3ddadbf326519839d5754365f898c8b01821d201ef5d3c186fe2babc63fe98794d9145596352052058b3c58731573ceef75990ac8e2ccf64ef447b4f5b50840ddf71b171f1e0d3ebbfe32713c2367b4b1a955047bb339088ad3c936dafdca508d1cd7d30e2d607819086623ec347b1706407893860006f2f1d556f5c5aca981439ffa2500a4621777c7706c3479559dcd3b85af253722d0b95ee9d52a51fa5fe591d209297e515226c0bfd50add196d481c12f9bb699dd5404c48bb1e2e749aece0892f5dcbef57bc34b04241cf95cbf70727daf50e132b96f16e59099a5f102f78c190cb680a381f7253baca0e16b5f0215b223657ab969fd10583966a4647172a23e45fb6097d14d1a645ed00bbce091b705c8ca3ae
+100025a03b71714752567c2de575616c8b7579c7dadc9b11159121ab5ac4540b5066127f7806996f427e595a4b0704b5704c3a188a7a4dc7f38ec0276018e45e5476168601ff37467ed008284468c45601eac86636cfc0deb1df467202a9049c9130e963b39eaad74e6e3165c7d8adb1ff1ffb78ff61ece5ca7db4f9ed4eb81a5692987eff93ad3a7b45b6c0f9440ab0841fee83840a59f2c3c4423bdf45bd675d202156e7a216a6b5effcdfa0db1c05407ce36686b115498e823e47117707dd298ecf0e6b7594ea56a4e3720038ccd77ffdc69f917929e99c2e168056e46c318c269a0ca39fa75e97cb78b168f4fd8c55a4fea8f49086c3ef2081d27b310f899c10a7ae7ce7a9c9f44af09e7de46ee934ac849c0779cfb576f02124f40889f075b8e33427fd16e31b2a1171b89145993c1a958ca71fde968818cf18aebcad411dcf2bc749b4ec78d4e2a1ab777629851da1a3e91fe79b8049b5f6cae106667bd30321225d7c94489f1d59512472477e8a8127e6591992afd15cf379a70c5110790ab27429fcaa54eeaed5935854451bf88dea6ba2d0b6b7e77797e2d5053309d0c610dba06d51ba94afe35115a88e0664809c38f7906846f8e12dfc79c430de26039011c57cef6351a23b0751e91f1b33ea86e02d9e2779a7a79ec4045b8bc505d4076ab5814a9eba2c6155c54701a42810101c3c7b2579f5501976af502e88f6eca17db31bb0cd5baa846552fcd0c3e1b1d706919479122d543f4c0fa6b7bd5dba77d3794f30c989bd84b8f64cb692df5ca3e4e3f365bfefddaa2a37dad56f9aabebaaafa12ccc285a0cefe4d711f2b990141b759d8303c2288f59a8fe19d0f9988a012f161581723f8d0cea748f215889f9ba4cad109d042f488547a8fb16b2d742c5172a53654d609e0da25d163619349a6734cfa6407cbd928e579637be614753311b3c6eb65bc453eb666ad628b0279f4f1ada9d708e11c5d104cda2ce8dde01e40462ac89f3183997e54f28010acd8c6bebf9ea34d7882b4f021add6f1534426b85d06058664a63b331170ee54413ac047b2d18a233e0e5fbd2199058d594366c142e1d07c41a4efa98593847f2bde01c652b975a0be21be155a1d2f1628cae8ef3fb69a4340f1ec4f87299f127b065a8b19fe11b102adbad45e337ec1a8bd8e6bb30a5521466e86c603537f7549c4f4caa26160f25984e5065ca44c8a85d

.helm/secret/staging-keys.py

@@ -1 +1 @@
-1000c8d4467aee8fb389bbbff3eb064348df987901e718ad2dd74d5a1fd03b1ec2798d88506c9c97a0d8888801fce5d5c6bdd4b99e5a0a4d55177e95a3a7180d74b2d4cdfb6fe5655e6dac710ea7943f1bb353a4c40ba50e06a0b025f5d06e2d508d3aa7a046ef65e073c9d88f89c379f6c1bcbfb84f094ec0a64f4f8de8d583a910e628bb78dbdfad6e71521b67416960b9f6f472bcaac9907c6e8e68693dd6fe6527baad7bddbf8ee12d7a4ce169970e6a57792cbd58b94b208e883d6d2a14c2446a1374aa2196789c5f41b1976977531b73a83c993e80d83a46ae1087bff9f96d58056223b3c467b5b9dbad5f90f298b5c22e001938b14c60ea7ed36e5e9a321f5d12db5d5f0a53bfb04f277bfed202bf810506fe33400474edb32d458149c0137649a71c6a31d7a5d7d31e537635fea8891795a0ef3cc78c960c6105479d190000525f1d44a6fa5ca9900e90e6acb8d6338fc3061d4835e823f3c73f1613bfc096fbaaba3bc9b1d9d99d6c51ab1ae22196fc0bdd9d3e0aba6ea488fc6dc61456516e1dd05823f4bca1a524e3ee0960370eab93ca7c7923f85f21e823fb4b654dab560eaedfffcf57237746cef0c916c1e3947340b349c49477c60a249d5a8bea87fb745c8a45d0492d6752147c57ff9feec2ff7b7ae672ede1aedd26708f56fe7c5e9d12d5ea3dcfe19099ee48438ff41e33a506217660464f3d8f74db5e260c987985d3c4cd031524802eed6aa75595026cd6d0d746eee701656689d29bdfb499ed36be304459de9a37e583f1ff19198a388347cbe5b9f8bf27717d67502dc16527f995d605fbb884023f97e1083c25663d04c4ccf28763ae78a25802a0ad21d7c7b6939165b8a6f49ad7307510c78881906258414892ca27b5476b0f10e000c8df84c4542171a57c2a7aa50cf85da86ba2b644dd409df9b98eed1ed0c7e03482b0d25daf11c5ec2a7516ee1a5a6cc127eb5228fbbf82680424660f497b5e47e29c8be31935f1e74867f74e13a5911a4ae63f799e3a6cd743ed2931c6516fd64c56b5504921ca77dc95dda68aeef24d14145a548fdca058f0893e86af9827c3aef2be21b8f26f2c4d3afd88b0da656319c9ba84d353095c13629eb024e358e04b159506be8f55d7687e9603b139328f22a81e851eefad46e9bd14d98dc5474d0c9cdc605112fb312cf3b7692413e446beacf0fc09068de99517fe7b17956f9d392d91a7552a76752b46792a7758e077ed69bf6a64fb4fa29f219b5bf9534584194f91205eccb7d00777321a475d612811811f49eba10fb949eac4db6228f18262ce4c59b936d6f2280ca142b0b27f476498c96b02c2e3c49840631a86cbc6a57e5a03c0ab692f0994a9b405f7ad887d7791ef9631e919d0c459e4354387a30f2f1afd76e3090a071272143f90e7d825ab813fe89cba942d906fb247dc11003dbb26ed2b1b972550317dd86d4f322db2f1d7164b6c341582ec9dc7fa8a32f283530db0d5b473c0fc4592e824e042070f0e7b4c255dfaa8dff2360030d2133764
+1000c06d9305e04dc9f413f0087fc91909d40984d91ddfbfba505c33325695725cbce0d378841dda920fb9a88a9782b89090103ff193ce519db8912bf14b85bc4750deb4a6a81b84022b71c87b6d7a769625b1a8d7086cea3674db349856efe37a3b5b14e212cd5f817762055fe9fb2b34965bdd16fdba30ece9f1953e0fac0aa920e1d8835bc3b55f7a3a17a233260b44b51683a742a301bc4e775f8543c507d73f28ff4cf51f4a359322bd3dfcdcf17aa6cc56faca4d9aef3690b3b48e08dc5af9cd9846a6f9f28e91447ddc0951cf31bd07565314f4823e10c7f89476f32f9327e81b539118ff4c19d394c366b6ec248d9b3270b85d0dfe0e604b8b88863d303265a3b91490a47d517cadd08670d3a6744dc5c21b2b509ac65d2bd359a64aaa25e9c9744b6da1baab3d3413c510f1cfdb424bb00b810477c74cb9a094c0a59c773f8b13c8b2b27e0e052a66817d874bb995491568a1cdd5c64760345c9db3f8bc53553944eebd26b1ce0a001148980a765c8f38ed05388bf8eb40a20f15fd3508f14525986ea2e0877427de86cb7683747372559a11a3c546e7273afcb08871119df76689f22ce688a0a8fe145a4d0cf7397e80ce14486ebc646428f6789a2e94308adbe780c39f711734e00e1b9ea93f0dfdb5da0d9f8e4afe389e68dea05bbdf14b9a4a8986419da2ad0759845487fce519358a7b0009375fcf585f1e077ef177ab25544097ce6e739c9db8a6b49b6bc1989041264047dec69d70d3e854796f070fc1696f810105700270eb847c7346b51574fde2bf87e71039a440a9c235abb5ccb0f6ea5eec63cb3323b9080eec85a84574f531b316a800ba56b735d3ed678690a2cbde5f6448d022fa4c41a75f7d5ebcb20e3e0f2e4a10a97645c3e61c0ca7ff5519174919495ba8d69b9c8b510cceb152b32b8af714903101139224f66fc695dc2464f51b31545540b36b0296ba106444e121007bbda0d1e30a4fc7c26fb926c665d098c71ba686e19f9844b7ea8ad9ddafb40776dd2f68e965b8607f253349262b20799dc4d041d35f3730e494673fe896a334944101758435c9cd934a36d724f47729ac132ca1717ff657b5a579e0f8eeea0549a22eea69dd4c1cedf29a59998bd16667164a458623676c06b05f5565997868cbfec3a8fe727d56d7d5f2e1882e5e146baa07d41f0551755f96844118b121eab3927086702c523a1d77ac6fdf6ca11e4e7b0c67a404331a80db3cfc136e8b5b7646d5cdf477652f8012fdd0a2fa7716744c223ea423a1ce00252fe170368590d90adc459398347dcf03f25e05acbbbe605d7ce2f1045625c2c89db1fd2e3df89228b7960237546ac1063441e5d28871576fb5770c05bd508fb704f541b77e933cb243cd46f83b81d44401dfd267e299d0ff223ebc000feee0713dfba95d1fef13de4bf4662cc89b05559ecd08cdaff2c602ff93159d38f1867275c89c6a4073a23bb8c305c87cc008c0086d1b7d3dbe2b413835a3552af21edce243005e357073d72d469e1b0a302a60

CHANGELOG.md

@@ -26,6 +26,12 @@ Classify the change according to the following categories:
     ##### Removed
     ### Patches
 
+## Develop 2023-10-20
+### Minor Updates
+##### Changed
+- Updates to CHP cost and performance defaults, including prime generator, from updating REopt.jl
+- Changed upper limit on `CHPInputs.size_class` to 7 to reflect changes in CHP defaults.
+
 ## v3.1.1
 ### Minor Updates
 ##### Added

julia_src/Manifest.toml

@@ -215,9 +215,9 @@ version = "1.15.1"
 
 [[deps.DiskArrays]]
 deps = ["OffsetArrays"]
-git-tree-sha1 = "7a6ada7a039841a8eac8fe22690d55b401f8b52c"
+git-tree-sha1 = "1bfa9de80f35ac63c6c381b2d43c590875896a1f"
 uuid = "3c3547ce-8d99-4f5e-a174-61eb10b00ae3"
-version = "0.3.20"
+version = "0.3.22"
 
 [[deps.DocStringExtensions]]
 deps = ["LibGit2"]
@@ -255,9 +255,9 @@ version = "1.16.1"
 
 [[deps.FilePathsBase]]
 deps = ["Compat", "Dates", "Mmap", "Printf", "Test", "UUIDs"]
-git-tree-sha1 = "e27c4ebe80e8699540f2d6c805cc12203b614f12"
+git-tree-sha1 = "9f00e42f8d99fdde64d40c8ea5d14269a2e2c1aa"
 uuid = "48062228-2e41-5def-b9a4-89aafe57970f"
-version = "0.9.20"
+version = "0.9.21"
 
 [[deps.FileWatching]]
 uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -303,9 +303,9 @@ version = "0.4.1"
 
 [[deps.GeoInterface]]
 deps = ["Extents"]
-git-tree-sha1 = "bb198ff907228523f3dee1070ceee63b9359b6ab"
+git-tree-sha1 = "d53480c0793b13341c40199190f92c611aa2e93c"
 uuid = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
-version = "1.3.1"
+version = "1.3.2"
 
 [[deps.GeoInterfaceRecipes]]
 deps = ["GeoInterface", "RecipesBase"]
@@ -389,9 +389,9 @@ uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
 version = "0.2.2"
 
 [[deps.IterTools]]
-git-tree-sha1 = "fa6287a4469f5e048d763df38279ee729fbd44e5"
+git-tree-sha1 = "4ced6667f9974fc5c5943fa5e2ef1ca43ea9e450"
 uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
-version = "1.4.0"
+version = "1.8.0"
 
 [[deps.IteratorInterfaceExtensions]]
 git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856"
@@ -504,9 +504,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
 [[deps.LoggingExtras]]
 deps = ["Dates", "Logging"]
-git-tree-sha1 = "0d097476b6c381ab7906460ef1ef1638fbce1d91"
+git-tree-sha1 = "c1dd6d7978c12545b4179fb6153b9250c96b0075"
 uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
-version = "1.0.2"
+version = "1.0.3"
 
 [[deps.Lz4_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -566,9 +566,9 @@ version = "2.28.0+0"
 
 [[deps.MicrosoftMPI_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "a8027af3d1743b3bfae34e54872359fdebb31422"
+git-tree-sha1 = "a7023883872e52bc29bcaac74f19adf39347d2d5"
 uuid = "9237b28f-5490-5468-be7b-bb81f5f5e6cf"
-version = "10.1.3+4"
+version = "10.1.4+0"
 
 [[deps.Missings]]
 deps = ["DataAPI"]
@@ -629,9 +629,9 @@ version = "0.8.1+0"
 
 [[deps.OpenMPI_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"]
-git-tree-sha1 = "f3080f4212a8ba2ceb10a34b938601b862094314"
+git-tree-sha1 = "e25c1778a98e34219a00455d6e4384e017ea9762"
 uuid = "fe0851c0-eecd-5654-98d4-656369965a5c"
-version = "4.1.5+0"
+version = "4.1.6+0"
 
 [[deps.OpenSSL]]
 deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"]
@@ -717,11 +717,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 
 [[deps.REopt]]
 deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"]
-git-tree-sha1 = "413b5cbf443cbfe03c94bab45e84a6bd4ad81b97"
-repo-rev = "master"
-repo-url = "https://github.com/NREL/REopt.jl.git"
+git-tree-sha1 = "bc9f8e83a9853e9c7f1b2be3cb83a2090ebeadcc"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
-version = "0.35.0"
+version = "0.37.0"
 
 [[deps.Random]]
 deps = ["SHA", "Serialization"]

julia_src/http.jl

@@ -220,16 +220,19 @@ function chp_defaults(req::HTTP.Request)
                 "avg_electric_load_kw",
                 "max_electric_load_kw"]
     int_vals = ["size_class"]
-    all_vals = vcat(string_vals, float_vals, int_vals)
+    bool_vals = ["is_electric_only"]
+    all_vals = vcat(string_vals, float_vals, int_vals, bool_vals)
     # Process .json inputs and convert to correct type if needed
     for k in all_vals
         if !haskey(d, k)
             d[k] = nothing
         elseif !isnothing(d[k])
             if k in float_vals && typeof(d[k]) == String
                 d[k] = parse(Float64, d[k])
-            elseif k == int_vals && typeof(d[k]) == String
+            elseif k in int_vals && typeof(d[k]) == String
                 d[k] = parse(Int64, d[k])
+            elseif k in bool_vals && typeof(d[k]) == String
+                d[k] = parse(Bool, d[k])
             end
         end
     end
@@ -359,11 +362,14 @@ function simulated_load(req::HTTP.Request)
     end
 
     # Convert vectors which come in as Vector{Any} to Vector{Float} (within Vector{<:Real})
-    vector_types = ["percent_share", "cooling_pct_share", "monthly_kwh", "monthly_mmbtu", 
+    vector_types = ["percent_share", "cooling_pct_share", "monthly_totals_kwh", "monthly_mmbtu", 
                     "monthly_tonhour", "addressable_load_fraction"]
     for key in vector_types
         if key in keys(d) && typeof(d[key]) <: Vector{}
-            d[key] = convert(Vector{Float64}, d[key])
+            d[key] = convert(Vector{Real}, d[key])
+        elseif key in keys(d) && key == "addressable_load_fraction"
+            # Scalar version of input, convert Any to Real
+            d[key] = convert(Real, d[key])
         end
     end 
 

reoptjl/api.py

@@ -96,7 +96,7 @@ def obj_create(self, bundle, **kwargs):
         meta = {
             "run_uuid": run_uuid,
             "api_version": 3,
-            "reopt_version": "0.35.0",
+            "reopt_version": "0.36.0",
             "status": "Validating..."
         }
         bundle.data.update({"APIMeta": meta})

reoptjl/migrations/0049_alter_chpinputs_size_class.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.0.7 on 2023-10-16 21:27
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reoptjl', '0048_existingboileroutputs_annual_fuel_consumption_mmbtu_bau_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='chpinputs',
+            name='size_class',
+            field=models.IntegerField(blank=True, help_text='CHP size class. Must be an integer value between 0 and 7', null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(7)]),
+        ),
+    ]

reoptjl/models.py

@@ -3895,11 +3895,11 @@ class CHPInputs(BaseModel, models.Model):
     size_class = models.IntegerField(
         validators=[
             MinValueValidator(0),
-            MaxValueValidator(6)
+            MaxValueValidator(7)
         ],
         null=True,
         blank=True,
-        help_text="CHP size class. Must be an integer value between 0 and 6"
+        help_text="CHP size class. Must be an integer value between 0 and 7"
     )
     min_kw = models.FloatField(
         default=0,

reoptjl/test/posts/test_thermal_in_results.json

@@ -37,7 +37,7 @@
     },
     "ExistingBoiler": {
         "efficiency": 0.72,
-        "production_type": "steam",
+        "production_type": "hot_water",
         "fuel_cost_per_mmbtu": 10
     },
     "ExistingChiller": {