Direct transformation ok - errors in fo

Author: AlessandroPampado99

pypsa2smspp/transformation.py

@@ -501,6 +501,7 @@ def _preprocess_network_for_iteration(self, n):
         if self.capacity_expansion_ucblock:
             apply_expansion_overrides(
                 self.config.IntermittentUnitBlock_parameters,
+                self.config.BatteryUnitBlock_parameters,
                 self.config.BatteryUnitBlock_store_parameters,
                 self.config.IntermittentUnitBlock_inverse,
                 self.config.BatteryUnitBlock_inverse,

pypsa2smspp/transformation_config.py

@@ -66,15 +66,15 @@ def reset(self):
             "MinPower": lambda p_nom, p_min_pu, p_nom_extendable: (p_nom * p_min_pu).where(~p_nom_extendable, p_min_pu),
             # "DeltaRampUp": np.nan,
             # "DeltaRampDown": np.nan,
-            "ExtractingBatteryRho": lambda efficiency_dispatch, snapshot_weighting: snapshot_weighting / efficiency_dispatch,
-            "StoringBatteryRho": lambda efficiency_store, snapshot_weighting: efficiency_store / snapshot_weighting,
+            "ExtractingBatteryRho": lambda efficiency_dispatch, snapshots_weighting: snapshots_weighting.iloc[0] / efficiency_dispatch.iloc[0],
+            "StoringBatteryRho": lambda efficiency_store, snapshots_weighting: snapshots_weighting.iloc[0] * efficiency_store.iloc[0],
             "Demand": 0.0,
             "MinStorage": 0.0,
-            "MaxStorage": lambda p_nom, p_max_pu, max_hours: p_nom * p_max_pu * max_hours,
+            "MaxStorage": lambda p_nom, p_max_pu, p_nom_extendable, max_hours: (p_nom * p_max_pu * max_hours).where(~p_nom_extendable, p_max_pu),
             "MaxPrimaryPower": 0.0,
             "MaxSecondaryPower": 0.0,
             # "InitialPower": lambda p: p[0][0],
-            "InitialStorage": lambda cyclic_state_of_charge: -1 if cyclic_state_of_charge.values else 0,
+            "InitialStorage": lambda cyclic_state_of_charge, state_of_charge_initial, p_nom: -1 if cyclic_state_of_charge.values else state_of_charge_initial * p_nom,
             "Cost": lambda marginal_cost: abs(marginal_cost),
             # "BatteryInvestmentCost": lambda capital_cost: capital_cost,
             # "ConverterInvestmentCost": 0.0,

pypsa2smspp/utils.py

@@ -1316,7 +1316,7 @@ def add_sectorcoupled_parameters(
 
 
 # Sempre nella classe Transformation
-def apply_expansion_overrides(IntermittentUnitBlock_parameters=None, BatteryUnitBlock_store_parameters=None, IntermittentUnitBlock_inverse=None, BatteryUnitBlock_inverse=None, InvestmentBlock=None):
+def apply_expansion_overrides(IntermittentUnitBlock_parameters=None, BatteryUnitBlock_parameters=None, BatteryUnitBlock_store_parameters=None, IntermittentUnitBlock_inverse=None, BatteryUnitBlock_inverse=None, InvestmentBlock=None):
     """
     Inject missing keys for UC expansion to be solved inside UCBlock instead of a separate InvestmentBlock.
     Keys are only added if missing, so it remains idempotent.
@@ -1348,6 +1348,57 @@ def _min_cap_design(p_nom, p_nom_extendable, p_nom_min):
                     if bool(first_scalar(p_nom_extendable))
                     else first_scalar(p_nom))
         d["MinCapacityDesign"] = _min_cap_design
+        
+    # --- BatteryUnitBlock ---
+    b = BatteryUnitBlock_parameters
+
+    # "BatteryInvestmentCost"
+    if "BatteryInvestmentCost" not in b:
+        b["BatteryInvestmentCost"] = lambda capital_cost, p_nom_extendable: capital_cost if bool(first_scalar(p_nom_extendable)) else 0.0
+
+    # "ConverterInvestmentCost"
+    if "ConverterInvestmentCost" not in b:
+        b["ConverterInvestmentCost"] = lambda p_nom_extendable: 1e-12 if bool(first_scalar(p_nom_extendable)) else 0.0
+
+    # "BatteryMaxCapacityDesign"
+    if "BatteryMaxCapacityDesign" not in b:
+        def _battery_max_cap_design(p_nom, p_nom_extendable, p_nom_max):
+            p_nom_max_safe = p_nom_max.replace(np.inf, 1e9)
+            return (first_scalar(p_nom_max_safe)
+                    if bool(first_scalar(p_nom_extendable))
+                    else first_scalar(p_nom))
+        b["BatteryMaxCapacityDesign"] = _battery_max_cap_design
+        
+    # "BatteryMinCapacityDesign"
+    if "BatteryMinCapacityDesign" not in b:
+        def _battery_min_cap_design(p_nom, p_nom_extendable, p_nom_min):
+            p_nom_min_safe = p_nom_min
+            return (first_scalar(p_nom_min_safe)
+                    if bool(first_scalar(p_nom_extendable))
+                    else first_scalar(p_nom))
+        b["BatteryMinCapacityDesign"] = _battery_min_cap_design
+
+    # "ConverterMaxCapacityDesign"
+    if "ConverterMaxCapacityDesign" not in b:
+        def _conv_max_cap_design(p_nom, p_nom_extendable, p_nom_max):
+            p_nom_max_safe = p_nom_max.replace(np.inf, 1e9)
+            # Your rule of thumb: 10x battery energy cap when extendable, else p_nom
+            return (10.0 * first_scalar(p_nom_max_safe)
+                    if bool(first_scalar(p_nom_extendable))
+                    else first_scalar(p_nom))
+        b["ConverterMaxCapacityDesign"] = _conv_max_cap_design
+        
+    
+    # "ConverterMinCapacityDesign"
+    if "ConverterMinCapacityDesign" not in b:
+        def _conv_min_cap_design(p_nom, p_nom_extendable, p_nom_min):
+            p_nom_min_safe = p_nom_min.replace(np.inf, 1e9)
+            # Your rule of thumb: 10x battery energy cap when extendable, else p_nom
+            return (10.0 * first_scalar(p_nom_min_safe)
+                    if bool(first_scalar(p_nom_extendable))
+                    else first_scalar(p_nom))
+        b["ConverterMinCapacityDesign"] = _conv_min_cap_design
+
 
     # --- BatteryUnitBlock_store ---
     b = BatteryUnitBlock_store_parameters

test/configs/application.ini

@@ -7,7 +7,7 @@ input_data_path = data
 input_name_PV = ninja_pv_1.7250_33.6208_uncorrected.csv
 input_name_wind = ninja_wind_1.7250_33.6208_uncorrected.csv
 input_name_demand = demand_data.csv
-input_name_components = test/2n_1c_1gext_1bext_2lext.xlsx
+input_name_components = test/1n_1c_1g_1h.xlsx
 input_name_costs = costs.xlsx
 input_name_parameters = parameters_smspp.xlsx
 
@@ -17,7 +17,7 @@ input_path_smspp = ./pypsa2smspp.nc4
 
 
 [OPTIMIZATION]
-weight = 1
+weight = 365
 n_snapshots = 24
 
 

test/main_pypsaeur_stochastic.py

@@ -52,10 +52,10 @@
 # User settings
 # =============================================================================
 
-NETWORK_PATH = "/home/pampado/stochastic/pypsa-eur/results/eth_results/stochastic_network/networks/base_s_stoch_adm___2050.nc"
-# NETWORK_PATH = r"C:\Users\aless\sms\transformation_pypsa_smspp\test\networks\base_s_stoch_adm___2050.nc"
+# NETWORK_PATH = "/home/pampado/stochastic/pypsa-eur/results/eth_results/stochastic_network/networks/base_s_stoch_adm___2050.nc"
+NETWORK_PATH = r"C:\Users\aless\sms\transformation_pypsa_smspp\test\networks\pypsa_network_stochUC.nc"
 
-NAME = "stochastic_reduced"
+NAME = "stochastic_edf"
 FOLDER = "develop/tssb_loaded"
 
 WORKDIR = OUT / FOLDER
@@ -64,20 +64,20 @@
 CONFIG_FP = "application_stochastic.ini"
 SMSPP_CONFIGFILE = "TSSBlock/TSSBSCfg_grb.txt"
 
-RUN_PYPSA_REFERENCE = False
+RUN_PYPSA_REFERENCE = True
 EXPORT_PYPSA_LP = True
 EXPORT_NETCDF = True
 
 ADD_SLACK = True
 
-DO_REDUCE_SNAPSHOTS = True
+DO_REDUCE_SNAPSHOTS = False
 REDUCE_SNAPSHOTS_TO = 1000
 
 # If None, the script infers stochastic parameters from the network.
 # Otherwise use, for example:
 # STOCHASTIC_PARAMETERS_OVERRIDE = ["demand"]
 # STOCHASTIC_PARAMETERS_OVERRIDE = ["demand", "renewables"]
-STOCHASTIC_PARAMETERS_OVERRIDE = ["demand"]
+STOCHASTIC_PARAMETERS_OVERRIDE = ["demand", "renewable_maxpower"]
 
 SOLVER_NAME = "gurobi"
 SOLVER_OPTIONS = {