diff --git a/CHANGELOG.md b/CHANGELOG.md index c339e9e7b..9581b3d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,12 @@ Classify the change according to the following categories: ##### Removed ### Patches +## 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 +- Add CapEx to initial capex output (should have been included before) + ## v3.16.1 ### Patches ##### Changed 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" diff --git a/reoptjl/test/posts/all_inputs_test.json b/reoptjl/test/posts/all_inputs_test.json index f00b61591..8381b01b5 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, @@ -404,5 +404,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 29e41cfb5..6f74663aa 100644 --- a/reoptjl/test/test_job_endpoint.py +++ b/reoptjl/test/test_job_endpoint.py @@ -266,7 +266,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()))