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>

Author: elenya-grant

CHANGELOG.md

@@ -14,6 +14,13 @@
   - Add tidal resource model
   - Add pysam tidal performance model
   - Add pysam marine hydrokinetic cost model
+- Updated the `StoragePerformanceModel` and `PySAMBatteryPerformanceModel` to be compatible with the open-loop storage control strategies [PR 613](https://github.com/NatLabRockies/H2Integrate/pull/613)
+  - Removed `SimpleGenericStorage` and replaced usage with `StoragePerformanceModel`
+  - Renamed `PassThroughOpenLoopController` to `SimpleStorageOpenLoopController`
+  - Bugfix in pyomo control rules so that units such as `kg/h` can be used
+  - Bugfix in tests of pyomo control strategies with `StoragePerformanceModel` so that the pathname attribute is correct
+  - Added `demand_profile` as an input to `StoragePerformanceModel` and `PySAMBatteryPerformanceModel`
+  - Renamed `xx_charge_fraction` to `xx_soc_fraction`
 
 ## 0.7.1 [March 13, 2026]
 

docs/control/control_overview.md

@@ -7,7 +7,7 @@ There are two different systematic approaches, or frameworks, in H2Integrate for
 The first approach, [open-loop control](#open-loop-control), assumes no feedback of any kind to the controller. The open-loop framework does not require a detailed technology performance model and can essentially act as the performance model. The open-loop framework establishes a control component that runs the control and passes out information about `<commodity>_unmet_demand`, `unused_<commodity>`, `<commodity>_out`, and `total_<commodity>_unmet_demand`.
 
 Supported controllers:
-- [`PassThroughOpenLoopController`](#pass-through-controller)
+- [`SimpleStorageOpenLoopController`](#pass-through-controller)
 - [`DemandOpenLoopStorageController`](#demand-open-loop-storage-controller)
 - [`DemandOpenLoopConverterController`](#demand-open-loop-converter-controller)
 - [`FlexibleDemandOpenLoopConverterController`](#flexible-demand-open-loop-converter-controller)

docs/control/open-loop_controllers.md

@@ -7,10 +7,10 @@ The open-loop storage controllers can be attached as the control strategy in the
 2. Demand Open-Loop Storage Controller - uses simple logic to attempt to meet demand using the storage technology.
 
 (pass-through-controller)=
-### Pass-Through Controller
-The `PassThroughOpenLoopController` simply directly passes the input commodity flow to the output without any modifications. It is useful for testing, as a placeholder for more complex controllers, and for maintaining consistency between controlled and uncontrolled frameworks as this 'controller' does not alter the system output in any way.
+### Simple Open-Loop Storage Controller
+The `SimpleStorageOpenLoopController` passes the input commodity flow to the output, possibly with minor adjustments to meet demand. It is useful for testing and as a placeholder for more complex controllers.
 
-For examples of how to use the `PassThroughOpenLoopController` open-loop control framework, see the following:
+For examples of how to use the `SimpleStorageOpenLoopController` open-loop control framework, see the following:
 - `examples/01_onshore_steel_mn`
 - `examples/02_texas_ammonia`
 - `examples/12_ammonia_synloop`

docs/technology_models/simple_generic_storage.md

@@ -6,7 +6,7 @@ The Simple Generic Storage model provides a flexible framework for modeling vari
 
 The Simple Generic Storage model consists of two main components:
 
-1. **SimpleGenericStorage**: A minimal component that defines the input interface for the storage system
+1. **StoragePerformanceModel**: A minimal component that defines the input interface for the storage system
 2. **DemandOpenLoopStorageController**: The core logic component that handles storage operations, state of charge calculations, and resource management
 
 This architecture allows the storage system to work with any resource type by simply configuring the resource name and units, making it quite versatile.

docs/user_guide/model_overview.md

@@ -250,16 +250,14 @@ Below summarizes the available performance, cost, and financial models for each
 (storage-models)=
 ## Storage Models
 - `h2_storage`: hydrogen storage
-    - performance models:
-        + `'SimpleGenericStorage'`
     - cost models:
         + `'LinedRockCavernStorageCostModel'`
         + `'SaltCavernStorageCostModel'`
         + `'MCHTOLStorageCostModel'`
         + `'PipeStorageCostModel'`
 - `generic_storage`: any resource storage
     - performance models:
-        + `'SimpleGenericStorage'`
+        + `'StoragePerformanceModel'`
         + `'StorageAutoSizingModel'`
     - cost models:
         + `'GenericStorageCostModel'`
@@ -279,8 +277,8 @@ Below summarizes the available performance, cost, and financial models for each
 
 (control-models)=
 ## Control Models
-- `'PassThroughOpenLoopController'`: open-loop control; directly passes the input resource flow to the output without any modifications
 - Storage Controllers:
+    - `'SimpleStorageOpenLoopController'`: open-loop control; manages resource flow based on demand and input commodity
     - `'DemandOpenLoopStorageController'`: open-loop control; manages resource flow based on demand and storage constraints
     - `'HeuristicLoadFollowingController'`: open-loop control that works on a time window basis to set dispatch commands; uses Pyomo
 - Converter Controllers:

examples/01_onshore_steel_mn/tech_config.yaml

@@ -82,13 +82,14 @@ technologies:
         max_charge_rate: 375740.4  # kW
         max_capacity: 375745.2  # kWh
         n_control_window: 24
-        init_charge_fraction: 0.9
-        max_charge_fraction: 1.0
-        min_charge_fraction: 0.2
+        init_soc_fraction: 0.9
+        max_soc_fraction: 1.0
+        min_soc_fraction: 0.2
         system_commodity_interface_limit: 1e12
       performance_parameters:
         system_model_source: pysam
         chemistry: LFPGraphite
+        demand_profile: 720000  # 720 MW
       cost_parameters:
         cost_year: 2019
         energy_capex: 310  # $/kWh from 2024 ATB year 2025
@@ -119,7 +120,7 @@ technologies:
     performance_model:
       model: StorageAutoSizingModel
     control_strategy:
-      model: PassThroughOpenLoopController
+      model: SimpleStorageOpenLoopController
     cost_model:
       model: LinedRockCavernStorageCostModel
     model_inputs:
@@ -128,8 +129,8 @@ technologies:
         commodity_rate_units: kg/h
         set_demand_as_avg_commodity_in: true
       performance_parameters:
-        min_charge_fraction: 0.0
-        max_charge_fraction: 1.0
+        min_soc_fraction: 0.0
+        max_soc_fraction: 1.0
         charge_efficiency: 1.0
         discharge_efficiency: 1.0
         commodity_amount_units: kg

examples/02_texas_ammonia/tech_config.yaml

@@ -82,13 +82,14 @@ technologies:
         max_charge_rate: 96.0  # kW
         max_capacity: 96.0  # kWh
         n_control_window: 24
-        init_charge_fraction: 0.9
-        max_charge_fraction: 1.0
-        min_charge_fraction: 0.2
+        init_soc_fraction: 0.9
+        max_soc_fraction: 1.0
+        min_soc_fraction: 0.2
         system_commodity_interface_limit: 1e12
       performance_parameters:
         system_model_source: pysam
         chemistry: LFPGraphite
+        demand_profile: 640000  # 640 MW
       cost_parameters:
         cost_year: 2019
         energy_capex: 310  # $/kWh from 2024 ATB year 2025
@@ -119,7 +120,7 @@ technologies:
     performance_model:
       model: StorageAutoSizingModel
     control_strategy:
-      model: PassThroughOpenLoopController
+      model: SimpleStorageOpenLoopController
     cost_model:
       model: SaltCavernStorageCostModel
     model_inputs:
@@ -128,8 +129,8 @@ technologies:
         commodity_rate_units: kg/h
         set_demand_as_avg_commodity_in: true
       performance_parameters:
-        min_charge_fraction: 0.0
-        max_charge_fraction: 1.0
+        min_soc_fraction: 0.0
+        max_soc_fraction: 1.0
         charge_efficiency: 1.0
         discharge_efficiency: 1.0
         commodity_amount_units: kg

examples/03_methanol/co2_hydrogenation_doc/tech_config_co2h.yaml

@@ -74,7 +74,7 @@ technologies:
           replacement_cost_percent: 0.15  # percent of capex - H2A default case
   h2_storage:
     performance_model:
-      model: SimpleGenericStorage
+      model: StoragePerformanceModel
     cost_model:
       model: GenericStorageCostModel
     control_strategy:
@@ -85,9 +85,9 @@ technologies:
         commodity_rate_units: kg/h
         max_charge_rate: 50000.0  # kg/time step
         max_capacity: 103701.401563086  # kg
-        max_charge_fraction: 1.0  # fraction (0-1)
-        min_charge_fraction: 0.1  # fraction (0-1)
-        init_charge_fraction: 0.25  # fraction (0-1)
+        max_soc_fraction: 1.0  # fraction (0-1)
+        min_soc_fraction: 0.1  # fraction (0-1)
+        init_soc_fraction: 0.25  # fraction (0-1)
         max_discharge_rate: 5000.0  # kg/time step
         charge_equals_discharge: false
         charge_efficiency: 1.0  # fraction (0-1)
@@ -129,7 +129,7 @@ technologies:
         infrastructure_type: desal
   co2_storage:
     performance_model:
-      model: SimpleGenericStorage
+      model: StoragePerformanceModel
     cost_model:
       model: GenericStorageCostModel
     control_strategy:
@@ -140,9 +140,9 @@ technologies:
         commodity_rate_units: kg/h
         max_charge_rate: 50000.0  # kg/time step
         max_capacity: 961456.376748904  # kg
-        max_charge_fraction: 1.0  # fraction (0-1)
-        min_charge_fraction: 0.1  # fraction (0-1)
-        init_charge_fraction: 0.25  # fraction (0-1)
+        max_soc_fraction: 1.0  # fraction (0-1)
+        min_soc_fraction: 0.1  # fraction (0-1)
+        init_soc_fraction: 0.25  # fraction (0-1)
         max_discharge_rate: 50000.0  # kg/time step
         charge_efficiency: 1.0  # fraction (0-1)
         discharge_efficiency: 1.0  # fraction (0-1)

examples/09_co2/direct_ocean_capture/tech_config.yaml

@@ -75,13 +75,14 @@ technologies:
         max_charge_rate: 50000  # kW
         max_capacity: 200000  # kWh
         n_control_window: 24
-        init_charge_fraction: 0.9
-        max_charge_fraction: 1.0
-        min_charge_fraction: 0.2
+        init_soc_fraction: 0.9
+        max_soc_fraction: 1.0
+        min_soc_fraction: 0.2
         system_commodity_interface_limit: 1e12
       performance_parameters:
         system_model_source: pysam
         chemistry: LFPGraphite
+        demand_profile: 340000  # 340 MW
       cost_parameters:
         cost_year: 2022
         energy_capex: 246  # $/kWh from 2024 ATB year 2025

examples/09_co2/ocean_alkalinity_enhancement/tech_config.yaml

@@ -51,13 +51,14 @@ technologies:
         max_charge_rate: 50000  # kW
         max_capacity: 200000  # kWh
         n_control_window: 24
-        init_charge_fraction: 0.9
-        max_charge_fraction: 1.0
-        min_charge_fraction: 0.2
+        init_soc_fraction: 0.9
+        max_soc_fraction: 1.0
+        min_soc_fraction: 0.2
         system_commodity_interface_limit: 1e12
       performance_parameters:
         system_model_source: pysam
         chemistry: LFPGraphite
+        demand_profile: 330000  # 330 MW
       cost_parameters:
         cost_year: 2022
         commodity_units: kW