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>

Author: elenya-grant

CHANGELOG.md

@@ -21,6 +21,7 @@
   - 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`
+- Bugfix in `StoragePerformanceModel` and `PySAMBatteryPerformanceModel` for setting control inputs to account for cases with multiple storage technologies with different control strategy types [PR 615](https://github.com/NatLabRockies/H2Integrate/pull/615)
 - Bugfix input energy to OAE financial model [PR 617](https://github.com/NatLabRockies/H2Integrate/pull/617)
   - Remove `MarineCarbonCapture` base classes
 

h2integrate/control/control_strategies/heuristic_pyomo_controller.py

@@ -108,11 +108,6 @@ def setup(self):
         self.max_discharge_fraction = [0.0] * self.config.n_control_window
         self._fixed_dispatch = [0.0] * self.config.n_control_window
 
-        if self.config.charge_efficiency is not None:
-            self.charge_efficiency = self.config.charge_efficiency
-        if self.config.discharge_efficiency is not None:
-            self.discharge_efficiency = self.config.discharge_efficiency
-
     def pyomo_setup(self, discrete_inputs):
         """Create the Pyomo model, attach per-tech Blocks, and return dispatch solver.
 
@@ -248,6 +243,11 @@ def pyomo_dispatch_solver(
     def initialize_parameters(self, inputs):
         """Initializes parameters."""
 
+        if self.config.charge_efficiency is not None:
+            self.charge_efficiency = self.config.charge_efficiency
+        if self.config.discharge_efficiency is not None:
+            self.discharge_efficiency = self.config.discharge_efficiency
+
         self.minimum_storage = 0.0
         self.maximum_storage = inputs["storage_capacity"][0]
         self.minimum_soc = self.config.min_soc_fraction

h2integrate/control/control_strategies/storage/simple_openloop_controller.py

@@ -67,6 +67,7 @@ def setup(self):
         self.config = SimpleStorageOpenLoopControllerConfig.from_dict(
             merge_shared_inputs(self.options["tech_config"]["model_inputs"], "control"),
             additional_cls_name=self.__class__.__name__,
+            strict=False,
         )
 
         self.n_timesteps = self.options["plant_config"]["plant"]["simulation"]["n_timesteps"]

h2integrate/control/test/test_heuristic_with_generic_storage.py

@@ -23,6 +23,7 @@ def plant_config():
             },
         },
         "tech_to_dispatch_connections": [
+            ["combiner", "h2_storage"],
             ["h2_storage", "h2_storage"],
         ],
     }
@@ -47,12 +48,12 @@ def tech_config_generic():
                         "min_soc_fraction": 0.1,
                         "commodity": "hydrogen",
                         "commodity_rate_units": "kg/h",
+                        "charge_efficiency": 1.0,
+                        "discharge_efficiency": 1.0,
                     },
                     "performance_parameters": {
                         "charge_equals_discharge": True,
                         "commodity_amount_units": "kg",
-                        "charge_efficiency": 1.0,
-                        "discharge_efficiency": 1.0,
                         "demand_profile": 0.0,
                     },
                     "control_parameters": {