Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/round lifetime to next lower integer #82

Merged
merged 4 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions data_adapter_oemof/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import warnings
from typing import Optional, Type, Union

import numpy as np
import pandas as pd
from oemof.tabular import facades
from oemof.tabular._facade import Facade
Expand Down Expand Up @@ -72,6 +73,16 @@ def get_default_parameters(self) -> dict:
)
}
)
if "lifetime" in defaults.keys():
# want to move this section including if statements together with decommissioning
# section to a calculations as "default calculations
if not isinstance(defaults["lifetime"], collections.abc.Iterable):
defaults["lifetime"] = int(np.floor(defaults["lifetime"]))
elif all(x == defaults["lifetime"][0] for x in defaults["lifetime"]):
defaults["lifetime"] = int(np.floor(defaults["lifetime"][0]))
else:
warnings.warn("Lifetime cannot change in Multi-period modeling")
defaults["lifetime"] = int(np.floor(defaults["lifetime"][0]))

return defaults

Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type;carrier;tech;profile;lifetime;fixed_costs;name;region;year;bus
volatile;solar;photovoltaic_utility;photovoltaic_BB;[25.4, 30.0, 30.0];[10280.0, 8600.0, 6340.0];BB_solar_photovoltaic_utility;BB;[2016, 2030, 2050];electricity
volatile;solar;photovoltaic_utility;photovoltaic_BB;25;[10280.0, 8600.0, 6340.0];BB_solar_photovoltaic_utility;BB;[2016, 2030, 2050];electricity
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
type;carrier;tech;profile;lifetime;fixed_costs;name;region;year;bus
volatile;wind;wind_turbine_onshore;onshore_BB;[25.4, 30.0, 30.0];[23280.0, 12600.0, 11340.0];BB_wind_wind_turbine_onshore;BB;[2016, 2030, 2050];electricity
volatile;wind;wind_turbine_onshore;onshore_BB;25;[23280.0, 12600.0, 11340.0];BB_wind_wind_turbine_onshore;BB;[2016, 2030, 2050];electricity
359 changes: 0 additions & 359 deletions tests/_files/build_datapackage_goal/datapackage..json

This file was deleted.

Loading
Loading