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:
Fabian Neumann 2023-02-11 09:37:17 +01:00
commit 9be7afffcd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.default.yaml
View File

@ -339,7 +339,7 @@ industry:
costs: costs:
year: 2030 year: 2030
version: v0.4.0 version: v0.5.0
lifetime: 25 #default lifetime lifetime: 25 #default lifetime
# From a Lion Hirth paper, also reflects average of Noothout et al 2016 # From a Lion Hirth paper, also reflects average of Noothout et al 2016
discountrate: 0.07 discountrate: 0.07

2
scripts/prepare_sector_network.py
View File

@ -997,7 +997,7 @@ def add_storage_and_grids(n, costs):
) )
# hydrogen stored overground (where not already underground) # hydrogen stored overground (where not already underground)
h2_capital_cost = costs.at["hydrogen storage tank incl. compressor", "fixed"] h2_capital_cost = costs.at["hydrogen storage tank type 1 including compressor", "fixed"]
nodes_overground = h2_caverns.index.symmetric_difference(nodes) nodes_overground = h2_caverns.index.symmetric_difference(nodes)
n.madd("Store", n.madd("Store",

2
test/config.myopic.yaml
View File

@ -320,7 +320,7 @@ industry:
costs: costs:
year: 2030 year: 2030
version: v0.4.0 version: v0.5.0
lifetime: 25 #default lifetime lifetime: 25 #default lifetime
# From a Lion Hirth paper, also reflects average of Noothout et al 2016 # From a Lion Hirth paper, also reflects average of Noothout et al 2016
discountrate: 0.07 discountrate: 0.07

2
test/config.overnight.yaml
View File

@ -318,7 +318,7 @@ industry:
costs: costs:
year: 2030 year: 2030
version: v0.4.0 version: v0.5.0
lifetime: 25 #default lifetime lifetime: 25 #default lifetime
# From a Lion Hirth paper, also reflects average of Noothout et al 2016 # From a Lion Hirth paper, also reflects average of Noothout et al 2016
discountrate: 0.07 discountrate: 0.07