Rename parameter in args to 'spatial_disaggregation'

openego · Oct 30, 2023 · d2b218d · d2b218d
1 parent cd4405f
commit d2b218d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/etrago/appl.py b/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

diff --git a/etrago/args.json b/etrago/args.json
@@ -90,7 +90,7 @@
                 "strategy": "simultaneous"
             },
     },
-    "disaggregation": null,
+    "spatial_disaggregation": null,
     "snapshot_clustering": {
         "active": false,
         "method": "segmentation",

diff --git a/etrago/cluster/disaggregation.py b/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:

diff --git a/etrago/cluster/electrical.py b/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)