Skip to content

Commit

Permalink
Merge branch 'disaggregated-heat-load-IO' of https://github.com/NREL/…
Browse files Browse the repository at this point in the history
…REopt_API into disaggregated-heat-load-IO
  • Loading branch information
zolanaj committed May 10, 2024
2 parents d7d6652 + abf56a1 commit 581e796
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Classify the change according to the following categories:
- arrays **storage_to_dhw_load_series_mmbtu_per_hour**, **storage_to_space_heating_load_series_mmbtu_per_hour** and **storage_to_process_heat_load_series_mmbtu_per_hour** to model **HotThermalStorageOutputs**
- **heating_load_input** to model **AbsorptionChillerInputs**
- arrays **thermal_to_dhw_load_series_mmbtu_per_hour**, **thermal_to_space_heating_load_series_mmbtu_per_hour**, and **thermal_to_process_heat_load_series_mmbtu_per_hour** to models **CHPOutputs**, **ExistingBoilerOutputs**, **BoilerOutputs**, **SteamTurbineOutputs**, and **HotThermalStorageOutputs**
- boolean **retire_in_optimal** to **ExistingBoilerInputs**
- In `reopt.jl/models.py`, added new model **ProcessHeatLoadInputs** with references in `reoptjl/validators.py` and `reoptjl/views.py`
- Added process heat load to test scenario `reoptjl/test/posts/test_thermal_in_results.json`
- Added tests for the presence of process heat load and heat-load-specfic outputs to `test_thermal_in_results` within `reoptjl/test/test_job_endpoint.py`
Expand Down
2 changes: 1 addition & 1 deletion reoptjl/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -6694,7 +6694,7 @@ class AbsorptionChillerInputs(BaseModel, models.Model):
))

HEATING_LOAD_INPUT = models.TextChoices('HEATING_LOAD_INPUT', (
'DomesitHotWater',
'DomesticHotWater',
'SpaceHeating',
'ProcessHeat'
))
Expand Down

0 comments on commit 581e796

Please sign in to comment.