Run world (#885)

Finalize the workflow to work with all UN countries

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ exclude: ^(LICENSES)
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.5.0
   hooks:
   - id: check-merge-conflict
   - id: end-of-file-fixer
@@ -58,7 +58,7 @@ repos:
 
 # Do YAML formatting (before the linter checks it for misses)
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.10.0
+  rev: v2.11.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix, --indent, '2', --preserve-quotes]
@@ -72,7 +72,7 @@ repos:
 
 # Format Snakemake rule / workflow files
 - repo: https://github.com/snakemake/snakefmt
-  rev: v0.8.4
+  rev: v0.8.5
   hooks:
   - id: snakefmt
 

Snakefile

@@ -53,7 +53,7 @@ ATLITE_NPROCESSES = config["atlite"].get("nprocesses", 4)
 
 wildcard_constraints:
     simpl="[a-zA-Z0-9]*|all",
-    clusters="[0-9]+m?|all",
+    clusters="[0-9]+(m|flex|min)?|all",
     ll="(v|c)([0-9\.]+|opt|all)|all",
     opts="[-+a-zA-Z0-9\.]*",
     unc="[-+a-zA-Z0-9\.]*",

configs/osm_config.yaml

@@ -93,7 +93,7 @@ world_iso:
     MR: "mauritania"
     MU: "mauritius"
     MZ: "mozambique"
-    NA: "namibia"
+    "NA": "namibia"
     NE: "niger"
     NG: "nigeria"
     RW: "rwanda"
@@ -219,7 +219,7 @@ world_iso:
     MC: "monaco"
     ME: "montenegro"
     NL: "netherlands"
-    NO: "norway"
+    "NO": "norway"
     PL: "poland"
     PT: "portugal"
     RO: "romania"

scripts/add_electricity.py

@@ -220,14 +220,20 @@ def load_powerplants(ppl_fn):
         "ccgt, thermal": "CCGT",
         "hard coal": "coal",
     }
-    return (
+    ppl = (
         read_csv_nafix(ppl_fn, index_col=0, dtype={"bus": "str"})
         .powerplant.to_pypsa_names()
         .powerplant.convert_country_to_alpha2()
         .rename(columns=str.lower)
         .drop(columns=["efficiency"])
         .replace({"carrier": carrier_dict})
     )
+    # drop powerplants with null capacity
+    null_ppls = ppl[ppl.p_nom <= 0]
+    if not null_ppls.empty:
+        logger.warning(f"Drop powerplants with null capacity: {list(null_ppls.name)}.")
+        ppl = ppl.drop(null_ppls.index).reset_index(drop=True)
+    return ppl
 
 
 def attach_load(n, demand_profiles):