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

replace vresutils annuity function with add_electricity.py calculate_annuity

Browse Source
This commit is contained in:
virio-andreyana 2023-05-10 10:02:41 +02:00 committed by GitHub
parent 5c2e3c9fc1
commit e91068196b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/prepare_sector_network.py
View File

@ -28,7 +28,7 @@ from networkx.algorithms.connectivity.edge_augmentation import k_edge_augmentati
from pypsa.geo import haversine_pts from pypsa.geo import haversine_pts
from pypsa.io import import_components_from_dataframe from pypsa.io import import_components_from_dataframe
from scipy.stats import beta from scipy.stats import beta
from vresutils.costdata import annuity from add_electricity import calculate_annuity
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -742,7 +742,7 @@ def prepare_costs(cost_file, config, nyears):
costs = costs.fillna(config["fill_values"]) costs = costs.fillna(config["fill_values"])
def annuity_factor(v): def annuity_factor(v):
return annuity(v["lifetime"], v["discount rate"]) + v["FOM"] / 100 return calculate_annuity(v["lifetime"], v["discount rate"]) + v["FOM"] / 100
costs["fixed"] = [ costs["fixed"] = [
annuity_factor(v) * v["investment"] * nyears for i, v in costs.iterrows() annuity_factor(v) * v["investment"] * nyears for i, v in costs.iterrows()
@ -851,7 +851,7 @@ def add_wave(n, wave_cost_factor):
capacity = pd.Series({"Attenuator": 750, "F2HB": 1000, "MultiPA": 600}) capacity = pd.Series({"Attenuator": 750, "F2HB": 1000, "MultiPA": 600})
# in EUR/MW # in EUR/MW
annuity_factor = annuity(25, 0.07) + 0.03 annuity_factor = calculate_annuity(25, 0.07) + 0.03
costs = ( costs = (
1e6 1e6
* wave_cost_factor * wave_cost_factor