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

Merge branch 'master' of github.com:PyPSA/pypsa-eur-sec

Browse Source
This commit is contained in:
Tom Brown 2021-05-21 12:38:28 +02:00
commit 5952f7a8c7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Snakefile
View File

@ -179,7 +179,7 @@ rule build_industrial_production_per_country:
input:
ammonia_production="resources/ammonia_production.csv"
output:
industrial_production_per_country="resources/industrial_production_per_country.csv"
industrial_production_per_country="resources/industrial_production_per_country.csv"
threads: 1
resources: mem_mb=1000
script: 'scripts/build_industrial_production_per_country.py'
@ -282,7 +282,7 @@ rule build_retro_cost:
input:
building_stock="data/retro/data_building_stock.csv",
data_tabula="data/retro/tabula-calculator-calcsetbuilding.csv",
air_temperature = "resources/temp_air_total_{network}_s{simpl}_{clusters}.nc",
air_temperature = "resources/temp_air_total_elec_s{simpl}_{clusters}.nc",
u_values_PL="data/retro/u_values_poland.csv",
tax_w="data/retro/electricity_taxes_eu.csv",
construction_index="data/retro/comparative_level_investment.csv",

2
scripts/build_retro_cost.py
View File

@ -841,7 +841,7 @@ if __name__ == "__main__":
building_stock="data/retro/data_building_stock.csv",
data_tabula="data/retro/tabula-calculator-calcsetbuilding.csv",
u_values_PL="data/retro/u_values_poland.csv",
air_temperature = "resources/temp_air_total_{network}_s{simpl}_{clusters}.nc",
air_temperature = "resources/temp_air_total_elec_s{simpl}_{clusters}.nc",
tax_w="data/retro/electricity_taxes_eu.csv",
construction_index="data/retro/comparative_level_investment.csv",
floor_area_missing="data/retro/floor_area_missing.csv",

2
scripts/prepare_sector_network.py
View File

@ -1915,7 +1915,7 @@ if __name__ == "__main__":
retro_cost_energy = "resources/retro_cost_elec_s{simpl}_{clusters}.csv",
floor_area = "resources/floor_area_elec_s{simpl}_{clusters}.csv"
),
output=['results/version-cb48be3/prenetworks/{network}_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc']
output=['results/version-cb48be3/prenetworks/elec_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc']
)
import yaml
with open('config.yaml', encoding='utf8') as f: