Skip to content

Fix unit conversion #41

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Fix unit conversion #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25445e0
Add units
SabineHaas Dec 6, 2024
6f47a81
Strings cannot be converted
SabineHaas Dec 6, 2024
1557d61
Add units of foreign keys to units dict
SabineHaas Dec 6, 2024
c50b589
Add units
SabineHaas Dec 6, 2024
8ab9d72
Add units
SabineHaas Dec 9, 2024
332a140
Move check above
SabineHaas Dec 9, 2024
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
5 changes: 4 additions & 1 deletion data_adapter/preprocessing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ def get_process(self, process: str) -> Process:
f"Foreign key for process '{process}' points to subject '{foreign_key.process}' "
"which is not unique.",
)
foreign_df = self.__get_df_from_artifact(artifacts[0], foreign_key.process, foreign_key.parameter)[0]
foreign_df, foreign_units = self.__get_df_from_artifact(artifacts[0], foreign_key.process, foreign_key.parameter)
units[fk_column] = foreign_units[getattr(foreign_key, "parameter")]
foreign_df = foreign_df.rename({foreign_key.parameter: fk_column}, axis=1)
if artifacts[0].datatype == collection.DataType.Scalar:
scalar_dfs.append(foreign_df)
Expand Down Expand Up @@ -252,6 +253,8 @@ def convert_series(series: list[float], factor: float) -> list[float]:
continue
if field["name"] not in df.columns:
continue
if isinstance(df[field["name"]].iloc[-1], str):
continue
df_units[field["name"]] = field["unit"]
conversion_factor = None
for unit in self.units:
Expand Down
7 changes: 7 additions & 0 deletions data_adapter/unit_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ def define_energy_model_units():
scaled_unit("ktCO2eq", "tCO2eq", 1e3)
scaled_unit("MtCO2eq", "ktCO2eq", 1e3)
scaled_unit("GtCO2eq", "MtCO2eq", 1e3)
scaled_unit("Mt CO2-eq.", "ktCO2eq", 1e3)
scaled_unit("GtCO2eq", "Mt CO2-eq.", 1e3)

scaled_unit("kEUR", "EUR", 1e3)
scaled_unit("MEUR", "kEUR", 1e3)
Expand All @@ -68,6 +70,7 @@ def define_energy_model_units():

scaled_unit("PJ", "J", 1e15)
scaled_unit("kWh", "PJ", 3.6e-9)
scaled_unit("MWh", "PJ", 3.6e-6)

NamedComposedUnit("Wh", unit("W") * unit("h"))
NamedComposedUnit("kWh", unit("kW") * unit("h"))
Expand Down Expand Up @@ -100,6 +103,7 @@ def define_energy_model_units():
NamedComposedUnit("MWh/MW", unit("MWh") / unit("MW"))
NamedComposedUnit("MWh/t", unit("MWh") / unit("t"))
NamedComposedUnit("MWh/kt", unit("MWh") / unit("kt"))
NamedComposedUnit("MWh/Mt", unit("MWh") / unit("Mt"))
NamedComposedUnit("MWh/k_units", unit("MWh") / unit("k_units"))
NamedComposedUnit("MWh/M_units", unit("MWh") / unit("M_units"))
NamedComposedUnit("MWh/G_units", unit("MWh") / unit("G_units"))
Expand Down Expand Up @@ -166,6 +170,8 @@ def define_energy_model_units():
NamedComposedUnit("M€/Million units", unit("MEUR") / unit("M_units"))
NamedComposedUnit("MEUR/PJ", unit("MEUR") / unit("PJ"))
NamedComposedUnit("M€/PJ", unit("MEUR") / unit("PJ"))
NamedComposedUnit("MEUR/Mt", unit("MEUR") / unit("Mt"))
NamedComposedUnit("M€/Mt", unit("MEUR") / unit("Mt"))

NamedComposedUnit("kWh/100km", unit("kWh") / unit("100km"))
NamedComposedUnit("MWh/100km", unit("MWh") / unit("100km"))
Expand Down Expand Up @@ -205,6 +211,7 @@ def define_energy_model_units():
NamedComposedUnit("Kt/PJ", unit("kt") / unit("PJ"))
NamedComposedUnit("kt/PJ", unit("kt") / unit("PJ"))
NamedComposedUnit("Mt/PJ", unit("Mt") / unit("PJ"))
NamedComposedUnit("Mt/MWh", unit("Mt") / unit("MWh"))

NamedComposedUnit("PJ/Million units", unit("PJ") / unit("M_units"))
NamedComposedUnit("PJ/M_units", unit("PJ") / unit("M_units"))
Expand Down