diff --git a/scripts/_helpers.py b/scripts/_helpers.py index 410e05af..766fb421 100644 --- a/scripts/_helpers.py +++ b/scripts/_helpers.py @@ -240,7 +240,7 @@ def mock_snakemake(rulename, **wildcards): if os.path.exists(p): snakefile = p break - workflow = sm.Workflow(snakefile, overwrite_configfiles=[]) + workflow = sm.Workflow(snakefile, overwrite_configfiles=[], rerun_triggers=[]) workflow.include(snakefile) workflow.global_resources = {} rule = workflow.get_rule(rulename) diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index a3ce5c52..5166f37a 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -281,9 +281,17 @@ def clustering_for_n_clusters(n, n_clusters, custom_busmap=False, aggregate_carr aggregate_generators_carriers=aggregate_carriers, aggregate_one_ports=["Load", "StorageUnit"], line_length_factor=line_length_factor, - generator_strategies={'p_nom_max': p_nom_max_strategy, 'p_nom_min': pd.Series.sum, - 'build_year': lambda x: 0, 'lifetime': lambda x: np.inf, - 'efficiency': np.mean}, + generator_strategies={'p_nom_max': p_nom_max_strategy, + 'p_nom_min': pd.Series.sum, + 'p_min_pu': pd.Series.mean, + 'marginal_cost': pd.Series.mean, + 'committable': np.any, + 'ramp_limit_up': pd.Series.max, + 'ramp_limit_down': pd.Series.max, + 'build_year': lambda x: 0, + 'lifetime': lambda x: np.inf, + 'efficiency': np.mean, + }, scale_link_capital_costs=False) if not n.links.empty: