NatLabRockies · johnjasa · Feb 13, 2026 · Jan 20, 2026 · Jan 20, 2026 · Jan 20, 2026
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Added linearized hydrogen fuel cell model
 - Added load following optimization dispatch
+- Added simple dispatch calculations to `StorageAutoSizingModel`
 
 ## 0.6 [February 10, 2026]
 

diff --git a/examples/01_onshore_steel_mn/tech_config.yaml b/examples/01_onshore_steel_mn/tech_config.yaml
@@ -67,8 +67,8 @@ technologies:
         commodity: "electricity"
         commodity_units: "kW"
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
 
   battery:
     dispatch_rule_set:
@@ -81,8 +81,8 @@ technologies:
       model: "ATBBatteryCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 375740.4 #kW
         max_capacity: 375745.2 #kWh
         n_control_window: 24
@@ -96,7 +96,6 @@ technologies:
         chemistry: "LFPGraphite"
       cost_parameters:
         cost_year: 2019
-        commodity_units: "kW"
         energy_capex: 310 # $/kWh from 2024 ATB year 2025
         power_capex: 311 # $/kW from 2024 ATB year 2025
         opex_fraction: 0.024999840573439444
@@ -134,8 +133,8 @@ technologies:
       model: "LinedRockCavernStorageCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "hydrogen"
-        commodity_units: "kg/h"
+        commodity: "hydrogen"
+        commodity_rate_units: "kg/h"
       cost_parameters:
         # since the storage is being auto-sized by the performance model,
         # we set the sizing mode to 'auto' rather than defining the capacities

diff --git a/examples/02_texas_ammonia/tech_config.yaml b/examples/02_texas_ammonia/tech_config.yaml
@@ -66,8 +66,8 @@ technologies:
         commodity: "electricity"
         commodity_units: "kW"
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
   battery:
     dispatch_rule_set:
       model: "PyomoRuleStorageBaseclass"
@@ -79,8 +79,8 @@ technologies:
       model: "ATBBatteryCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 96.0 #kW
         max_capacity: 96.0 #kWh
         n_control_window: 24
@@ -94,7 +94,6 @@ technologies:
         chemistry: "LFPGraphite"
       cost_parameters:
         cost_year: 2019
-        commodity_units: "kW"
         energy_capex: 310 # $/kWh from 2024 ATB year 2025
         power_capex: 311 # $/kW from 2024 ATB year 2025
         opex_fraction: 0.025
@@ -133,8 +132,8 @@ technologies:
       model: "SaltCavernStorageCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "hydrogen"
-        commodity_units: "kg/h"
+        commodity: "hydrogen"
+        commodity_rate_units: "kg/h"
       cost_parameters:
         # since the storage is being auto-sized by the performance model,
         # we set the sizing mode to 'auto' rather than defining the capacities

diff --git a/examples/03_methanol/co2_hydrogenation_doc/tech_config_co2h.yaml b/examples/03_methanol/co2_hydrogenation_doc/tech_config_co2h.yaml
@@ -82,8 +82,8 @@ technologies:
       model: "DemandOpenLoopStorageController"
     model_inputs:
       shared_parameters:
-        commodity_name: "hydrogen"
-        commodity_units: "kg/h"
+        commodity: "hydrogen"
+        commodity_rate_units: "kg/h"
         max_charge_rate: 50000.0  # kg/time step
         max_capacity: 103701.401563086  # kg
       control_parameters:
@@ -135,8 +135,8 @@ technologies:
       model: "DemandOpenLoopStorageController"
     model_inputs:
       shared_parameters:
-        commodity_name: "co2"
-        commodity_units: "kg/h"
+        commodity: "co2"
+        commodity_rate_units: "kg/h"
         max_charge_rate: 50000.0  # kg/time step
         max_capacity: 961456.376748904  # kg
       control_parameters:

diff --git a/examples/09_co2/direct_ocean_capture/tech_config.yaml b/examples/09_co2/direct_ocean_capture/tech_config.yaml
@@ -17,8 +17,8 @@ technologies:
         enable_caching: True
         hopp_config: !include tech_inputs/hopp_config.yaml
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
   wind:
     performance_model:
       model: "FlorisWindPlantPerformanceModel"
@@ -59,8 +59,8 @@ technologies:
         commodity: "electricity"
         commodity_units: "kW"
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
   battery:
     dispatch_rule_set:
       model: "PyomoRuleStorageBaseclass"
@@ -72,8 +72,8 @@ technologies:
       model: "ATBBatteryCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 50000 #kW
         max_capacity: 200000 #kWh
         n_control_window: 24
@@ -87,7 +87,6 @@ technologies:
         chemistry: "LFPGraphite"
       cost_parameters:
         cost_year: 2022
-        commodity_units: "kW"
         energy_capex: 246 # $/kWh from 2024 ATB year 2025
         power_capex: 317 # $/kW from 2024 ATB year 2025
         opex_fraction: 0.02536510376633359

diff --git a/examples/09_co2/ocean_alkalinity_enhancement/tech_config.yaml b/examples/09_co2/ocean_alkalinity_enhancement/tech_config.yaml
@@ -34,8 +34,8 @@ technologies:
         opex_per_kW_per_year: 72
         cost_year: 2022
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
 
 
   battery:
@@ -49,8 +49,8 @@ technologies:
       model: "ATBBatteryCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 50000 #kW
         max_capacity: 200000 #kWh
         n_control_window: 24

diff --git a/examples/12_ammonia_synloop/tech_config.yaml b/examples/12_ammonia_synloop/tech_config.yaml
@@ -66,8 +66,8 @@ technologies:
         commodity: "electricity"
         commodity_units: "kW"
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
   battery:
     dispatch_rule_set:
       model: "PyomoRuleStorageBaseclass"
@@ -79,8 +79,8 @@ technologies:
       model: "ATBBatteryCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 96.0 #kW
         max_capacity: 96.0 #kWh
         n_control_window: 24
@@ -94,7 +94,6 @@ technologies:
         chemistry: "LFPGraphite"
       cost_parameters:
         cost_year: 2019
-        commodity_units: "kW"
         energy_capex: 310 # $/kWh from 2024 ATB year 2025
         power_capex: 311 # $/kW from 2024 ATB year 2025
         opex_fraction: 0.025
@@ -133,8 +132,8 @@ technologies:
       model: "SaltCavernStorageCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "hydrogen"
-        commodity_units: "kg/h"
+        commodity: "hydrogen"
+        commodity_rate_units: "kg/h"
       cost_parameters:
         # since the storage is being auto-sized by the performance model,
         # we set the sizing mode to 'auto' rather than defining the capacities

diff --git a/examples/14_wind_hydrogen_dispatch/inputs/tech_config.yaml b/examples/14_wind_hydrogen_dispatch/inputs/tech_config.yaml
@@ -60,8 +60,8 @@ technologies:
       model: "DemandOpenLoopStorageController"
     model_inputs:
       shared_parameters:
-        commodity_name: "hydrogen"
-        commodity_units: "kg/h"
+        commodity: "hydrogen"
+        commodity_rate_units: "kg/h"
         max_charge_rate: 12446.00729773  # kg/time step
         max_capacity: 2987042.0  # kg
       control_parameters:
@@ -71,4 +71,4 @@ technologies:
         max_discharge_rate: 12446.00729773  # kg/time step
         charge_efficiency: 1.0 # percent as decimal
         discharge_efficiency: 1.0 # percent as decimal
-        demand_profile: 5000 # constant demand of 5000 kg per hour (see commodity_units)
+        demand_profile: 5000 # constant demand of 5000 kg per hour (see commodity_rate_units)
diff --git a/examples/16_natural_gas/tech_config.yaml b/examples/16_natural_gas/tech_config.yaml
@@ -39,8 +39,8 @@ technologies:
       model: "DemandOpenLoopStorageController"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 25000.0  # kW/time step, 25 MW
         max_capacity: 200000.0  # kWh, 200 MWh
       control_parameters:

diff --git a/examples/18_pyomo_heuristic_dispatch/tech_config.yaml b/examples/18_pyomo_heuristic_dispatch/tech_config.yaml
@@ -32,8 +32,8 @@ technologies:
         opex_per_kW_per_year: 45
         cost_year: 2019
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
   battery:
     dispatch_rule_set:
       model: "PyomoRuleStorageBaseclass"
@@ -45,8 +45,8 @@ technologies:
       model: "ATBBatteryCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 100000
         max_capacity: 500000
         n_control_window: 24
@@ -60,7 +60,6 @@ technologies:
         chemistry: "LFPGraphite"
       cost_parameters:
         cost_year: 2022
-        commodity_units: "kW"
         energy_capex: 310 # $/kWh from 2024 ATB year 2025
         power_capex: 311 # $/kW from 2024 ATB year 2025
         opex_fraction: 0.25 # 0.25% of capex per year from 2024 ATB

diff --git a/examples/18_pyomo_heuristic_dispatch/tech_config_error_for_testing.yaml b/examples/18_pyomo_heuristic_dispatch/tech_config_error_for_testing.yaml
@@ -35,8 +35,8 @@ technologies:
         opex_per_kW_per_year: 45
         cost_year: 2019
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
   battery:
     dispatch_rule_set:
       model: "PyomoRuleStorageBaseclass"
@@ -48,8 +48,8 @@ technologies:
       model: "ATBBatteryCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 100000
         max_capacity: 500000
         n_control_window: 24

diff --git a/examples/19_simple_dispatch/tech_config.yaml b/examples/19_simple_dispatch/tech_config.yaml
@@ -38,8 +38,8 @@ technologies:
       model: "DemandOpenLoopStorageController"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 5000.0  # kW
         max_capacity: 30000.0  # kWh
       control_parameters:

diff --git a/examples/23_solar_wind_ng_demand/flexible_demand_tech_config.yaml b/examples/23_solar_wind_ng_demand/flexible_demand_tech_config.yaml
@@ -99,8 +99,8 @@ technologies:
         model: FlexibleDemandOpenLoopConverterController
       model_inputs:
         control_parameters:
-          commodity_name: electricity
-          commodity_units: kW
+          commodity: electricity
+          commodity_rate_units: kW
           rated_demand: 100000
           demand_profile: 100000 #100 MW
           turndown_ratio: 0.5

diff --git a/examples/23_solar_wind_ng_demand/plant_config.yaml b/examples/23_solar_wind_ng_demand/plant_config.yaml
@@ -5,19 +5,6 @@ sites:
   site:
     latitude: 30.6617
     longitude: -101.7096
-    year: 2013
-
-    # array of polygons defining boundaries with x/y coords
-    boundaries: [
-      {
-        x: [0.0, 1000.0, 1000.0, 0.0],
-        y: [0.0, 0.0, 100.0, 1000.0],
-      },
-      {
-        x: [2000.0, 2500.0, 2000.0],
-        y: [2000.0, 2000.0, 2500.0],
-      }
-    ]
 
     resources:
       wind_resource:

diff --git a/examples/23_solar_wind_ng_demand/tech_config.yaml b/examples/23_solar_wind_ng_demand/tech_config.yaml
@@ -99,8 +99,8 @@ technologies:
         model: DemandOpenLoopConverterController
       model_inputs:
         control_parameters:
-          commodity_name: electricity
-          commodity_units: kW
+          commodity: electricity
+          commodity_rate_units: kW
           demand_profile: 100000 #100 MW
 
   combiner:

diff --git a/examples/24_solar_battery_grid/tech_config.yaml b/examples/24_solar_battery_grid/tech_config.yaml
@@ -39,8 +39,8 @@ technologies:
       model: "DemandOpenLoopStorageController"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
-        commodity_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
         max_charge_rate: 25000.0  # kW/time step, 25 MW
         max_capacity: 200000.0  # kWh, 200 MWh
       control_parameters:

diff --git a/examples/27_pyomo_optimized_dispatch/tech_config.yaml b/examples/27_pyomo_optimized_dispatch/tech_config.yaml
@@ -36,8 +36,8 @@ technologies:
         opex_per_kW_per_year: 45
         cost_year: 2019
       dispatch_rule_parameters:
-        commodity_name: "electricity"
-        commodity_storage_units: "kW"
+        commodity: "electricity"
+        commodity_rate_units: "kW"
   battery:
     dispatch_rule_set:
       model: "PyomoRuleStorageBaseclass"
@@ -49,7 +49,7 @@ technologies:
       model: "ATBBatteryCostModel"
     model_inputs:
       shared_parameters:
-        commodity_name: "electricity"
+        commodity: "electricity"
         max_charge_rate: 100000
         max_capacity: 400000
         init_charge_percent: 0.5 # Initial SOC for the storage
@@ -58,15 +58,14 @@ technologies:
         system_commodity_interface_limit: 1e12
         charge_efficiency: 0.95 # Charge efficiency of the storage technology
         discharge_efficiency: 0.95 # Discharge efficiency of the storage technology
-        commodity_storage_units: "kW"
+        commodity_rate_units: "kW"
         # rated_demand: 100000 # in kW
 
       performance_parameters:
         system_model_source: "pysam"
         chemistry: "LFPGraphite"
       cost_parameters:
         cost_year: 2022
-        commodity_units: "kW"
         energy_capex: 310 # $/kWh from 2024 ATB year 2025
         power_capex: 311 # $/kW from 2024 ATB year 2025
         opex_fraction: 0.25 # 0.25% of capex per year from 2024 ATB