Merge pull request #690 from openego/features/#684-clarify-disaggrega…

…tion-names

Features/#684 clarify disaggregation names

etrago/appl.py

@@ -139,7 +139,7 @@
             },
         },
     },
-    "disaggregation": None,  # None or 'uniform'
+    "spatial_disaggregation": None,  # None or 'uniform'
     # Temporal Complexity:
     "snapshot_clustering": {
         "active": False,  # choose if clustering is activated
@@ -691,14 +691,14 @@ def run_etrago(args, json_path):
     etrago.lopf()
 
     # conduct lopf with full complex timeseries for dispatch disaggregation
-    etrago.dispatch_disaggregation()
+    etrago.temporal_disaggregation()
 
     # start power flow based on lopf results
     etrago.pf_post_lopf()
 
     # spatial disaggregation
     # needs to be adjusted for new sectors
-    etrago.disaggregation()
+    etrago.spatial_disaggregation()
 
     # calculate central etrago results
     etrago.calc_results()

etrago/args.json

@@ -90,7 +90,7 @@
                 "strategy": "simultaneous"
             },
     },
-    "disaggregation": null,
+    "spatial_disaggregation": null,
     "snapshot_clustering": {
         "active": false,
         "method": "segmentation",

etrago/cluster/disaggregation.py

@@ -827,7 +827,7 @@ def update_constraints(network, externals):
 def run_disaggregation(self):
     log.debug("Running disaggregation.")
     if self.args["network_clustering"]["active"]:
-        disagg = self.args.get("disaggregation")
+        disagg = self.args.get("spatial_disaggregation")
         skip = () if self.args["pf_post_lopf"]["active"] else ("q",)
         t = time.time()
         if disagg:

etrago/cluster/electrical.py

@@ -1018,7 +1018,7 @@ def run_spatial_clustering(self):
     None
     """
     if self.args["network_clustering"]["active"]:
-        if self.args["disaggregation"] is not None:
+        if self.args["spatial_disaggregation"] is not None:
             self.disaggregated_network = self.network.copy()
         else:
             self.disaggregated_network = self.network.copy(with_time=False)

etrago/tools/execute.py

@@ -515,19 +515,21 @@ def dispatch_disaggregation(self):
         logger.info("Time for LOPF [min]: {}".format(round(z, 2)))
 
 
-def import_gen_from_links(network):
+def import_gen_from_links(network, drop_small_capacities=True):
     """
     create gas generators from links in order to not lose them when
     dropping non-electric carriers
     """
-    # Discard all generators < 1kW
-    discard_gen = network.links[network.links["p_nom"] <= 0.001].index
-    network.links.drop(discard_gen, inplace=True)
-    for df in network.links_t:
-        if not network.links_t[df].empty:
-            network.links_t[df].drop(
-                columns=discard_gen.values, inplace=True, errors="ignore"
-            )
+
+    if drop_small_capacities:
+        # Discard all generators < 1kW
+        discard_gen = network.links[network.links["p_nom"] <= 0.001].index
+        network.links.drop(discard_gen, inplace=True)
+        for df in network.links_t:
+            if not network.links_t[df].empty:
+                network.links_t[df].drop(
+                    columns=discard_gen.values, inplace=True, errors="ignore"
+                )
 
     gas_to_add = network.links[
         network.links.carrier.isin(
@@ -769,8 +771,10 @@ def drop_foreign_components(network):
     # generators modeled as links are imported to the generators table
     import_gen_from_links(network)
 
-    if args["disaggregation"]:
-        import_gen_from_links(etrago.disaggregated_network)
+    if args["spatial_disaggregation"]:
+        import_gen_from_links(
+            etrago.disaggregated_network, drop_small_capacities=False
+        )
 
     # For the PF, set the P to be the optimised P
     network.generators_t.p_set = network.generators_t.p_set.reindex(
@@ -873,7 +877,7 @@ def drop_foreign_components(network):
         etrago.export_to_csv(path)
         pf_solve.to_csv(os.path.join(path, "pf_solution.csv"), index=True)
 
-        if args["disaggregation"]:
+        if args["spatial_disaggregation"]:
             etrago.disaggregated_network.export_to_csv_folder(
                 path + "/disaggregated_network"
             )

etrago/tools/network.py

@@ -255,11 +255,11 @@ def __init__(
 
     lopf = lopf
 
-    dispatch_disaggregation = dispatch_disaggregation
+    temporal_disaggregation = dispatch_disaggregation
 
     pf_post_lopf = run_pf_post_lopf
 
-    disaggregation = run_disaggregation
+    spatial_disaggregation = run_disaggregation
 
     calc_results = calc_etrago_results