Fix_after_comment

resources/powerplants.csv

@@ -1,2 +1,2 @@
 ,Name,Fueltype,Technology,Set,Country,Capacity,Efficiency,Duration,Volume_Mm3,DamHeight_m,StorageCapacity_MWh,DateIn,DateRetrofit,DateOut,lat,lon,EIC,projectID,bus
-1,New_Diesel_Generator,Diesel,,PP,SL,0.0,,0.0,0.0,0.0,0.0,1986,1986.0,2031,-21.1667,27.5167,{nan},{'GPD': {'WRI1023018'}},bus_9
+1,New_Diesel_Generator,Diesel,,PP,SL,0.0,,0.0,0.0,0.0,0.0,1986,1986.0,2031,-21.1667,27.5167,{nan},{'GPD': {'WRI1023018'}},microgrid_1_gen_bus

scripts/add_electricity.py

@@ -259,9 +259,9 @@ def attach_conventional_generators(
     extendable_carriers,
     conventional_config,
     conventional_inputs,
-    number_microgrids,
 ):
     carriers = set(conventional_carriers) | set(extendable_carriers["Generator"])
+
     _add_missing_carriers_from_costs(n, costs, carriers)
 
     ppl = (
@@ -270,38 +270,42 @@ def attach_conventional_generators(
         .rename(index=lambda s: "C" + str(s))
     )
     ppl["efficiency"] = ppl.efficiency.fillna(ppl.efficiency)
-    microgrid_ids = [f"microgrid_{i+1}" for i in range(len(number_microgrids))]
-    for microgrid in microgrid_ids:
-        ppl.index = ppl.index + "_" + microgrid  # TODO: review this
-        ppl["bus"] = microgrid + "_gen_bus"
-        n.madd(
-            "Generator",
-            ppl.index,
-            carrier=ppl.carrier,
-            bus=ppl.bus,
-            p_nom_min=ppl.p_nom.where(ppl.carrier.isin(conventional_carriers), 0),
-            p_nom=ppl.p_nom.where(ppl.carrier.isin(conventional_carriers), 0),
-            p_nom_extendable=ppl.carrier.isin(extendable_carriers["Generator"]),
-            efficiency=ppl.efficiency,
-            marginal_cost=ppl.marginal_cost,
-            capital_cost=ppl.capital_cost,
-            build_year=ppl.datein.fillna(0).astype(pd.Int64Dtype()),
-            lifetime=(ppl.dateout - ppl.datein).fillna(np.inf),
-        )
+
+    buses_i = n.buses.index
+
+    n.madd(
+        "Generator",
+        ppl.index,
+        carrier=ppl.carrier,
+        bus=ppl.bus,
+        p_nom_min=ppl.p_nom.where(ppl.carrier.isin(conventional_carriers), 0),
+        p_nom=ppl.p_nom.where(ppl.carrier.isin(conventional_carriers), 0),
+        p_nom_extendable=ppl.carrier.isin(extendable_carriers["Generator"])
+        | (ppl.carrier == "diesel"),
+        efficiency=ppl.efficiency,
+        marginal_cost=ppl.marginal_cost,
+        capital_cost=ppl.capital_cost,
+        build_year=ppl.datein.fillna(0).astype(int),
+        lifetime=(ppl.dateout - ppl.datein).fillna(np.inf),
+    )
 
     for carrier in conventional_config:
+        # Generatori con tecnologia influenzata
         idx = n.generators.query("carrier == @carrier").index
 
         for attr in list(set(conventional_config[carrier]) & set(n.generators)):
             values = conventional_config[carrier][attr]
 
             if f"conventional_{carrier}_{attr}" in conventional_inputs:
+                # Values affecting generators of technology k country-specific
+                # First map generator buses to countries; then map countries to p_max_pu
                 values = pd.read_csv(values, index_col=0).iloc[:, 0]
                 bus_values = n.buses.country.map(values)
                 n.generators[attr].update(
                     n.generators.loc[idx].bus.map(bus_values).dropna()
                 )
             else:
+                # Single value affecting all k technology generators regardless of country.
                 n.generators.loc[idx, attr] = values
 
 
@@ -396,7 +400,6 @@ def attach_load(n, load_file, tech_modelling):
         snakemake.config["electricity"]["extendable_carriers"],
         snakemake.config.get("conventional", {}),
         conventional_inputs,
-        snakemake.config["microgrids_list"],
     )
 
     attach_storageunits(

scripts/create_network.py

@@ -291,15 +291,5 @@ def create_microgrid_network(
         microgrids_list,
         snakemake.input["load"],
     )
-    # calculate_power_node_position(
-    # snakemake.input["load"],
-    # snakemake.input["clusters"]
-    # )
-    # add_bus_at_center(n,
-    #                   snakemake.config["microgrids_list"],
-    #                   snakemake.config["electricity"]["voltage"],
-    #                   snakemake.config["electricity"]["line_type"])
-
-    # plot_microgrid_network(n)
     a = 12
     n.export_to_netcdf(snakemake.output[0])