Skip to content

Commit 92336b1

Browse files
committed
Merge remote-tracking branch 'h2i_upstream/system_level_control' into slc/feedstock_connection
2 parents da11a52 + 2b7fed5 commit 92336b1

98 files changed

Lines changed: 11441 additions & 15243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repos:
2727
- id: yamlfix
2828
# Exclude YAML files that are used as inputs for testing or examples, or ones for desired schedule in HOPP as they
2929
# expect misformatted YAML files.
30-
exclude: ^(h2integrate/core/test/inputs/.*|examples/11_hybrid_energy_plant/tech_inputs/desired_schedules/.*|examples/33_peak_load_management/demand_profiles/.*)$
30+
exclude: ^(h2integrate/core/test/inputs/.*|examples/11_hybrid_energy_plant/tech_inputs/desired_schedules/.*|examples/33_peak_load_management/demand_profiles/.*|examples/34_plm_optimized_dispatch/demand_profiles/.*)$
3131
- repo: https://github.com/astral-sh/ruff-pre-commit
3232
# Ruff version.
3333
rev: v0.8.1

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
- Rename `n_control_window` to `n_control_window_hours` for unit clarity [PR 712](https://github.com/NatLabRockies/H2Integrate/pull/712)
1919
- Update N2 diagram for demand openloop control from static and outdated to dynamic and interactive [PR 714](https://github.com/NatLabRockies/H2Integrate/pull/714)
2020
- Added basic check of 4-length connections in `technology_interconnections` [PR 720](https://github.com/NatLabRockies/H2Integrate/pull/720)
21+
- Adds `H2IntegrateModel`, `load_yaml`, `write_yaml`, and `write_readable_yaml` as package-level imports [PR 728](https://github.com/NatLabRockies/H2Integrate/pull/728).
22+
- Update N2 diagram for Pyomo heuristic control from static image to dynamic and interactive embedded diagram [PR 726](https://github.com/NatLabRockies/H2Integrate/pull/726)
23+
- Added ability to use timeseries for finance calculations [PR 725](https://github.com/NatLabRockies/H2Integrate/pull/725)
2124

2225
## 0.8 [April 15, 2026]
2326
- Updated README and docs intro page with expanded H2I description, reorganized sections, and streamlined installation instructions [PR 677](https://github.com/NatLabRockies/H2Integrate/pull/677)

docs/_static/class_hierarchy.html

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

docs/_toc.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,14 @@ parts:
7171
- caption: Control
7272
chapters:
7373
- file: control/control_overview
74-
- file: control/open-loop_controllers
75-
- file: control/pyomo_controllers
76-
- file: control/controller_demonstrations
74+
- file: control/system_level_control/system_level_control
75+
sections:
76+
- file: control/system_level_control/control_classifier
77+
- file: control/storage_level_control
78+
sections:
79+
- file: control/open-loop_controllers
80+
- file: control/pyomo_controllers
81+
- file: control/controller_demonstrations
7782
- caption: Demand
7883
chapters:
7984
- file: demand/demand_components

docs/control/controller_demonstrations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ kernelspec:
1515

1616
```{code-cell} ipython3
1717
from pathlib import Path
18+
1819
from matplotlib import pyplot as plt
19-
from h2integrate.core.h2integrate_model import H2IntegrateModel
20-
from h2integrate import EXAMPLE_DIR
2120
21+
from h2integrate import H2IntegrateModel, EXAMPLE_DIR
2222
```
2323

2424
## Hydrogen Dispatch
124 KB
Loading

0 commit comments

Comments
 (0)