From 1ef081a236593b5fe65d12a8b435c9bf50a6c6cb Mon Sep 17 00:00:00 2001 From: bill-becker Date: Fri, 26 Sep 2025 08:40:18 -0600 Subject: [PATCH 1/5] Add CST and HighTempThermalStorage to all/superset inputs test --- reoptjl/test/posts/all_inputs_test.json | 30 ++++++++++++++++++++++++- reoptjl/test/test_job_endpoint.py | 2 +- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/reoptjl/test/posts/all_inputs_test.json b/reoptjl/test/posts/all_inputs_test.json index 7bfb1c979..21114f68c 100644 --- a/reoptjl/test/posts/all_inputs_test.json +++ b/reoptjl/test/posts/all_inputs_test.json @@ -49,7 +49,7 @@ "Site": { "latitude": 38.96345294964369, "longitude": -77.38406208630109, - "land_acres": null, + "land_acres": 1.0e5, "roof_squarefeet": null, "CO2_emissions_reduction_min_fraction": null, "CO2_emissions_reduction_max_fraction": null, @@ -401,5 +401,33 @@ "avoided_capex_by_ashp_present_value": 0, "back_up_temp_threshold_degF": -10.0, "force_dispatch": false + }, + "CST": { + "min_kw": 20.0, + "max_kw": 20.0, + "installed_cost_per_kw": 2200.0, + "om_cost_per_kw": 33.0, + "om_cost_per_kwh": 0.0, + "acres_per_kw": 0.000939, + "macrs_option_years": 0, + "macrs_bonus_fraction": 0.0, + "can_supply_steam_turbine": true, + "can_serve_process_heat": true, + "can_serve_dhw": true, + "can_serve_space_heating": true, + "can_waste_heat": true, + "charge_storage_only": false + }, + "HighTempThermalStorage": { + "min_kwh": 50.0, + "max_kwh": 50.0, + "installed_cost_per_kwh": 86.0, + "macrs_option_years": 5, + "macrs_bonus_fraction": 1.0, + "can_serve_space_heating": false, + "can_serve_dhw": false, + "can_serve_process_heat": true, + "num_charge_hours": 4.0, + "num_discharge_hours": 10.0 } } \ No newline at end of file diff --git a/reoptjl/test/test_job_endpoint.py b/reoptjl/test/test_job_endpoint.py index 97502460d..0ca511d72 100644 --- a/reoptjl/test/test_job_endpoint.py +++ b/reoptjl/test/test_job_endpoint.py @@ -235,7 +235,7 @@ def test_superset_input_fields(self): resp = self.api_client.get(f'/v3/job/{run_uuid}/results') r = json.loads(resp.content) results = r["outputs"] - self.assertAlmostEqual(results["Financial"]["npv"], -326156.69, delta=0.01*results["Financial"]["lcc"]) + self.assertAlmostEqual(results["Financial"]["npv"], -378466.47, delta=0.01*results["Financial"]["lcc"]) assert(resp.status_code==200) self.assertIn("ElectricHeater", list(results.keys())) self.assertIn("ASHPSpaceHeater", list(results.keys())) From 8aace084f90e3821bada5612e36c73f12baf30c2 Mon Sep 17 00:00:00 2001 From: Alex Zolan Date: Fri, 17 Oct 2025 12:30:36 -0600 Subject: [PATCH 2/5] Update CHANGELOG with CST and HighTempThermalStorage Added new inputs for CST and HighTempThermalStorage to tests. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b076f84d0..31819f4b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,10 @@ Classify the change according to the following categories: ##### Removed ### Patches +## Develop +### Added +- Added `CST` and `HighTempThermalStorage` to all/superset inputs test. + ## v3.14.0 ### Minor Updates #### Added From 7b03ced36fbf58a0422f7bf665be9c063f9cc05c Mon Sep 17 00:00:00 2001 From: bill-becker Date: Tue, 21 Oct 2025 14:43:25 -0600 Subject: [PATCH 3/5] Update REopt.jl to v0.55.1 --- julia_src/Manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 900b0cbc2..196aae6bd 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -948,9 +948,9 @@ version = "1.11.0" [[deps.REopt]] deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"] -git-tree-sha1 = "eec11e26eeeb249eb09daae0d1c3c21f4badc238" +git-tree-sha1 = "103761fa0f7447377726347af656cde6ab1160cc" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" -version = "0.55.0" +version = "0.55.1" [[deps.Random]] deps = ["SHA"] @@ -1257,7 +1257,7 @@ uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" version = "1.59.0+0" [[deps.oneTBB_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl"] +deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"] git-tree-sha1 = "d5a767a3bb77135a99e433afe0eb14cd7f6914c3" uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e" version = "2022.0.0+0" From 711211fcc0b998ae0224aecaec9a91deb1c23ea7 Mon Sep 17 00:00:00 2001 From: bill-becker Date: Tue, 21 Oct 2025 14:47:37 -0600 Subject: [PATCH 4/5] Update CHANGELOG with REopt.jl updates --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c339e9e7b..4d710c340 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,12 @@ Classify the change according to the following categories: ##### Removed ### Patches +## develop +### Patches +##### Fixed +- Update REopt.jl to v0.55.1 for fix to NSRDB API call for CST +- Add CapEx to initial capex output (should have been included before) + ## v3.16.1 ### Patches ##### Changed From f7ddda2e606a7e68e30bbfff1abb696eafd131c0 Mon Sep 17 00:00:00 2001 From: Bill Becker <42586683+Bill-Becker@users.noreply.github.com> Date: Tue, 21 Oct 2025 17:04:29 -0600 Subject: [PATCH 5/5] Update CHANGELOG for v3.16.2 release --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc13150a4..9581b3d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ Classify the change according to the following categories: ##### Removed ### Patches -## develop +## v3.16.2 ### Patches - Added `CST` and `HighTempThermalStorage` to all/superset inputs test. - Update REopt.jl to v0.55.1 for fix to NSRDB API call for CST