Fix storage-related bugs

Author: darrylmelander

Diff for: prescient/data/simulation_state/mutable_simulation_state.py

@@ -194,7 +194,7 @@ def apply_ruc(self, options, ruc:RucModel) -> None:
                 max_ruc_length = ruc_delay + options.ruc_horizon
                 self._commits[g] = deque(maxlen=max_ruc_length)
             for s,s_dict in ruc.elements('storage'):
-                self._init_state_of_charge[s] = s_dict['initial_state_of_charge']
+                self._init_soc[s] = s_dict['initial_state_of_charge']
 
             # If this is first RUC, also save data to indicate when to pop RUC-related state 
             self._minutes_per_forecast_step = ruc.data['system']['time_period_length_minutes']

Diff for: prescient/engine/data_extractors.py

@@ -487,7 +487,7 @@ def get_all_storage_soc_dispatch_levels(self, sced: OperationsModel) -> Dict[S,
                 for s in self.get_all_storage(sced)}
 
     def get_all_storage_types(self, sced: OperationsModel) -> Dict[S, float]:
-        return {s: self.get_storage_soc_dispatch_level(sced, s)
+        return {s: self.get_storage_type(sced, s)
                 for s in self.get_all_storage(sced)}
 
 

Diff for: prescient/engine/egret/data_extractors.py

@@ -340,20 +340,20 @@ def get_bus_mismatch(sced: OperationsModel, bus: B) -> float:
 
     @staticmethod
     def get_storage_input_dispatch_level(sced: OperationsModel, storage: S) -> float:
-        return sced.data['elements']['storage'][s]['p_charge']['values'][0]
+        return sced.data['elements']['storage'][storage]['p_charge']['values'][0]
 
     @staticmethod
     def get_storage_output_dispatch_level(sced: OperationsModel, storage: S) -> float:
-        return sced.data['elements']['storage'][s]['p_discharge']['values'][0]
+        return sced.data['elements']['storage'][storage]['p_discharge']['values'][0]
 
     @staticmethod
     def get_storage_soc_dispatch_level(sced: OperationsModel, storage: S) -> float:
-        return sced.data['elements']['storage'][s]['state_of_charge']['values'][0]
+        return sced.data['elements']['storage'][storage]['state_of_charge']['values'][0]
 
     @staticmethod
     def get_storage_type(sced: OperationsModel, storage: S) -> str:
-        if 'fuel' in sced.data['elements']['storage'][s]:
-            return sced.data['elements']['storage'][s]['fuel']
+        if 'fuel' in sced.data['elements']['storage'][storage]:
+            return sced.data['elements']['storage'][storage]['fuel']
         return 'Other'
 
     @staticmethod