diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index 0936db79..0f3f351f 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -469,6 +469,9 @@ if __name__ == "__main__": n = pypsa.Network(snakemake.input.network) + # remove integer outputs for compatibility with PyPSA v0.26.0 + n.generators.drop("n_mod", axis=1, inplace=True, errors='ignore') + exclude_carriers = params.cluster_network["exclude_carriers"] aggregate_carriers = set(n.generators.carrier) - set(exclude_carriers) conventional_carriers = set(params.conventional_carriers) diff --git a/scripts/simplify_network.py b/scripts/simplify_network.py index 251f4bd8..d12062c2 100644 --- a/scripts/simplify_network.py +++ b/scripts/simplify_network.py @@ -536,6 +536,9 @@ if __name__ == "__main__": n = pypsa.Network(snakemake.input.network) Nyears = n.snapshot_weightings.objective.sum() / 8760 + # remove integer outputs for compatibility with PyPSA v0.26.0 + n.generators.drop("n_mod", axis=1, inplace=True, errors='ignore') + n, trafo_map = simplify_network_to_380(n) technology_costs = load_costs(