Removes constraint "_add_resistive_heater_vollaststunden_constraint_linopy" because it's not needed anymore and remove "update_capital_cost_of_solar_ingolstadt" in utitilities.py

Author: NormanZielke

etrago/appl.py

@@ -779,8 +779,8 @@ def run_etrago(args, json_path):
 
     #etrago.add_biomass_boiler_extendable()
 
-    #etrago.set_battery_parameter_interest_area()
-    etrago.set_battery_and_heat_store_parameters_interest_area()
+    etrago.set_battery_parameter_interest_area()
+    #etrago.set_battery_and_heat_store_parameters_interest_area()
 
     etrago.set_cyclic_constraints()
 

etrago/network.py

@@ -123,7 +123,6 @@
     reset_gas_CHP_capacities,
     add_biogas_CHP_extendable,
     add_biomass_CHP_extendable,
-    update_capital_cost_of_solar_ingolstadt,
     add_biomass_boiler_extendable,
     adjust_capital_costs,
     print_capital_costs,
@@ -417,8 +416,6 @@ def __init__(
 
     add_waste_CHP_ingolstadt = add_waste_CHP_ingolstadt
 
-    update_capital_cost_of_solar_ingolstadt = update_capital_cost_of_solar_ingolstadt
-
     reset_gas_CHP_capacities = reset_gas_CHP_capacities
 
     add_biogas_CHP_extendable = add_biogas_CHP_extendable

etrago/tools/constraints.py

@@ -3847,8 +3847,6 @@ def _add_chp_ratio_constraint_linopy(self, network, snapshots):
     -------
     None
     """
-    import logging
-    logger = logging.getLogger(__name__)
     logger.info("🚀 Start writing CHP ratio constraints for all supported CHP types.")
 
     chp_techs = {
@@ -3906,63 +3904,4 @@ def _add_chp_ratio_constraint_linopy(self, network, snapshots):
                     logger.error(f"❌ Error for {carrier_el}, bus {bus}, snapshot {snapshot}: {e}")
                     continue
 
-    logger.info("✅ Finished writing CHP ratio constraints for all supported CHP types.")
-
-
-def _add_resistive_heater_vollaststunden_constraint_linopy(network, snapshots):
-    """
-    Limits the annual full-load hours of the regional electric boiler (resistive heater)
-    with bus0 = "16" to max. 500 hours.
-
-    Parameters
-    ----------
-    network : pypsa.Network
-        Network container.
-    snapshots : pandas.Index
-        Timesteps to optimize.
-
-    Returns
-    -------
-    None.
-    """
-
-    logger.info("✔️ add_resistive_heater_vollaststunden_constraint constraint activated")
-
-    # Filtere den spezifischen Link am Bus 16
-    heater_links = network.links[
-        (network.links.carrier == "central_resistive_heater")
-        & (network.links.bus0 == "16")
-    ]
-
-    if heater_links.empty:
-        print("Keine passenden Links für den Elektroboiler an Bus 16 gefunden!")
-        return
-
-    # Summe der Nennleistung (p_nom) in MW
-    p_nom_sum = heater_links.p_nom.sum()
-
-    # Dispatch-Summe über alle Zeitschritte in MWh
-    dispatch_sum = 0
-
-    for snapshot in snapshots:
-        # Zeitschrittgewichtung in Stunden
-        timestep_hours = network.snapshot_weightings["objective"].loc[snapshot]
-
-        # Summiere alle Dispatch-Werte dieses Zeitpunkts (MW)
-        dispatch_sum += (
-            get_var(network, "Link", "p").loc[snapshot, heater_links.index].sum()
-            * timestep_hours
-        )
-
-    # Maximal zulässige Energie = Volllaststunden * Nennleistung (MWh)
-    max_energy_mwh = 500 * p_nom_sum
-
-    # Constraint definieren: Gesamterzeugung <= max. zulässige MWh
-    define_constraints(
-        network,
-        dispatch_sum,
-        "<=",
-        max_energy_mwh,
-        "Link",
-        f"vollaststunden_limit_bus16",
-    )
+    logger.info("✅ Finished writing CHP ratio constraints for all supported CHP types.")

etrago/tools/utilities.py

@@ -4675,7 +4675,7 @@ def add_extendable_heat_pumps_to_interest_area(self):
 
     marginal_cost_map = {
         "central_heat_pump": 2.4868
-        # rural_heat_pump bleibt bei vorhandenem Wert
+        # rural_heat_pump remains at existing value
     }
 
     connected_links = find_links_connected_to_interest_buses(self)
@@ -4717,6 +4717,7 @@ def add_extendable_heat_pumps_to_interest_area(self):
         self.network.links.at[new_index, "scn_name"] = "eGon2035"
         print(f"Heat pump {new_index} ({carrier}) duplicated as extendable with time series.")
 
+
 def set_battery_parameter_interest_area(self):
     """
     Set minimum capacity and capital cost for all battery storage units in the interest area.
@@ -4817,7 +4818,7 @@ def set_battery_and_heat_store_parameters_interest_area(self):
 
     # Capital costs per heat-store carrier
     capital_cost_store_values = {
-        "rural_heat_store": 27312.6386,
+        "rural_heat_store": 19118.7469,
         "central_heat_store": 69.0976,
     }
 
@@ -5085,43 +5086,4 @@ def set_cyclic_constraints(self):
     store_mask = self.network.stores.carrier.isin(stores_carrier)
     self.network.stores.loc[store_mask, "e_cyclic"] = True
 
-    print("Cyclic constraints set for battery storage_units and defined store carriers.")
-
-
-def update_capital_cost_of_solar_ingolstadt(self, new_capital_cost):
-    """
-    Update the capital cost of all solar rooftop generators located in the
-    interest area (e.g., Ingolstadt).
-
-    Parameters
-    ----------
-    self : :class:`Etrago`
-        Model instance providing:
-        - ``network`` : pypsa.Network
-            Must contain ``generators`` with columns ``bus``, ``carrier``, ``capital_cost``.
-        - ``find_interest_buses`` : callable
-            Helper to resolve buses in the interest area.
-    new_capital_cost : float
-        New capital cost value [EUR/kW] to assign to all rooftop PV generators
-        in the interest area.
-
-    Returns
-    -------
-    None
-    """
-    buses_ingolstadt = find_interest_buses(self)
-    bus_list = buses_ingolstadt.index.to_list()
-
-    gens = self.network.generators
-    is_solar_in_ingolstadt = (gens.carrier == "solar_rooftop") & (gens.bus.isin(bus_list))
-    solar_generators = gens[is_solar_in_ingolstadt]
-
-    if solar_generators.empty:
-        print("⚠️ Keine passenden Solar-Generatoren in Ingolstadt gefunden.")
-        return
-
-    self.network.generators.loc[solar_generators.index, "capital_cost"] = new_capital_cost
-    print(
-        f"Updated capital_cost to {new_capital_cost:.2f} €/kW "
-        f"for {len(solar_generators)} solar_rooftop generator(s) in the interest area."
-    )
+    print("Cyclic constraints set for battery storage_units and defined store carriers.")

requirements.txt

@@ -0,0 +1,82 @@
+backports.tarfile==1.2.0
+blosc2==2.7.1
+Bottleneck==1.4.2
+certifi==2025.1.31
+cffi==1.17.1
+cftime==1.6.4.post1
+charset-normalizer==3.4.1
+click==8.1.8
+cloudpickle==3.1.1
+contourpy==1.3.2
+cryptography==44.0.2
+cycler==0.12.1
+dask==2025.3.0
+deprecation==2.1.0
+-e git+ssh://[email protected]/openego/eTraGo.git@1dfba2dac87c227cb7debfb0541036e486e9f8bc#egg=eTraGo
+fonttools==4.57.0
+fsspec==2025.3.2
+GeoAlchemy2==0.6.3
+geopandas==1.0.1
+greenlet==3.2.0
+gurobipy==10.0.0
+highspy==1.10.0
+idna==3.10
+importlib_metadata==8.6.1
+jaraco.classes==3.4.0
+jaraco.context==6.0.1
+jaraco.functools==4.1.0
+jeepney==0.9.0
+joblib==1.4.2
+keyring==25.6.0
+kiwisolver==1.4.8
+linopy==0.3.2
+locket==1.0.0
+loguru==0.7.3
+matplotlib==3.10.1
+more-itertools==10.6.0
+msgpack==1.1.0
+ndindex==1.9.2
+netCDF4==1.7.2
+networkx==3.4.2
+numexpr==2.10.2
+numpy==1.26.4
+oedialect==0.1.1
+packaging==24.2
+pandas==2.1.4
+partd==1.4.2
+pillow==11.2.1
+pkg_resources==0.0.0
+ply==3.11
+polars==1.27.1
+psycopg2-binary==2.9.10
+py-cpuinfo==9.0.0
+pycparser==2.22
+pyogrio==0.10.0
+Pyomo==6.5.0
+pyparsing==3.2.3
+pyproj==3.7.1
+pypsa==0.26.2
+python-dateutil==2.9.0.post0
+pytz==2025.2
+PyYAML==6.0.2
+requests==2.32.3
+rtree==1.4.0
+saio==0.2.1
+scikit-learn==1.6.1
+scipy==1.15.2
+SecretStorage==3.3.3
+shapely==2.1.0
+six==1.17.0
+SQLAlchemy==1.4.54
+tables==3.10.1
+threadpoolctl==3.6.0
+tilemapbase==0.4.5
+toolz==1.0.0
+tqdm==4.67.1
+tsam==2.3.6
+typing_extensions==4.13.2
+tzdata==2025.2
+urllib3==2.4.0
+validators==0.34.0
+xarray==2023.11.0
+zipp==3.21.0