update args

etrago/appl.py

@@ -109,18 +109,17 @@
     "extra_functionality": {},  # Choose function name or {}
     # Spatial Complexity:
     "delete_dispensable_ac_buses": True,  # bool. Find and delete expendable buses
+    "interest_area": False,  # False, path to shapefile or list of nuts names of the area that is excluded from the clustering
     "network_clustering_ehv": {
-        "active": False,  # choose if clustering of HV buses to EHV buses is activated
+        "active": True,  # choose if clustering of HV buses to EHV buses is activated
         "busmap": False,  # False or path to stored busmap
-        "interest_area": False,  # False, path to shapefile or list of nuts names of not cluster area
     },
     "network_clustering": {
         "active": True,  # choose if clustering is activated
         "method": "kmedoids-dijkstra",  # choose clustering method: kmeans or kmedoids-dijkstra
         "n_clusters_AC": 30,  # total number of resulting AC nodes (DE+foreign)
         "cluster_foreign_AC": False,  # take foreign AC buses into account, True or False
-        "interest_area": False,  # False, path to shapefile or list of nuts names of not cluster area
-        "cluster_interest_area": 30, # False or number of buses.
+        "cluster_interest_area": False, # False or number of buses.
         "method_gas": "kmedoids-dijkstra",  # choose clustering method: kmeans or kmedoids-dijkstra
         "n_clusters_gas": 14,  # total number of resulting CH4 nodes (DE+foreign)
         "cluster_foreign_gas": False,  # take foreign CH4 buses into account, True or False
@@ -398,6 +397,14 @@ def run_etrago(args, json_path):
         connected lines are merged. This reduces the spatial complexity without
         losing any accuracy.
         Default: True.
+
+    interest_area: False, list, string
+        Area of especial interest that will be not clustered. It is by
+        default set to false. When an interest_area is provided, the given
+        value for n_clusters_AC will mean the total of AC buses outside the
+        area.The area can be provided in two ways: list of
+        nuts names e.G. ["Cuxhaven", "Bremerhaven", "Bremen"] or a string
+        with a path to a shape file (.shp).
         
     network_clustering_ehv : dict
         Choose if you want to apply an extra high voltage clustering to the
@@ -414,13 +421,6 @@ def run_etrago(args, json_path):
         a new busmap must be calculated. False or path to the busmap in csv
         format should be given.
         Default: False
-        * "interest_area": False, list, string
-        Area of especial interest that will be not clustered. It is by
-        default set to false. When an interest_area is provided, the given
-        value for n_clusters_AC will mean the total of AC buses outside the
-        area.The area can be provided in two ways: list of
-        nuts names e.G. ["Cuxhaven", "Bremerhaven", "Bremen"] or a string
-        with a path to a shape file (.shp).
 
     network_clustering : dict
         Choose if you want to apply a clustering of all network buses and
@@ -462,8 +462,9 @@ def run_etrago(args, json_path):
             with a path to a shape file (.shp).
             Default: False.
         * "cluster_interest_area": False, int
-            Number of buses to cluster all the electrical buses in the
-            exclusion area. Method provided in the arg "method" is used.
+            Number of buses to cluster all the electrical buses in the area
+            of interest. Method provided in the arg "method" is used. If
+            it is set to False, the area of interest is not clustered.
             Default: False.
         * "method_gas" : str
             Method used for gas clustering. You can choose between two
@@ -710,7 +711,7 @@ def run_etrago(args, json_path):
 
     # snapshot clustering
     etrago.snapshot_clustering()
-    breakpoint()
+
     # skip snapshots
     etrago.skip_snapshots()