From df24fd61b914466d252ad66304c98ceddc57a451 Mon Sep 17 00:00:00 2001 From: bill-becker Date: Thu, 14 Mar 2024 21:56:50 -0600 Subject: [PATCH 1/5] Temp use REopt.jl feature branch steamturb --- julia_src/Manifest.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index a96b8f997..90f1d80d4 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -841,9 +841,11 @@ 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 = "81145461bcc15162ef468858d62b41357bb13684" +git-tree-sha1 = "0232669d3ee7afe8e3eac0e3f3a97d8ed790321f" +repo-rev = "steamturb-simload" +repo-url = "https://github.com/NREL/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" -version = "0.41.0" +version = "0.42.0" [[deps.Random]] deps = ["SHA", "Serialization"] From 57ca2dbb2954d8cc48e4314246acc78a9577ed0e Mon Sep 17 00:00:00 2001 From: bill-becker Date: Fri, 15 Mar 2024 16:48:25 -0600 Subject: [PATCH 2/5] Update REopt.jl feature branch steamturb-simload --- julia_src/Manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 90f1d80d4..9a3da395b 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -841,7 +841,7 @@ 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 = "0232669d3ee7afe8e3eac0e3f3a97d8ed790321f" +git-tree-sha1 = "4e76a49a93204840c1dd783a982e612525b6330c" repo-rev = "steamturb-simload" repo-url = "https://github.com/NREL/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" From 516ba4d35ba1a40726e69d710eb74fdcde0a05df Mon Sep 17 00:00:00 2001 From: bill-becker Date: Fri, 15 Mar 2024 17:37:27 -0600 Subject: [PATCH 3/5] Update chp_elec_size_heuristic_kw name --- reoptjl/test/test_http_endpoints.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reoptjl/test/test_http_endpoints.py b/reoptjl/test/test_http_endpoints.py index a4a1eeb47..b8dca3fbd 100644 --- a/reoptjl/test/test_http_endpoints.py +++ b/reoptjl/test/test_http_endpoints.py @@ -109,7 +109,7 @@ def test_steamturbine_defaults(self): # Check the endpoint logic with the expected selection self.assertEqual(http_response["prime_mover"], "steam_turbine") self.assertEqual(http_response["size_class"], 1) - self.assertGreater(http_response["chp_size_based_on_avg_heating_load_kw"], 574.419) + self.assertGreater(http_response["chp_elec_size_heuristic_kw"], 574.419) def test_absorption_chiller_defaults(self): From d85979807ffdc5268f097435139679e62c18a83d Mon Sep 17 00:00:00 2001 From: bill-becker Date: Mon, 18 Mar 2024 08:23:01 -0600 Subject: [PATCH 4/5] Update REopt.jl to v0.43.0 --- julia_src/Manifest.toml | 6 ++---- reoptjl/api.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 9a3da395b..6f45d8d7c 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -841,11 +841,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 = "4e76a49a93204840c1dd783a982e612525b6330c" -repo-rev = "steamturb-simload" -repo-url = "https://github.com/NREL/REopt.jl.git" +git-tree-sha1 = "d7bdc0d314e0821a8904ba204265345aab1ee8bc" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" -version = "0.42.0" +version = "0.43.0" [[deps.Random]] deps = ["SHA", "Serialization"] diff --git a/reoptjl/api.py b/reoptjl/api.py index 14e2e5af7..05139d352 100644 --- a/reoptjl/api.py +++ b/reoptjl/api.py @@ -98,7 +98,7 @@ def obj_create(self, bundle, **kwargs): meta = { "run_uuid": run_uuid, "api_version": 3, - "reopt_version": "0.41.0", + "reopt_version": "0.43.0", "status": "Validating..." } bundle.data.update({"APIMeta": meta}) From bd942b1254aafbdac7a8552f1206983b325af66c Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Mon, 18 Mar 2024 08:53:42 -0600 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4913b8d5..77ca4fb95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,11 @@ Classify the change according to the following categories: ##### Removed ### Patches +## v3.6.1 +### Minor Updates +#### Fixed +- See updates from REopt.jl v0.43.0: https://github.com/NREL/REopt.jl/pull/364 + ## v3.6.0 ### Minor Updates #### Changed