minor fix for peakshaving opex results per period

TUMFTM · Jan 31, 2025 · 536f60a · 536f60a
1 parent 4c7381f
commit 536f60a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/revoletion/blocks.py b/revoletion/blocks.py
@@ -1055,10 +1055,11 @@ def print_results(self):
 
         if self.peakshaving:
             for interval in self.peakshaving_ints.index:
-                if self.peakshaving_ints.loc[interval, 'start'] <= self.dti_sim[-1]:
+                if self.peakshaving_ints.loc[interval, 'start'] <= self.scenario.dti_sim[-1]:
                     self.scenario.logger.info(f'Optimized peak power in component "{self.name}" for interval'
-                                     f' {interval}: {self.peakshaving_ints.loc[interval, "power"] / 1e3:.1f} kW'
-                                     f' - OPEX: {self.opex_spec_peak * self.peakshaving_ints.loc[interval, ["period_fraction", "power"]].prod():.2f} {self.currency}')
+                                              f' {interval}: {self.peakshaving_ints.loc[interval, "power"] / 1e3:.1f} kW'
+                                              f' - OPEX: {self.peakshaving_ints.loc[interval, "opex"]:.2f}'
+                                              f' {self.scenario.currency}')
 
     def set_init_size(self, size_names):
         self.equal = True if self.invest_g2s == 'equal' or self.invest_s2g == 'equal' else False

diff --git a/revoletion/simulation.py b/revoletion/simulation.py
@@ -636,7 +636,7 @@ def write_dataframes(name, block):
                         self.result_summary.loc[(name, f'power_opex_spec_{interval}'), self.name] = (
                             float(block.peakshaving_ints.loc[interval, 'opex_spec']))
                         self.result_summary.loc[(name, f'power_opex_{interval}'), self.name] = (
-                            block.peakshaving_ints.loc[interval, ['period_fraction', 'power', 'opex_spec']].prod())
+                            block_obj.peakshaving_ints.loc[interval, 'opex'])
 
         result_types = (int, float, str, bool, type(None))
         result_blocks = {'run': self.run, 'scenario': self}