Skip to content

Remove ElectricitySumComp (follow-on to 463)#524

Merged
johnjasa merged 3 commits intoNatLabRockies:developfrom
elenya-grant:remove_elec_sum_comp
Feb 12, 2026
Merged

Remove ElectricitySumComp (follow-on to 463)#524
johnjasa merged 3 commits intoNatLabRockies:developfrom
elenya-grant:remove_elec_sum_comp

Conversation

@elenya-grant
Copy link
Collaborator

@elenya-grant elenya-grant commented Feb 11, 2026

Remove ElectricitySumComp (follow-on to 463)

Remove usage of ElectricitySumComp in H2IntegrateModel. This is a potential step outlined in Issue #485 and is a follow-on to PR #463. The ElectricitySumComp acted like a combiner and a summer, specifically used for electricity producing technologies. The usage of ElectricitySumComp in H2IntegrateModel has been replaced with using the GenericSummerPerformanceModel and the GenericCombinerPerformanceModel. These are only used if the commodity_stream is not specified for a finance subgroup and that finance subgroup includes technologies with a naming convention that categorizes them as an "electricity_producing_tech" (this naming logic is in the is_electricity_producer() function).

This removes the need to have the ElectricitySumComp component.

This change perhaps seems unnecessary - but it will make future steps outline in Issue #485 easier to implement and easier to see the changes that happen there.

This PR can be merged in whenever (does not depend on other follow-on PRs to be merged in)

Section 1: Type of Contribution

  • Feature Enhancement
    • Framework
    • New Model
    • Updated Model
    • Tools/Utilities
    • Other (please describe):
  • Bug Fix
  • Documentation Update
  • CI Changes
  • Other (please describe):

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:

  • Step 1
  • Step 2

Type of Reviewer Feedback Requested (on Draft PR)

Structural feedback:

Implementation feedback:

Other feedback:

Section 3: General PR Checklist

  • PR description thoroughly describes the new feature, bug fix, etc.
  • [-] Added tests for new functionality or bug fixes
  • Tests pass (If not, and this is expected, please elaborate in the Section 6: Test Results)
  • Documentation
    • Docstrings are up-to-date
    • Related docs/ files are up-to-date, or added when necessary
    • Documentation has been rebuilt successfully
    • [-] Examples have been updated (if applicable)
  • [-] CHANGELOG.md has been updated to describe the changes made in this PR

Section 3: Related Issues

This resolves a step outlined in Issue #485

Section 4: Impacted Areas of the Software

Section 4.1: New Files

Section 4.2: Modified Files

  • h2integrate/core/h2integrate_model.py, H2IntegrateModel
    • create_finance_model(): Replaced usage of ElectricitySumComp with the GenericSummerPerformanceModel and the GenericCombinerPerformanceModel
    • connect_technologies: Replaced connection of electricity producing tech to the electricity_sum subsystem of the finance subgroup with connecting electricity producing tech to the electricity_combiner_comp subsystem of the finance subgroup. Added connection from the electricity_combiner_comp.electricity_out to electricity_sum.electricity_in

Section 4.3: Removed Files

  • h2integrate/core/resource_summer.py: no longer using ElectricitySumComp

Section 5: Additional Supporting Information

Section 6: Test Results, if applicable

Section 7 (Optional): New Model Checklist

  • Model Structure:
    • Follows established naming conventions outlined in docs/developer_guide/coding_guidelines.md
    • Used attrs class to define the Config to load in attributes for the model
      • If applicable: inherit from BaseConfig or CostModelBaseConfig
    • Added: initialize() method, setup() method, compute() method
      • If applicable: inherit from CostModelBaseClass
  • Integration: Model has been properly integrated into H2Integrate
    • Added to supported_models.py
    • If a new commodity_type is added, update create_financial_model in h2integrate_model.py
  • Tests: Unit tests have been added for the new model
    • Pytest-style unit tests
    • Unit tests are in a "test" folder within the folder a new model was added to
    • If applicable add integration tests
  • Example: If applicable, a working example demonstrating the new model has been created
    • Input file comments
    • Run file comments
    • Example has been tested and runs successfully in test_all_examples.py
  • Documentation:
    • Write docstrings using the Google style
    • Model added to the main models list in docs/user_guide/model_overview.md
      • Model documentation page added to the appropriate docs/ section
      • <model_name>.md is added to the _toc.yml

@elenya-grant elenya-grant added the ready for review This PR is ready for input from folks label Feb 11, 2026
@elenya-grant elenya-grant mentioned this pull request Feb 11, 2026
Open
11 tasks
johnjasa
johnjasa approved these changes Feb 12, 2026
View reviewed changes
Copy link
Collaborator

@johnjasa johnjasa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So smooth! You don't need that resource_summer.py! Thank you!

@johnjasa johnjasa merged commit 0826915 into NatLabRockies:develop Feb 12, 2026
5 checks passed
RHammond2 added a commit that referenced this pull request Mar 3, 2026
@RHammond2 @elenya-grant
@johnjasa @genevievestarke @jaredthomas68 @bayc @kbrunik @jmartin4u
Release v0.7 (#562)
660551b 
* Ammonia Synloop: Units fix and small changes (#518)

* updated electricity units in synloop

* added feedstock consumption profiles and updated cost model to use capacity input

* added tests/subtests for ammonia synloop

* udpated electricity units to kW

* fixed nitrogen purge gas calc (#520)

* Minor fix in post-processing to save capacity factors (#519)

* minor update to sql_to_csv to save capacity factors

* simplified logic handling capacity factor in postprocessing

* Apply suggestion from @johnjasa

---------

Co-authored-by: John Jasa <john.jasa@nrel.gov>

* Enable load following optimization dispatch with Pyomo (#407)

* include code from usage: pyomo [-h] [--version]
             {build-extensions,convert,download-extensions,help,install-extras,model-viewer,run,solve,test-solvers}
             ...

This is the main driver for the Pyomo optimization software.

options:
  -h, --help            show this help message and exit
  --version             show program's version number and exit

subcommands:
  {build-extensions,convert,download-extensions,help,install-extras,model-viewer,run,solve,test-solvers}
    build-extensions    Build compiled extension modules
    convert             Convert a Pyomo model to another format
    download-extensions
                        Download compiled extension modules
    help                Print help information.
    install-extras      Install "extra" packages that Pyomo can leverage.
    model-viewer        Run the Pyomo model viewer
    run                 Execute a command from the Pyomo bin (or Scripts)
                        directory.
    solve               Optimize a model
    test-solvers        Test Pyomo solvers

-------------------------------------------------------------------------
Pyomo supports a variety of modeling and optimization capabilities,
which are executed either as subcommands of 'pyomo' or as separate
commands.  Use the 'help' subcommand to get information about the
capabilities installed with Pyomo.  Additionally, each subcommand
supports independent command-line options.  Use the -h option to
print details for a subcommand.  For example, type

   pyomo solve -h

to print information about the `solve` subcommand. branch that needs to be saved for later

* include storage rule file

* Halfway there for pyomo opt

* Add first objective function

* Updated dispatch optimization framework - add hybrid dispatch rule

* Adding hybrid linking constraints and connecting variables in pyomo min operating costs framework

* Final structural changes

* Fix import statement

* Fix imports and setter method

* First draft of running code

* Update example

* test

* fix precommits

* Fixing merge errors

* Minor spelling changes

* Update example

* Update controller problem state method from Elenya

* Update example and changelog

* Clean up pyomo storage baseclass file

* Cleanups to feature/pyomo opt (#2)

* refactored DispatchProblemState

* updated tech config and removed pysam options file

* minor cleanups to DispatchProblemState

* minor updates to generic_converter_opt

* initial cleanups to hybrid_rule.py

* minor cleanups to pyomo_storage_rule_min_operating_cost

* extra small cleanups to generic_converter_opt

* added storage capacities as inputs to optimized controller

* updated use of n_control_window and n_horizon_window

* Enable heuristic dispatch to run with new pyomo changes

* Clean up added files and example

* Adding first tests - do not pass yet

* Update docs and rename example

* Align naming with develop branch

* Update Ex 02 and update pyomo_controllers with naming in develop

* updated other example tech configs

* ran precommit on some files

* precommit on pyomo_controllers.py

* Update test formatting

* Update pyomo storage rule for test

* Fix SOC linking bug

* Testing update - partial

* Make new test for optimized pyomo dispatch

* Update optimal controller test

* Update test with new site definition

* Update example for merging in develop

* Minor updates to optimized dispatch

* PR updates from comments

* Add last file after merge issue

* Update example

* Made plots slightly larger

* Update h2integrate/control/control_strategies/controller_opt_problem_state.py

Apply comment suggestions

Co-authored-by: John Jasa <john.jasa@nrel.gov>

* Update h2integrate/control/control_strategies/controller_opt_problem_state.py

Apply comment suggestions

Co-authored-by: John Jasa <john.jasa@nrel.gov>

* Update h2integrate/control/control_rules/hybrid_rule.py

Apply comment suggestions

Co-authored-by: John Jasa <john.jasa@nrel.gov>

* Cleaning up pyomo_controllers

* Updated docstrings and battery mentions

* Initial init docs string and example update

* Update note about incentivizing charging in objective function

* Update generation and load variable definitions

* Update docs/control/pyomo_controllers.md

Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com>

* Update doc strings for updated_initial_soc parameter

* Make time_weighting_factor and round_digits not hardcoded

* remove round_digits from pyomo_rule_baseclass

* Updating controller names

* Fixed name check for controllers

* Updated optimal controller test

* remove unused properties

* Update example to run with new class definitions

* Fix converter name in test

* Fix ruff formatting

* Update doc strings for pyomo model classes

* Rename files to be more consistent and descriptive

* Update comments in the init portions of dispatch for parameters

* Remove comment

* Add doc strings to optimized dispatch config

* Give more details about DispatchProblemState class

* Remove todo comments

* Update docs with more in-depth dispatch description

* Minor typo

* Minor pyomo docs updates

* Minor pyomo docs updates

* Updated pyomo dispatch figure

* Minor comments based on PR review

* PR feedback

---------

Co-authored-by: Jared Thomas <jaredthomas68@gmail.com>
Co-authored-by: bayc <christopher.j.bay@gmail.com>
Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com>
Co-authored-by: kbrunik <kbrunik@gmail.com>
Co-authored-by: John Jasa <johnjasa11@gmail.com>
Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com>
Co-authored-by: John Jasa <john.jasa@nrel.gov>

* Remove `ElectricitySumComp` (follow-on to 463) (#524)

* removed usage of ElectricitySumComp

* removed ElectricitySumComp

* updated test value in test_save_csv_all_results

* Linearized H2 Fuel Cell Model (#525)

* linearized fuel cell

* added fuel cell to supported models

* fix units and output all necessary outputs

* docs on docs

* Review feedback changes

* add h2 fuel cell to elec tech

* Update docs/technology_models/h2_fuel_cell.md

Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>

* Update h2integrate/converters/hydrogen/h2_fuel_cell.py

Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>

* Update docs/technology_models/h2_fuel_cell.md

Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>

* rename model to note linear performance

* docs

---------

Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>

* Standardized Performance Outputs: Generic Storage & Control (#493)

* added draft of performance model baseclass to set outputs

* updated wind models for standardized outputs

* minor cleanup to wind pysam

* minor cleanup to floris outputs

* updated outputs of hydroplant

* updated solar pv models for standardized outputs

* updated solar resource integration tests with updated solar model outputs

* added fraction_of_year_simulated attribute to performance baseclass

* updated tests for turbine preprocessing tools

* fixed variable naming in test_all_examples for wind and solar

* started updating electrolyzer model outputs

* minor bugfix to test_sql_timeseries_to_csv for example 2

* fixed save_case_timeseries_as_csv

* update to sql_to_csv function just in case

* added attribute check in PerformanceModelBaseClass

* typo bugfix in refurb period calc in electrolyzer model

* added test for solar performance baseclass

* added solar test to check that all outputs are set in parent class

* commented out unused variables in new solar test

* generalized solar unit test so it can be easily used for other components

* updated natural gas plant

* started updating co2 models

* updated grid model

* updated asu model

* updated grid tests

* updated desal model

* updated co2 models and tests

* updated newest steel models

* started updating methanol models but not tested

* made it so ResizablePerformanceModelBaseClass inherits PerformanceModelBaseClass

* updated electrolyzer model and ammonia synloop model

* updated simple ammonia model

* updated hopp wrapper

* updated steel.py

* updated iron mine and dri models

* updated geoh2 models

* updated battery

* added todo comments to storage models

* added unit tests to check that outputs are populated

* working on updating combiners and h2imodel

* updated electrolyzer so test values dont change and other bugfixes so examples run

* updated how_to_set_up_an_analysis.md

* removed init file from new hydro power test folder

* updated remaining failing tests

* updated example 28 and iron_wrapper

* updated capacity factor strings in run_size_modes files

* removed commented out outputs

* updated changelog

* removed duplicate inheritance of PerformanceModelBaseClass in electrolyzer performance baseclass

* updated pysam battery outputs

* updated annual outputs to properly account for fraction of year simulated

* moved commodity defn to initialize

* updates based on reviewer feedback

* updated generic storage models and simple controllers

* bugfix in simple_storage_autosizing

* updated test for post-processing timeseries

* added subtest for ex 12

* updated ex 12 test values

* removed commented out code

* updated changelog

* added some comments to generic storage performance models

* added more inline and docstring comments

* Minor refactoring changes for clarity

* updated docstring in generic storage

* updated variable name in simple storage autosizing

* added charge rate and capacity inputs to simple generic storage

* removed capacity as input to simple_generic_storage

* update config names for commodity_name, commodity_units and commodity_storage_units

* updated ex 9

* minor updates based on feedback

* updated changelog

* updated inline comment in simple_generic_storage

---------

Co-authored-by: John Jasa <johnjasa11@gmail.com>

* Rename examples to avoid clash (#528)

* moved example and added test

* Simplified test

* Standard Combiner Outputs (follow-on to 463) (#501)

* updated combiner to have standard outputs

* updated h2imodel for connecting techs to the combiner

* added inline comments to generic combiner

* added integration test for generic combiner

* updated commodity_units to commodity_rate_units

* fixed issue from merge causing errors

* updated commodity_units to commodity_rate_units in splitter

* updated combiner inputs in a test

* adding docstring and docs about combiner

---------

Co-authored-by: John Jasa <johnjasa11@gmail.com>

* Update mcm dependency (#530)

* made saving figures and outputs a config option for co2 models

* updated oae to have save plots be optional

* update mcm dependency to pip

* revert environment.yml change

* fix merge issue

---------

Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com>

* Update CO2 model documentation (#533)

* made saving figures and outputs a config option for co2 models

* updated oae to have save plots be optional

* update mcm dependency to pip

* revert environment.yml change

* fix merge issue

* update docs

* update ci

---------

Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com>

* Iron: Example with independently sized mine and iron/steel plant (#433)

* added in-progress refactored iron winning models

* updated natural gas dri performance model

* updated docs in ng iron performance model

* updated iron cost model

* updated coefficient paths for rosner iron plant models

* updated example 21 and fixed bugs that were found

* minor updates to dri cost and perf models

* added basic tests for new dri models

* removed notes from rosner dri test

* double checked water costs and unit conversions and cleaned up some small things

* renamed ng iron reduction models and configs

* renamed ng iron dri files

* updated iron example tech config

* added h2 dri cost and performance models

* added h2 dri models to supported models

* update test values for wombat version bump

* update unit test

* update docstrings

* update feedstocks to be per ton pig iron

* refactored DRI performance and cost models to share baseclass

* updated electricity to not double count

* added test for performance with limited feedstock availability

* eaf wip

* steel tests wip

* undo align

* minor update on handling negative exponents in steel eaf cost model

* added carbon and lime to pipe

* update rosner eaf test

* draft update to iron example

* updated iron example to include steel eaf

* updated doc page and changelog

* added small test for example 21

* Fix run_iron.py to actually compare old and new

* Comparing old and new models

* Old and new models matched up

* Cleaning up PR

* Less goofy plant config and other cleanup

* Going back to old coefficients with electricity in processing cost

* Fixed tests, need to document

* updated example 21 so iron_ore_consumed is used for transport cost

* Some iron-related cleanup

* Fixing test

---------

Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com>
Co-authored-by: kbrunik <kbrunik@gmail.com>
Co-authored-by: John Jasa <johnjasa11@gmail.com>
Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com>

* Enhancement: Error out on duplicate configuration keys (#534)

* add duplicate key handling

* include all info in final error message and use load_yaml() in include()

* remove printing

* remove duplicate keys from floris v4 default template

* add more implementation details to the docstring

* update changelog

* place duplicate key error next to YAML loading

* add testing for duplicate keys

* provide further insight into design/implementation choices and clarify what is being passed through

* GeoH2: Arps decline curve (#454)

* WIP arps decline curve

* update decline curve

* update geoh2 and docstring

* update test

* update to be percent

* update documentation

* fix changelog

* Update h2integrate/converters/hydrogen/geologic/simple_natural_geoh2.py

Co-authored-by: Jonathan Martin <94018654+jmartin4u@users.noreply.github.com>

* Update h2integrate/converters/hydrogen/geologic/simple_natural_geoh2.py

Co-authored-by: Jonathan Martin <94018654+jmartin4u@users.noreply.github.com>

* precommit fix

* placeholder fix for lifetime simulation

* fix failing test units

* Fixing model name in example script

---------

Co-authored-by: Jonathan Martin <94018654+jmartin4u@users.noreply.github.com>
Co-authored-by: John Jasa <johnjasa11@gmail.com>
Co-authored-by: jmartin4 <jonathan.martin@nrel.gov>

* fix oae numpy (#535)

* fix oae numpy stuff

* actual fix

* Feedstock units update (#541)

* updated MMBtu to MMBtu/h

* updated naming for feedstock config inputs

* Re-organize "default" logic around `commodity_stream` and finance models (#536)

* moved tech-specific hard-coded logic to connect technologies to finance models from connect_technologies() to create_finance_model()

---------

Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com>

* Iron: Adding electrowinning capabilities (#432)

* Reading in Stinn input tables

* Sucessfully testing Stinn model

* Making humbert perf model

* Adding humbert/stinn cost model inputs only

* Progress on humbert cost

* Humbert Stinn complete, not debugged

* Debugging electrowinning

* Debugging ewinning

* Electrowinning cases running, need to add DRI case

* Cleanup of old trailing underscores

* Fix input csv names

* Integrate ewin example with feedstocks

* Moving functions out of h2i module and renumbering example

* Small fixes to PR

* start of unit test

* Testing example

* Expanding unit tests

* fix import

* Docstrings begun

* Docstrings plus a little reorg

* Everything but the docs page

* Finished documentation

* Split off humbert cost_model

* Config docstrings

* Refactoring iron ewinning calcs for clarity

* Addressing reviews

* site -> sites

* Updating test values

* Added autodoc to the electrowinning docs

* updated iron electrowinning tech config

* updated plant config for electrowinning example

* minor udpates to cost model

* minor updates to cost and performance models

* fixed initialization error in cost model

* removed duplicate costs and updated to use PerformanceModelBaseClass

* updated example test values

* Addressing elenya comments

* feedstocks wip

* updating integration

* classic units

* updated tech config to be compatible with develop

* merged changelog

* removed hard-coded cost numbers in compute() to config args with default values

* Minor cleanup

---------

Co-authored-by: Jonathan Martin <94018654+jmartin4nrel@users.noreply.github.com>
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>
Co-authored-by: elenya-grant <116225007+elenya-grant@users.noreply.github.com>

* Consistently call `prob.get_val()` with units instead of `prob["<variable>"]` (#539)

* moved prob calls

* Fixing some tests

* Updated units for NG

* Updated based on PR feedback

* Generic transporter model (#540)

* added generic transporter and added to supported models

* updated generic transporter, added test, and updated iron example

* updated doc pages for generic transporter

* added error message to h2imodel for invalid tech names

* minor typo fix in feedstock documentation

* removed more components from pipe and updated iron examples

* Changed to using set notation for the reserved techs

---------

Co-authored-by: John Jasa <johnjasa11@gmail.com>

* Finance models to represent lifetime performance (#543)

* initial lifetime finance reorg with updated lcoh test values

* updated combiner output naming for capacity factor so combiners can be daisy-chained

* added new error message to check if a default commodity stream was not found

* fixed other failing tests

* updates to co2 models and new tests

* removed hard-codedl logic for handling co2

* minor fix on units input to ProFast

* cleaned up doc

* minor cleanups

* renamed variables in generic combiner

* minor other update to generic combiner

* minor cleanup

---------

Co-authored-by: John Jasa <johnjasa11@gmail.com>

* Maintenance: Test Revamp Phase 1 - Mild Refactor and Test Type Marking (#531)

* enable test coverage and update pytest settings

* add sort of working file cleanup fixture

* convert feedstock to pytest

* spacing

* convert utilities to pytest

* remove last unittest reference

* convert finance test to pytest

* fix import error and convert DOC to pytest

* use correct error for imports not found

* add infrastructure to have separate unit, regression, and integration tests

* refactor shared fixtures to conftest and mark doc with test type

* adopt enforcement of unit, regression, and test marking

* mark already modified files

* fix marker name gathering

* add docstring

* add documentation for test development and running

* convert oae test to pytest

* mark controller tests

* mark ammonia converter tests

* simplify fixtures and convert to pytest

* update docs for openmdao cleanup

* update fixtures and mark hopp tests

* remove generated output plots

* mark geologic h2 and handle temp data better

* update fixture usage and mark tests in h2

* update fixture structure and mark iron converter tests

* mark methanol tests

* mark natural gas tests

* mark nitrogen tests

* reorg solar fixtures and mark test types

* reorg steel converter fixtures and mark test types

* mark water power test types

* reorg wind converter models fixtures and mark test types

* mark  wind converter tools  test types

* remove repetitive .parent

* update temp directory usage and mark test types in frameworks

* refactor temp_dir to conftest

* mark recorder tests and use pytest temp dir factory

* mark supported models tests and use general temp_dir for utilities

* define temp_dir factory in top-level conftest and import everywhere else

* correct temp_dir refactor

* fix broken mcm tests and universalize package management

* mark new tests

* mark finance test types

* mark postprocessing tests and use temp_dir fixture

* mark preprocessing test types and use temp_dir

* refactor himawari tests to reduce repitive setup architecture and mark test type

* refactor himawari and open meteosat models to single parameterized test

* refactor nrel goes resource model to single parameterized test

* combine all resource model tests into single file and convert openmeteo historical to parameterized

* convert pv watts integration tests into single parameterized test

* move common resource fixtures to resource level conftest

* include which for solar vs win

* use site config setup for wind and mark wind resource tests

* refactor open meteo wind test to use generalized fixtures and mark test types

* apply ids and use timezone arg for plant

* mark resource utilities tests

* mark battery storage tests and unify test folders

* mark storage test types, use common fixtures, and parametrize common test routines

* mark tools test types

* mark transporter test types and reduce repetitive tests and fixtures

* mark pip tests

* mark examples test types

* ignore sqllite cache

* bump wombat version and remove remove test coverage options

* fix broken tests from lack of temp_dir updating

* mark newly merged tests

* mark missing integration test

* create fixture for temp_dir setup/teardown for example directories

* account for resource data and fix broken tests

* accept change from kbrunik for model vs technology language

Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com>

* add unit test example to docs and fix subtest comment

* add regression test example and integration test pointer

* add missing setup/teardown for meteosat nrel api

* update commodity units to commodity_rate_units

* mark newly merged test

* add code coverage workflow draft

* consolidate repetitive pytest session functionality

* account for differing resource year and file name resource year

* update resource year in integration test as well

* update naming

* remove redundant resource-year update and fix variable typo

* mark new tests

* Update docs/developer_guide/adding_a_new_technology.md

Co-authored-by: genevievestarke <103534902+genevievestarke@users.noreply.github.com>

* Update docs/developer_guide/adding_a_new_technology.md

Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>

* Update docs/developer_guide/adding_a_new_technology.md

Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>

* Update docs/developer_guide/adding_a_new_technology.md

Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>

* add in docs for temporary data retention

* remove unlink for redundant cleanup

* remove unused parameter

* mark finnicky test with xfail

* move testing docs to a separate page

* add shared fixture commentary

* add codecov token

* make relative reference

* update changelog

* add use a generic fenceposting comment to mark docs literalinclude bounds

---------

Co-authored-by: kbrunik <102193481+kbrunik@users.noreply.github.com>
Co-authored-by: John Jasa <johnjasa11@gmail.com>
Co-authored-by: genevievestarke <103534902+genevievestarke@users.noreply.github.com>
Co-authored-by: Jared Thomas <jaredthomas68@users.noreply.github.com>

* Remove some doc warnings (#550)

* Beginning to address doc build warnings

* Removing duplicate kwarg docstrings

* updated ammonia model to need n2 and electricity inputs (#544)

Co-authored-by: John Jasa <johnjasa11@gmail.com>

* yamlfix all yaml files; add yamlfix to the pre-commit hook (#551)

* add yamlfix to the pre-commit

* yamlfix'd all yamls

* Update changelog

* Rolling back other pre-commit changes

* Excluded yamls needed for duplicate keys tests

* Excluded yamls needed for duplicate keys tests

* Switch to keep style for sequences

* Switch to keep style for sequences

* Apply suggestions from code review

Co-authored-by: Rob Hammond <13874373+RHammond2@users.noreply.github.com>

* Applying Rob's suggestions

* leave not on malfunctional config and reapply settings

---------

Co-authored-by: Rob Hammond <13874373+RHammond2@users.noreply.github.com>

* Enhancement: Automatically insert technology names in control strategy definitions (#558)

* add tech name to control parameters in setup

* remove obselete test and associate files

* handle no keys in control parameters and update testing

* Add a simple nuclear plant performance and cost model (#538)

* Added first pass at a simple nuclear model

* Adding nuclear doc page

* Added to changelog

* Doc cleanup

* Fixed OpEx calc for nuclear

* Simplifying nuclear test

* Addressing PR comments

* Marking tests

* Updates based on PR feedback

* Split out Pyomo Controllers to separate files (#549)

* split out pyomo control models

* added pyomo controller baseclass

* removed n_horizon_window from control strategies

* moved round_digits to pyomo base config

* other minor updates

* fixed failing tests

* Update changelog

---------

Co-authored-by: John Jasa <johnjasa11@gmail.com>

* Update Natural GeoH2 with Yearly CF (#552)

* reformat release updates

* bump version

* Added PR links to changelog

* Tech and system model figures (#554)

* tech and system model diagrams

* add comment about modularity and custom models

* Update docs/intro.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Apply suggestion from @bayc

Co-authored-by: Chris Bay <12664940+bayc@users.noreply.github.com>

* Apply suggestion from @bayc

Co-authored-by: Chris Bay <12664940+bayc@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Chris Bay <12664940+bayc@users.noreply.github.com>

* correct typo and unify figure specs

* typo correction

* update changelog

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Chris Bay <12664940+bayc@users.noreply.github.com>

* Removed hard-coded logic for electrolyzer replacement schedule (#555)

* draft

* updated finances to take in replacement schedules for all techs

* updated feedstock and added logic to prevent connecting replacement schedule for transport components

* added doc page about naming convention

* removed unnecessary elif statement in connect_technologies

* added test for new error message

* updated inline comments for finance models

* Minor refactor and cleanup for replacement cost vars

* updated naming for system finance model

* reverted change to ex 1 run file

---------

Co-authored-by: John Jasa <johnjasa11@gmail.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: kbrunik <102193481+kbrunik@users.noreply.github.com>
Co-authored-by: kbrunik <kbrunik@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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@johnjasa johnjasa johnjasa approved these changes

@kbrunik kbrunik Awaiting requested review from kbrunik

Assignees

No one assigned

Labels

ready for review This PR is ready for input from folks

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elenya-grant @johnjasa