Merge remote-tracking branch 'origin/hybit' into feature/modeling_on_interest_area

# Conflicts:
#	etrago/appl.py
#	etrago/network.py
#	etrago/tools/utilities.py

Author: NormanZielke

etrago/analyze/calc_results.py

@@ -712,9 +712,6 @@ def run_etrago(args, json_path):
     # adjust network regarding eTraGo setting
     etrago.adjust_network()
 
-    #import pdb
-    #pdb.set_trace()
-
     # ehv network clustering
     etrago.ehv_clustering()
 
@@ -730,31 +727,6 @@ def run_etrago(args, json_path):
 
     print(datetime.datetime.now())
 
-    for comp in etrago.network.iterate_components():
-        for key in comp.pnl:
-            comp.pnl[key].where(
-                comp.pnl[key].abs()>1e-5, other=0., inplace=True)
-    for comp in etrago.network_tsa.iterate_components():
-        for col in comp.df.columns:
-            if comp.df[col].dtype == "float64":
-                comp.df[col].where(
-                    comp.df[col].abs()>1e-5, other=0., inplace=True)
-        for key in comp.pnl:
-            comp.pnl[key].where(
-                comp.pnl[key].abs()>1e-5, other=0., inplace=True)
-    for n in [etrago.network, etrago.network_tsa]:
-        n.mremove("Generator", n.generators[
-            (n.generators.p_nom_extendable == False) &
-            (n.generators.p_nom < 100)].index)
-        import numpy as np
-        n.stores.e_nom_max = np.inf
-        n.links.loc[n.links.carrier == "central_gas_boiler", "p_nom"] = 1e7
-
-        n.links.ramp_limit_up = np.nan
-        n.links.ramp_limit_down = np.nan
-        n.generators.ramp_limit_up = np.nan
-        n.generators.ramp_limit_down = np.nan
-
     # set interest components to extendable and add additional components
 
     etrago.print_capital_costs()

etrago/appl.py

@@ -159,7 +159,7 @@ def find_de_closest(network, bus_ne):
     # resp: Buses that are aggregated only based on the AC bus they are
     # connected to via a link (carriers in map_carrier)
     network2 = network.copy(with_time=False)
-    
+
     if etrago.args["scn_name"] == "eGon100RE":
         map_carrier = {
             "dsm": "dsm",
@@ -174,8 +174,8 @@ def find_de_closest(network, bus_ne):
             "O2": "PtH2_O2",
             "rural_heat": "rural_heat_pump",
         }
-    
-    # network2 contains all busses that will be clustered only based on AC 
+
+    # network2 contains all busses that will be clustered only based on AC
     # connection
     network2.buses = network2.buses[
         network2.buses["carrier"].isin(map_carrier.keys())
@@ -240,11 +240,11 @@ def find_de_closest(network, bus_ne):
             f"""There are {len(no_elec_conex)} buses that have no direct
             connection to the electric network: {no_elec_conex}"""
         )
-        
+
     busmap4 = {}
     if "rural_heat" in map_carrier.keys():
-        # rural_heat_store buses are clustered based on the AC buses connected to
-        # their corresponding rural_heat buses. Results saved in busmap4
+        # rural_heat_store buses are clustered based on the AC buses connected
+        # to their corresponding rural_heat buses. Results saved in busmap4
         links_rural_store = etrago.network.links[
             etrago.network.links.carrier == "rural_heat_store_charger"
         ].copy()
@@ -257,7 +257,8 @@ def find_de_closest(network, bus_ne):
     # Add the buses not related to AC to the busmap and map them to themself
     for no_ac_bus in network.buses[
         ~network.buses["carrier"].isin(
-            np.append(network2.buses.carrier.unique(), "AC"))
+            np.append(network2.buses.carrier.unique(), "AC")
+        )
     ].index:
         busmap2[no_ac_bus] = no_ac_bus
 
@@ -627,6 +628,7 @@ def preprocessing(etrago, apply_on="grid_model"):
                     "sub_network",
                     "s_max_pu",
                     "lifetime",
+                    "s_nom_extendable",
                 ],
             ]
             .assign(

etrago/cluster/electrical.py

@@ -43,7 +43,6 @@
         kmedoids_dijkstra_clustering,
         strategies_buses,
         strategies_generators,
-        strategies_lines,
         strategies_one_ports,
     )
     from etrago.tools.utilities import find_buses_area, set_control_strategies

etrago/cluster/gas.py

@@ -139,7 +139,7 @@ def strategies_one_ports():
             "p_min_pu": "min",
             "p_nom_extendable": ext_storage,
             "p_nom_max": sum_with_inf,
-            "scn_name": "first"
+            "scn_name": "first",
         },
         "Store": {
             "marginal_cost": "mean",
@@ -186,8 +186,8 @@ def strategies_links():
         "efficiency": "mean",
         "p_nom_min": "sum",
         "p_set": "mean",
-        "p_min_pu": "min",
-        "p_max_pu": "max",
+        "p_min_pu": "mean",
+        "p_max_pu": "mean",
         "marginal_cost": "mean",
         "terrain_factor": _make_consense_links,
         "p_nom_opt": "mean",

etrago/cluster/spatial.py

@@ -218,7 +218,6 @@ def run_lopf(etrago, extra_functionality, method):
                 solver_name=etrago.args["solver"],
                 solver_options=etrago.args["solver_options"],
                 extra_functionality=extra_functionality,
-                formulation=etrago.args["model_formulation"],
             )
             if status != "ok":
                 logger.warning(
@@ -429,32 +428,32 @@ def optimize(self):
     """
 
     if self.args["method"]["market_optimization"]["active"]:
-        self.market_optimization()        
-        
-        self.network = self.adjust_PtH2_model(apply_on='grid_model')
+        self.market_optimization()
+
+        self.network = self.adjust_PtH2_model(apply_on="grid_model")
         logger.info("PtH2-Model adjusted in network")
 
-        self.network = self.adjust_chp_model(apply_on='grid_model')
+        self.network = self.adjust_chp_model(apply_on="grid_model")
         logger.info("CHP model in foreign countries adjusted in network")
         # self.market_results_to_grid()
 
         self.grid_optimization()
 
     elif self.args["method"]["type"] == "lopf":
-        
-        self.network = self.adjust_PtH2_model(apply_on='grid_model')
+
+        self.network = self.adjust_PtH2_model(apply_on="grid_model")
         logger.info("PtH2-Model adjusted in network")
 
-        self.network = self.adjust_chp_model(apply_on='grid_model')
+        self.network = self.adjust_chp_model(apply_on="grid_model")
         logger.info("CHP model in foreign countries adjusted in network")
 
         self.lopf()
 
     elif self.args["method"]["type"] == "sclopf":
-        
-        self.network = self.adjust_PtH2_model(apply_on='grid_model')
+
+        self.network = self.adjust_PtH2_model(apply_on="grid_model")
         logger.info("PtH2-Model adjusted in network")
-        
+
         self.sclopf(
             post_lopf=False,
             n_process=4,

etrago/execute/__init__.py

@@ -95,20 +95,21 @@ def grid_optimization(
 
     # Replacevery small values with zero to avoid numerical problems
     self.network.generators_t.p_max_pu.where(
-        self.network.generators_t.p_max_pu.abs() > 1e-7,
+        self.network.generators_t.p_max_pu.abs() > 1e-5,
         other=0.0,
         inplace=True,
     )
     self.network.generators_t.p_min_pu.where(
-        self.network.generators_t.p_min_pu.abs() > 1e-7,
+        self.network.generators_t.p_min_pu.abs() > 1e-5,
         other=0.0,
         inplace=True,
     )
     self.network.links_t.p_max_pu.where(
-        self.network.links_t.p_max_pu.abs() > 1e-7, other=0.0, inplace=True
+        self.network.links_t.p_max_pu.abs() > 1e-5, other=0.0, inplace=True
     )
+
     self.network.links_t.p_min_pu.where(
-        self.network.links_t.p_min_pu > 1e-7, other=0.0, inplace=True
+        self.network.links_t.p_min_pu.abs() > 1e-5, other=0.0, inplace=True
     )
 
     self.network.links.loc[
@@ -164,30 +165,30 @@ def fix_chp_generation(self):
     # model
     self.network.generators_t.p_max_pu.loc[:, gens_fixed] = (
         self.market_model.generators_t.p[gens_fixed].mul(
-            1 / self.market_model.generators.p_nom[gens_fixed]
+            1.01 / self.market_model.generators.p_nom[gens_fixed]
         )
     )
 
     # Set p_min_pu of generators using results from (disaggregated) market
     # model
     self.network.generators_t.p_min_pu.loc[:, gens_fixed] = (
         self.market_model.generators_t.p[gens_fixed].mul(
-            1 / self.market_model.generators.p_nom[gens_fixed]
+            0.99 / self.market_model.generators.p_nom[gens_fixed]
         )
     )
 
     # Fix link dispatch (gas turbines) from market simulation
     # Set p_max_pu of links using results from (disaggregated) market model
     self.network.links_t.p_max_pu.loc[:, links_fixed] = (
         self.market_model.links_t.p0[links_fixed].mul(
-            1 / self.market_model.links.p_nom[links_fixed]
+            1.01 / self.market_model.links.p_nom[links_fixed]
         )
     )
 
     # Set p_min_pu of links using results from (disaggregated) market model
     self.network.links_t.p_min_pu.loc[:, links_fixed] = (
         self.market_model.links_t.p0[links_fixed].mul(
-            1 / self.market_model.links.p_nom[links_fixed]
+            0.99 / self.market_model.links.p_nom[links_fixed]
         )
     )
 
@@ -243,7 +244,7 @@ def add_redispatch_generators(
 
     links_redispatch = self.network.links[
         (
-            self.network.links.carrier.isin(["OCGT"])
+            self.network.links.carrier.isin(["OCGT", "CCGT"])
             & (~self.network.links.index.str.contains("ramp"))
         )
     ].index
@@ -253,6 +254,7 @@ def add_redispatch_generators(
         data=management_cost,
     )
     management_cost_carrier["OCGT"] = management_cost
+    management_cost_carrier["CCGT"] = management_cost
     if fre_mangement_fee:
         management_cost_carrier[
             ["wind_onshore", "wind_offshore", "solar", "solar_rooftop"]
@@ -310,16 +312,16 @@ def add_redispatch_generators(
     # Fix link dispatch (gas turbines) from market simulation
     # Set p_max_pu of links using results from (disaggregated) market model
     self.network.links_t.p_max_pu.loc[:, links_redispatch] = (
-        self.market_model.links_t.p0[links_redispatch].mul(
-            1 / self.market_model.links.p_nom[links_redispatch]
-        )
+        self.market_model.links_t.p0[links_redispatch]
+        .clip(lower=0.0)
+        .mul(1 / self.market_model.links.p_nom[links_redispatch])
     )
 
     # Set p_min_pu of links using results from (disaggregated) market model
     self.network.links_t.p_min_pu.loc[:, links_redispatch] = (
-        self.market_model.links_t.p0[links_redispatch].mul(
-            1 / self.market_model.links.p_nom[links_redispatch]
-        )
+        self.market_model.links_t.p0[links_redispatch]
+        .clip(lower=0.0)
+        .mul(1 / self.market_model.links.p_nom[links_redispatch])
     )
 
     # Calculate costs for redispatch