Remove system-level outputs from storage and replace with demand component (follow-on to 631) by elenya-grant · Pull Request #666 · NatLabRockies/H2Integrate

elenya-grant · 2026-04-10T17:00:00Z

Remove system-level outputs from storage and replace with demand component (follow-on to 631)

There has been a blurry line distinguishing system-level calculations and calculations done in storage performance models. This PR builds on PR #631 to resolve Issue #521. The storage performance outputs that depend on demand have been removed and the usage of demand components in the examples is more common. The outputs removed from storage performance models are:

unmet_{commodity}_demand_out: demand that has not been met
unused_{commodity}_out: production that exceeds the demand
storage_{commodity}_out: charge/discharge profile

The outputs with different calculations in the storage performance models are:

{commodity}_out: this used to be the combined commodity out from storage and whatever was input to storage, minus any production that exceeds the demand. This is now what storage_{commodity}_out used to be
capacity_factor: used to be the based on the combined commodity out, now it based on the sum of the charge/discharge profile

This PR helps to better distinguish the differences between individual storage performance models and "system-level" performance calculations. This PR also enables the ability for the storage demand to be distinct from the overall demand. For example, if we wanted to use a battery to try to just keep an electrolyzer system on (at 10% power), then the demand profile to the battery would be 10% of the electrolyzer capacity, whereas the demand for the demand component would be equal to the electrolyzer capacity.

Section 1: Type of Contribution

Section 2: Draft PR Checklist

Open draft PR
Describe the feature that will be added
Fill out TODO list steps
Describe requested feedback from reviewers on draft PR
Complete Section 7: New Model Checklist (if applicable)

TODO:

Get PR Update Naming Convention in Open-Loop Converter Control Strategies #631 merged in
Update storage_baseclass.py so that demand is only an input if using feedback control (not doing just yet)
make figures to show what's happening in demand components for different use-cases
- these figures have been added to docs/demand/demand_components.md
add test to test_all_examples for example 13
update or add doc page for example 13 in controller docs

Type of Reviewer Feedback Requested (on Draft PR)

Structural feedback:

Implementation feedback:

Other feedback:

Section 3: General PR Checklist

Section 3: Related Issues

This would resolve Issue #521

Section 4: Impacted Areas of the Software

Section 4.1: New Files

examples/13_dispatch_for_electrolyzer/: new example that highlights setting the storage demand as a different value than the demand component.
resource_files/wind/30.6617_-101.7096_2013_wtk_v2_60min_utc_tz.csv: wind resource file for example 23
docs/demand/demand_demo.md: new doc page for Example 13 that highlights use of demand components.
docs/technology_models/storage_models_index.md: new doc page describing the inputs and output calculations of the storage performance models.

Section 4.2: Modified Files

h2integrate/core/h2integrate_model.py
- create_finance_model(): Updated logic so that any model without a cost model does not have to be included in the technologies list for a finance group. Was previously hard-coded so that only combiners didn't have to be included in the technologies list.
h2integrate/storage/storage_baseclass.py: modified StoragePerformanceBase
- setup(): removed outputs related to demand
- run_storage(): removed calculations of outputs related to demand. Updated calculation of capacity factor.
examples/test/test_all_examples.py::test_ng_demand_example: new test for Example 23
examples/test/test_all_examples.py::::test_electrolyzer_demand: new test for Example 13

Examples that were updated

Examples that had added combiners to combine storage outputs with the input to storage: 01, 02, 03/co2_hydrogenation_doc, 09/doc, 09/oae, 30
Examples that had added combiners and load demand components: 12, 16, 24, 30
Examples that had storage models as commodity streams (required additional combiner(s) and a new load demand component): 14, 18, 19, 29

Tests that were updated

Section 5: Additional Supporting Information

Section 6: Test Results, if applicable

h2integrate/core/test/test_framework.py::test_system_order
h2integrate/core/test/test_framework.py::test_technology_connections

Section 7 (Optional): New Model Checklist

…verter_ol_sync

…GreenHEART into dispatch/converter_ol_sync

…verter_ol_sync

…trategy

…GreenHEART into dispatch/converter_ol_sync

…eam in finances

…ance subgroup

…ferences

jaredthomas68

This is looking really good. I only have a few simple changes requested, mostly typos in docs.

jaredthomas68 · 2026-04-14T23:45:21Z

+
+    with subtests.test("Expected standard capacity factor"):
+        assert (
+            pytest.approx(15.416666, rel=1e-6)


I like these tests, thanks for adding them!

jaredthomas68 · 2026-04-14T23:46:49Z

+            # standard_capacity_factor is the ratio of commodity discharged to the discharge rate
+            total_commodity_discharged = outputs[f"storage_{self.commodity}_discharge"].sum()
+            outputs["standard_capacity_factor"] = total_commodity_discharged / (
+                outputs[f"rated_{self.commodity}_production"] * self.n_timesteps


This will need to be made time step agnostic, but we can leave as is for now.

jaredthomas68

Pretty close. I still have a few blocking comments.

jaredthomas68 · 2026-04-15T15:43:15Z

+    $
+    CF = \frac{\sum_{t=0}^{n_{time}}(\text{commodity_out})}{\text{discharge_rate}*n_{\text{time}}}
+    $


I don't think n_time is correct. I'm sorry I was not more specific.

Suggested change

$

CF = \frac{\sum_{t=0}^{n_{time}}(\text{commodity_out})}{\text{discharge_rate}*n_{\text{time}}}

$

$

CF=\frac{\sum_{t=0}^{n_{\text{time\_steps}}}(\text{commodity\_out}*dt)}{\text{discharge\_rating}*\text{total\_time}}

$

I think n_timesteps is correct. That's the variable we use in H2I so I think it makes sense as it was before.

I still disagree and would like to have the equations as I suggested. Please see my comment on the next equation.

I added the dt in

I think for consistency with the rest of the doc page, that using n_timesteps and discharge_rate are more appropriate variables in this equation. I added in *dt and the \ to improve formatting for the underscores in text variables. I also don't know how the total time variable you're proposing is different than n_timesteps. Is it equal to n_timesteps*dt? (in which case, wouldn't the dt cancel out from the numerator and denominator ?)

I'm fine with n_timesteps*dt

heard - done!

I think this version would achieve what we need

$ CF = \frac{\sum_{i=0}^{n_{\text{time\_steps}}}(\text{commodity\_out$_i$}*dt)}{\text{discharge\_rate}*n_{\text{time\_steps}}*dt} $

I suggested switching _t to _i, but I can roll with where it is at now

am I right that the only difference is the $\text{commodity}_i$ (I've been using $t$ though, so I'd make it $\text{commodity}_t$) instead of $\text{commodity}$ (it'd be commodity_out instead of commodity but GitHub doesn't like the underscores)?

If so - I just pushed up that change.

jaredthomas68 · 2026-04-15T15:59:39Z

+    $
+    CF_{\text{standard}} = \frac{\sum_{t=0}^{n_{time}}(\text{storage_commodity_discharge})}{\text{discharge_rate}*n_{\text{time}}}
+    $


Suggested change

$

CF_{\text{standard}} = \frac{\sum_{t=0}^{n_{time}}(\text{storage_commodity_discharge})}{\text{discharge_rate}*n_{\text{time}}}

$

$

CF=\frac{\sum_{t=0}^{n_{\text{time\_steps}}}(\text{storage\_commodity\_discharge}*dt)}{\text{discharge\_rating}*\text{total\_time}}

$

I don't think the dt stuff in the eqn necessarily important at this time. The storage performance models are not yet flexible to non-hourly dt - so I think we can keep it as-is. These are intended to just show the differences in the CF calculations.

I think we should write our math correctly, even if we don't have our code written properly. The dt in the code is implicit in code because the time steps are 1 hour, but dt is technically there.

okay. I added in dt

jaredthomas68 · 2026-04-15T16:00:26Z


    with subtests.test("LCOE of electricity generated"):
-        assert pytest.approx(138.905228, rel=1e-6) == lcoe_gen
+        assert pytest.approx(217.53810477, rel=1e-6) == lcoe_gen


Can you explain why these test values changed so much?

resource data changed, was using data with UTC timezone and now using data with local timezone. Tests pass if timezone is 0, but those resource files (for UTC timezone) aren't available in the resource_files directory

Does that mean it is different data, or just different starting point in the data?

@elenya-grant, tell me if I'm thinking about this wrong, but this test was introduced as part of this PR, right? This is a fully new line as part of this PR. I don't think we need to resolve the differences in test values done during the development of the PR. This just shows that the PR introduces a new test and establishes the new test value. I don't think more work is needed here in this PR.

definitely the second one but maybe the first one too. Using local timezone resource data, the wind CF is 18.119 and PV CF is 6.5585. Using the UTC timezone resource data, the wind CF is 18.119 and the solar resource data is 26.9244. So - big change in solar resource.

@johnjasa - you're totally correct.

Sounds good, thanks for the explanation.

jaredthomas68

Thanks for iterating on this. I think the equations are technically correct. I made one suggestion, but non-blocking.

jaredthomas68 · 2026-04-15T17:50:53Z

+    $
+    CF = \frac{\sum_{t=0}^{n_{time}}(\text{commodity_out})}{\text{discharge_rate}*n_{\text{time}}}
+    $


I suggested switching _t to _i, but I can roll with where it is at now

@jaredthomas68

* Remove old iron models (#601) * removed temporary iron and steel models * supported models * update example 28 with updated models * remove outdated files * consolidate iron examples * fix all the stuff I broke * update docs and changelog * update example name and add model names to docs * update changelog --------- Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com> * update SMR energy conversion ratio and tests (#606) * update SMR energy conversion ratio and tests * update changelog * docs * minor updates to inline comments * update usage based on hydrogen production --------- Co-authored-by: Rob Hammond <13874373+RHammond2@users.noreply.github.com> Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com> Co-authored-by: John Jasa <john.jasa@nrel.gov> Co-authored-by: genevievestarke <103534902+genevievestarke@users.noreply.github.com> Co-authored-by: Jared Thomas <jaredthomas68@gmail.com> Co-authored-by: bayc <christopher.j.bay@gmail.com> Co-authored-by: John Jasa <johnjasa11@gmail.com> Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com> Co-authored-by: Jonathan Martin <94018654+jmartin4u@users.noreply.github.com> Co-authored-by: jmartin4 <jonathan.martin@nrel.gov> Co-authored-by: Jonathan Martin <94018654+jmartin4nrel@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Chris Bay <12664940+bayc@users.noreply.github.com> * Break out Pyomo controller simulation code (#587) * Breakout simulation code * Remove duplicate code * Fix testing * Update doc strings and docs * added docstring for heuristic controller config * fixed issue that I made with the HeuristicLoadFollowingControllerConfig * Update docs/control/pyomo_controllers.md Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com> * Make initialize_parameters() functions the same for both controllers * Apply suggestion from @jaredthomas68 Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com> * Fix doc string format * Update h2integrate/control/control_strategies/heuristic_pyomo_controller.py Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com> * Update h2integrate/control/control_strategies/heuristic_pyomo_controller.py Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com> * Fix ruff formatting --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com> Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com> Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> * Bugfix in Charge/Discharge efficiency handling in `StoragePerformanceModel` (#600) * fixed how charge and discharge rates are applied in generic_storage_pyo model --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Tests for non-one battery efficiencies (#610) * add unit tests for openloop storage controller with non-one efficiencies * rearrange usage of pytest.approx so the target comes second and uses approx * update changelog: * Sync Storage Autosizing Model and Pass-Through controller to Align with Pyomo Controllers (#608) * updated the storage autosizing and pass through controller for new control and performance model structure * added subtest for integration with pass through controller * updated to use commodity_set_point instead of input-demand * made set_demand_as_avg_commodity_in a required input parameter * moved passthrough controller to storage subfolder * Added minor changes that got missed in PR 600 --------- Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> * Sync Demand Open Loop Controller and Simple Generic Storage to Align with Pyomo Controllers (#612) * updated simple_generic_storage to simulate storage performance * updated demand openloop controller so discharge setpoint is correct * PySAM Marine Models (#607) * tidal resource model and performance model * add performance values for testing * test power curve scaling * marine cost model * tidal example * integration test * documentation * update docs * small changes * update for failing tests * fix equation rendering * fix segmentation fault * add test for using default pysam config * address reviewer feedback * fix wind pysam * attempt to modify file path handling for resource data * fix path stuff * Sync PySAM Battery and Generic Storage Pyomo Performance models with open-loop controllers (#613) * refactored pysam battery and storage performance models to be compatible with updated open-loop controllers * updated generic storage pyo to use pass through controller * renamed PassThroughOpenLoopController to SimpleStorageOpenLoopController * removed simple_generic_storage * renamed xx_charge_fraction to xx_soc_fraction --------- Co-authored-by: Genevieve Starke <genevieve.starke@nrel.gov> * minor error msg and doc corrections (#618) * CO2 Model Fixes (#617) * units and connecting variables * fix doc page * catch if annual_input_energy is 0 * remove base class * fix oae test * failing doc test * fix value call * final touchs * Bugfix: Update storage models so can use different control types per storage type (#615) * updated logic in pysam batery and generic storage to handle multiple storage types * added tests and bugfix in heuristic with setting efficiencies --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Baseclass for Openloop Storage Control Strategies (#619) * added openloop control storage baseclass * Enable use of Pyomo Controllers in the Storage Autosizing Model (#621) * updated autosizing storage model to be compatible with pyomo controllers * renamed fixures in heuristic controller tests * aggregated heuristic controller tests into one file * added simple test for storage autosizing and heuristic * renamed fixtures in optimized controller tests * aggregated optimized control tests into one file * updated test for heuristic controller with autosizing * updated so simple storage autosizing can run with optimal pyomo control * Generic cost model for converters (#622) * added generic cost model * added tests and updated model * updated example 3 to use new converter model and added to supported models * updated docstrings and input descriptions * updated changelog * added to model overview * Clarified error message --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Introducing multivariable commodity streams (#480) * Working out first steps of multivariable streams * Adding to multivariable streams work * expanding multivariable stream definition * Building out more of the gas combiner * Improving example for multivariable streams * Updating examples and merging * Apply suggestions from code review Co-authored-by: genevievestarke <103534902+genevievestarke@users.noreply.github.com> * Many updates based on PR feedback * Updated to mass fractions for multicommodity stream * renamed a few multicommodity variable names * Added helper functions for multivariable stream definitions * Updated names throughout for multivariable streams * Updated docs for multivariable streams * Added commodity stream tests * Addressing PR feedback * Updates based on PR feedback * Updates based on PR feedback --------- Co-authored-by: genevievestarke <103534902+genevievestarke@users.noreply.github.com> Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> * Removed some shape_by_conn calls due to OM issues (#632) * Removed some shape_by_conn calls due to OM issues * Moved last calls of copy_shape * Fixing test_pipe fail --------- Co-authored-by: jmartin4 <jonathan.martin@nrel.gov> * Move xdsm call in H2IntegrateModel to its own method (#629) * move xdsm creation in H2IModel to a method so user has to call it if desired instead of having it be automatic * update changelog and docs and adjust create_xdsm logic to reflect that it is an optional call * update docs * update docs * update docs for visualization * change xdsm code cell to not execute on build * switch pdf for png * minor comments update in code example * remove xdsm call * Updated XDSM explanation link --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Handling Leap Years in OpenMeteo Resource Data (#633) * updated openmeteo resource models to handle leap day * added resource files for leap year * added tests for leap year resource data * added integration w pvwatts test for leap year * Methodized leap day handling for base class for future resource handling --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Baseclass for Storage Performance Models (#624) * added draft storage model baseclass * updated draft storage baseclass * added docstring to run_storage method * minor updates to comments in storage_model_baseclass * updated storage performance model to inherit baseclass * fixed storage performance model and storage baseclass * updated storage autosizing model * updated pysam battery to use baseclass and removed battery_baseclass * removed commented out code and simplified some docstrings * removed unnecessary docstrings * updated changelog * PR review: minor personal preferences * updated inline comment --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Modified the calc tilt angle function for pysam solar (#646) * Oxygen output from PEM electrolyzer (#642) * added oxygen output from electrolyzer * updated example 14 to calc LCOO --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Removed remaining naming dependencies (#654) * Removed remaining naming dependencies * Added to changelog and fixed CI issue * PR feedback * Fixed schema reqs * Update validators to allow zero values for costs for nuclear * Bugfix: Connecting resource to multiple techs (#655) * bugfix and added test for connecting one resource model to multiple techs * updated changelog * Updated test to call setup to trigger connection error --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Update urls for NLR pages and github repositories (#658) * Update urls for NLR pages and github repositories * Updated from WISDM to NLRWindSystems org for some repos * Updated and removed more NREL references --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> * Enhancement/windows ci (#590) * update installation instructions * add windows to CI and use conda consistently for Python across OS * merge develop and update changelog * adopt 'extras' flag for analysis extras to correctly use optional CI * update changelog * reorder ci setup * update order * attempt python version restructure * reinstate old python version * update URL * move runs-on back to below strategy * add os to optional matrix * reorganize the conditional for extras * convert lists to yaml bullet lists * skip gis-dependent tests when not installed * update changelog * use optional deps for all tests and add single runner for validating dependency-determined skipped tests * reformatting * reduce sql file access scope to functions to avoid windows errors * downgrade temp_dir to a function scope to avoid windows access errors * move temp examples fixture to be in main conftest, and enable repo-wide access * add module scoped example directory copy * apply module scoped example copy fixture to recorder tests and update * update changelog * update miniconda action usage * use the example copy fixture to isolate sql access in tests for potential windows resolution * reorganize changelog * fix typo in parameter name * update workflow * remove max-parallel * Revert "reorganize changelog" This reverts commit 679a38d. * add shell to all tests * don't allow coverage upload to fail ci * uncomment windows * add garbage collection to help with sql file handling * temporarily only run windows to reduce runner usage * add sleep to see if small timeout resolves issue * only run single test * remove garbage collection * fix typo * remove manual folder removal in favor of pytest cleanup * reinstate normal CI processes * add file removal to avoid OpenMDAO silent failure * temporarily only run single file on single windows runner * fix typo * fix typo * move manual recorder_path deletion * put ci back * handle None case * track model state using IntEnum * add xfail for windows because of OpenMDAO improper SQL file handling for Windows * add todo about removing manual removal * restore accidentally deleted file --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> Co-authored-by: kbrunik <kbrunik@gmail.com> * updated CI workflow to disable windows (#668) * Check for extraneous or mis-categorized input parameters (#647) * added dictionary utilities * bugfix in setup() and added start of a test * added fix to calling check_inputs * fixed check_inputs * added another check in check_inputs * updated error messages in check_inputs and fixed example 1 * Added tests * added another subtest to test_check_inputs * fixed tech configs for examples * added some inline comments * check for requisite models and return if none * perform check from note and collapse checking logic * collapse user input regeneration to reduce number of loops * remove nested looping approach * move assert to proper context manager level * add indent level back * fix min combinations logic for passing tests * flatten improperly shared parameterization checking logic * update test to include multiple categories for improperly shared * fix typo * update docstring * added handling for combined cost and performance models * Added tech config fpath to the error messages for parameter checking * changlog * changed strict to True for six converter models * reverted strict setting for electrolyzer --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> Co-authored-by: Hammond, Rob <13874373+RHammond2@users.noreply.github.com> Co-authored-by: kbrunik <kbrunik@gmail.com> * Update Naming Convention in Open-Loop Converter Control Strategies (#631) * renamed outputs in converter openloop controllers * updated tests and examples with updated naming * added performance model outputs to the converter control strategies * moved converter control strategies to demand folder * removed commodity_set_point as output * renamed demand component to be performance model instead of control strategy * moved output calculations to shared method in baseclass --------- Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> Co-authored-by: John Jasa <johnjasa11@gmail.com> * modified state check for setup and run (#669) * Add interactive class hierarchy visualization to docs (#643) * Added class hierarchy diagram * merging * Updated the PR template * Changed class hierarchy embedding * moved class hierachy * Breaking the sphinx narrow rule * Combined colors based on feedback * Updated colors based on Gen's feedback * Shifted diagram location right * Reformatting embedding the class viz structure * Updated dev pyproject for viz tool --------- Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> * Standardize Feedstock Outputs (follow-on to 463) (#523) * added capacity and price as inputs to feedstock component * updated feedstock mdoel to have standard outputs * added commodity_amount_units to FeedstockCostConfig * added standard output to feedstock cost model and connected commodity_out between performance and cost model * renamed config inputs for feedstocks * updated ex 23 which is untested and cleaned up feedstocks.py * minor docstring updates and added comments * added in notes of questions for reviewers to feedstocks.py * updated MMBtu units to MMBtu/h * fixed iron and steel tests * made changes to feedstock * fixed tests * removed unused comment * removed shape from price input * added integration test for feedstock integrated with finance model * updated feedstocks.md * changed based on reviewer feedback * added subtests to test_feedstocks * small changes to feedstock doc * docs --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> Co-authored-by: kbrunik <kbrunik@gmail.com> Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> * Framework to allow for variable dt (#653) * add draft for variable timestep framework * Changed error wording * switch bounds to tuple * minor test correction * include time-series generation functions * add tests for variable dt and update simulation length check for non-hourly dt * update docs * update changelog * update docs and doc strings * restore develop version of utilities.py * update dt bounds error * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fixing tests * Adding time step bounds to all models * Adding time step bounds to the combiner/splitter/transporters * Updates for tests * Adding time step bounds to the custom paper mill performance model * Added time step bounds to paper mill cost --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> Co-authored-by: John Jasa <john.jasa@nrel.gov> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * patch: Variable dt (#671) * update dt bounds error to require `_time_step_bounds` * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add time step bounds to all tech models * Apply time step bounds check to feedstocks, transporters, and combiners --------- Co-authored-by: John Jasa <johnjasa11@gmail.com> Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> Co-authored-by: John Jasa <john.jasa@nrel.gov> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Remove system-level outputs from storage and replace with demand component (follow-on to 631) (#666) * removed system level calcs from storage and updated most tests * updated examples with storage but dont use storage as a commodity_stream in finances * updated examples with storage defined as a commodity_stream for a finance subgroup * added time_step_bounds to demand components * added test for example 23 * added example for different demand between storage and demand component * added demo for the demand components using example 13 * made it so demand is only input to battery performance model if using feedback control * added standard_capacity_factor as output from storage * added doc page for storage performance models --------- Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> Co-authored-by: John Jasa <johnjasa11@gmail.com> Co-authored-by: kbrunik <kbrunik@gmail.com> * Updating the readme and intro doc page ahead of v0.8 release (#677) * Updating the readme * Updated intro.md and changelog * Minor readme updates * Addressing Kaitlin's comments * Added more lingo to readme * Addressing PR suggestions --------- Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> * Move storage controllers into `storage` folder in `control_strategies` (#678) * moved controllers to storage folder * renamed pyomo controllers to include storage in the control name * moved control strategy tests * moved tests to the right folder * moved pyomo baseclass and controller_opt_problem_state to top-level control_strategies * updated import statements * renamed pyomo baseclass file * updated import for pyomo storage baseclass * made storage chapter in docs * removed backslashes from eqn since they dont render properly on readthedocs * Making changes per Gen's suggestion (#681) * Bump version from 0.7.2 to 0.8.0 --------- Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com> Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com> Co-authored-by: Rob Hammond <13874373+RHammond2@users.noreply.github.com> Co-authored-by: genevievestarke <103534902+genevievestarke@users.noreply.github.com> Co-authored-by: Jared Thomas <jaredthomas68@gmail.com> Co-authored-by: bayc <christopher.j.bay@gmail.com> Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com> Co-authored-by: Jonathan Martin <94018654+jmartin4u@users.noreply.github.com> Co-authored-by: jmartin4 <jonathan.martin@nrel.gov> Co-authored-by: Jonathan Martin <94018654+jmartin4nrel@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Chris Bay <12664940+bayc@users.noreply.github.com> Co-authored-by: Genevieve Starke <genevieve.starke@nrel.gov> Co-authored-by: kbrunik <kbrunik@gmail.com>

elenya-grant and others added 27 commits March 26, 2026 15:17

renamed outputs in converter openloop controllers

1b9f88d

updated tests and examples with updated naming

2b3d0c1

Merge remote-tracking branch 'h2i_upstream/develop' into dispatch/con…

2af6329

…verter_ol_sync

Merge branch 'develop' into dispatch/converter_ol_sync

c59a20e

added performance model outputs to the converter control strategies

eab6d09

udpated plant configs in test_openloop_controllers.py

1e54ed2

Merge branch 'develop' into dispatch/converter_ol_sync

1852db4

moved converter control strategies to separate file

b1b62c9

Merge branch 'dispatch/converter_ol_sync' of github.com:elenya-grant/…

a97292c

…GreenHEART into dispatch/converter_ol_sync

moved converter control strategies to demand folder

2d6b0c5

updated import paths for demand components

0e6b3e8

removed commodity_set_point as output

2986dff

Merge remote-tracking branch 'h2i_upstream/develop' into dispatch/con…

1f71c9d

…verter_ol_sync

renamed demand files

9672ecc

renamed demand classes and configs

7ad7b59

Merge branch 'develop' into dispatch/converter_ol_sync

9ace0ad

renamed demand component to be performance model instead of control s…

8444cdf

…trategy

moved output calculations to shared method in baseclass

2093b81

Merge branch 'dispatch/converter_ol_sync' of github.com:elenya-grant/…

1510bd2

…GreenHEART into dispatch/converter_ol_sync

removed the word controller from docstrings

d116ad8

draft update to docs

7c5b9e5

removed system level calcs from storage and updated most tests

1046419

updated optimal controller tests

65dc07b

updated example 1 and 2

89a4ced

updated examples 1, 2, and 12

5032e41

updated examples with storage but dont use storage as a commodity_str…

24cb283

…eam in finances

updated examples with storage defined as a commodity_stream for a fin…

92d9854

…ance subgroup

elenya-grant requested review from jaredthomas68, johnjasa and kbrunik April 10, 2026 17:00

elenya-grant added 8 commits April 14, 2026 13:30

added subtests for example and minor updates based on feedback

34f5a8c

added xdsm to demand_demo doc page

41a177b

added standard_capacity_factor as output from storage

864b124

minor updates to example 13 subtests

ff1b98c

make some subtests more loose because of floating point precision dif…

62347b5

…ferences

added doc page for storage performance models

98047ec

added subtests for capacity factor calcs and minor update to docs

0704c24

minor update to example tests

15e7573

elenya-grant requested review from genevievestarke and jaredthomas68 April 14, 2026 22:15

elenya-grant mentioned this pull request Apr 14, 2026

Update controller tests to not depend on calculate_combined_outputs function #676

Open

jaredthomas68 requested changes Apr 14, 2026

View reviewed changes

kbrunik and others added 4 commits April 15, 2026 06:03

docs

d7694f3

docs fix

ec95ba5

no api call but tests fail

6254ee6

updated example so using pre-downloaded resource data

7a96ec6

elenya-grant requested a review from jaredthomas68 April 15, 2026 15:16

updated changelog

231f1d9

jaredthomas68 requested changes Apr 15, 2026

View reviewed changes

updated doc page

5b8e4dc

elenya-grant requested a review from jaredthomas68 April 15, 2026 16:29

elenya-grant added 2 commits April 15, 2026 10:54

added dt to doc eqn

4a228fa

minor update to cf doc page

226bc74

jaredthomas68 approved these changes Apr 15, 2026

View reviewed changes

added underscore t to numerator in doc page

2329b36

elenya-grant enabled auto-merge (squash) April 15, 2026 18:02

elenya-grant merged commit 6d4caff into NatLabRockies:develop Apr 15, 2026
12 checks passed

johnjasa mentioned this pull request Apr 15, 2026

Develop -> Main for v0.8 release #682

Merged

johnjasa mentioned this pull request Apr 16, 2026

Develop -> Main for v0.8 release (#682) #683

Merged

51 tasks

Conversation

elenya-grant commented Apr 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Remove system-level outputs from storage and replace with demand component (follow-on to 631)

Section 1: Type of Contribution

Section 2: Draft PR Checklist

TODO:

Type of Reviewer Feedback Requested (on Draft PR)

Section 3: General PR Checklist

Section 3: Related Issues

Section 4: Impacted Areas of the Software

Section 4.1: New Files

Section 4.2: Modified Files

Examples that were updated

Tests that were updated

Section 5: Additional Supporting Information

Section 6: Test Results, if applicable

Section 7 (Optional): New Model Checklist

Uh oh!

jaredthomas68 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jaredthomas68 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elenya-grant Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

johnjasa Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elenya-grant commented Apr 10, 2026 •

edited

Loading

elenya-grant Apr 15, 2026 •

edited

Loading

johnjasa Apr 15, 2026 •

edited

Loading