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

minor code cleaning

Browse Source
This commit is contained in:
Fabian Neumann 2021-07-02 15:08:06 +02:00
parent 89eccd4f70
commit 81b009e062
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/build_clustered_population_layouts.py
View File

@ -5,7 +5,6 @@ import xarray as xr
import pandas as pd import pandas as pd
import atlite import atlite
cutout_path = snakemake.config['atlite']['cutout_dir'] + "/" + snakemake.config['atlite']['cutout_name']+ ".nc"
if __name__ == '__main__': if __name__ == '__main__':
if 'snakemake' not in globals(): if 'snakemake' not in globals():

10
scripts/prepare_sector_network.py
View File

@ -850,12 +850,12 @@ def add_electricity_grid_connection(n, costs):
n.generators.loc[gens, "capital_cost"] += costs.at['electricity grid connection', 'fixed'] n.generators.loc[gens, "capital_cost"] += costs.at['electricity grid connection', 'fixed']
def add_storage(network): def add_storage(n, costs):
print("adding electricity and hydrogen storage") print("adding electricity and hydrogen storage")
nodes = pop_layout.index nodes = pop_layout.index
network.add("Carrier", "H2") n.add("Carrier", "H2")
n.madd("Bus", n.madd("Bus",
nodes + " H2", nodes + " H2",
@ -934,9 +934,9 @@ def add_storage(network):
buses.sort() buses.sort()
name = f"H2 pipeline {buses[0]} -> {buses[1]}" name = f"H2 pipeline {buses[0]} -> {buses[1]}"
if name not in h2_links.index: if name not in h2_links.index:
h2_links.at[name,"bus0"] = buses[0] h2_links.at[name, "bus0"] = buses[0]
h2_links.at[name,"bus1"] = buses[1] h2_links.at[name, "bus1"] = buses[1]
h2_links.at[name,"length"] = candidates.at[candidate,"length"] h2_links.at[name, "length"] = candidates.at[candidate, "length"]
# TODO Add efficiency losses # TODO Add efficiency losses
n.madd("Link", n.madd("Link",