bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into eu-energy-security

Browse Source
This commit is contained in:
Fabian Hofmann 2022-06-21 14:12:43 +02:00 committed by GitHub
commit 6fb3520fc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/_helpers.py
View File

@ -240,7 +240,7 @@ def mock_snakemake(rulename, **wildcards):
if os.path.exists(p): if os.path.exists(p):
snakefile = p snakefile = p
break break
workflow = sm.Workflow(snakefile, overwrite_configfiles=[]) workflow = sm.Workflow(snakefile, overwrite_configfiles=[], rerun_triggers=[])
workflow.include(snakefile) workflow.include(snakefile)
workflow.global_resources = {} workflow.global_resources = {}
rule = workflow.get_rule(rulename) rule = workflow.get_rule(rulename)

14
scripts/cluster_network.py
View File

@ -281,9 +281,17 @@ def clustering_for_n_clusters(n, n_clusters, custom_busmap=False, aggregate_carr
aggregate_generators_carriers=aggregate_carriers, aggregate_generators_carriers=aggregate_carriers,
aggregate_one_ports=["Load", "StorageUnit"], aggregate_one_ports=["Load", "StorageUnit"],
line_length_factor=line_length_factor, line_length_factor=line_length_factor,
generator_strategies={'p_nom_max': p_nom_max_strategy, 'p_nom_min': pd.Series.sum, generator_strategies={'p_nom_max': p_nom_max_strategy,
'build_year': lambda x: 0, 'lifetime': lambda x: np.inf, 'p_nom_min': pd.Series.sum,
'efficiency': np.mean}, '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) scale_link_capital_costs=False)
if not n.links.empty: if not n.links.empty: