Skip to content

Commit

Permalink
Black reformating
Browse files Browse the repository at this point in the history
  • Loading branch information
@romainsacchi
romainsacchi committed Jul 11, 2024
1 parent 0da2621 commit 44d1c05
Show file tree
Hide file tree
Showing 5 changed files with 294 additions and 212 deletions.
28 changes: 14 additions & 14 deletions premise/data_collection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from .geomap import Geomap
from .marginal_mixes import consequential_method


IAM_ELEC_VARS = VARIABLES_DIR / "electricity_variables.yaml"
IAM_FUELS_VARS = VARIABLES_DIR / "fuels_variables.yaml"
IAM_BIOMASS_VARS = VARIABLES_DIR / "biomass_variables.yaml"
Expand Down Expand Up @@ -216,6 +215,7 @@ def get_gains_EU_data() -> xr.DataArray:

return array


def fix_efficiencies(data: xr.DataArray, min_year: int) -> xr.DataArray:
"""
Fix the efficiency data to ensure plausibility.
Expand Down Expand Up @@ -377,19 +377,19 @@ def __init__(
other_vars = self.__get_iam_variable_labels(
IAM_OTHER_VARS, variable="iam_aliases"
)

roadfreight_prod_vars = self.__get_iam_variable_labels(
IAM_TRANS_ROADFREIGHT_VARS, variable="iam_aliases"
)

roadfreight_energy_vars = self.__get_iam_variable_labels(
IAM_TRANS_ROADFREIGHT_VARS, variable="energy_use_aliases"
)

railfreight_prod_vars = self.__get_iam_variable_labels(
IAM_TRANS_RAILFREIGHT_VARS, variable="iam_aliases"
)

railfreight_energy_vars = self.__get_iam_variable_labels(
IAM_TRANS_RAILFREIGHT_VARS, variable="energy_use_aliases"
)
Expand Down Expand Up @@ -463,7 +463,7 @@ def __init__(
fuel_prod_vars if "liquid fossil fuels" in fuel_prod_vars else None
),
)

self.data = data

self.regions = data.region.values.tolist()
Expand Down Expand Up @@ -613,39 +613,39 @@ def __init__(
normalize=False,
system_model="cutoff",
)

self.roadfreight_markets = self.__fetch_market_data(
data=data,
input_vars=roadfreight_prod_vars,
system_model="cutoff", # TODO: check how to handle this for consequencial
system_model="cutoff", # TODO: check how to handle this for consequencial
sector="transport",
)

self.railfreight_markets = self.__fetch_market_data(
data=data,
input_vars=railfreight_prod_vars,
system_model="cutoff", # TODO: check how to handle this for consequencial
system_model="cutoff", # TODO: check how to handle this for consequencial
sector="transport",
)

self.passenger_car_markets = self.__fetch_market_data(
data=data,
input_vars=passenger_cars_prod_vars,
system_model="cutoff", # TODO: check how to handle this for consequencial
system_model="cutoff", # TODO: check how to handle this for consequencial
sector="transport",
)

self.bus_markets = self.__fetch_market_data(
data=data,
input_vars=bus_prod_vars,
system_model="cutoff", # TODO: check how to handle this for consequencial
system_model="cutoff", # TODO: check how to handle this for consequencial
sector="transport",
)

self.two_wheelers_markets = self.__fetch_market_data(
data=data,
input_vars=two_wheelers_prod_vars,
system_model="cutoff", # TODO: check how to handle this for consequencial
system_model="cutoff", # TODO: check how to handle this for consequencial
sector="transport",
)

Expand Down Expand Up @@ -761,13 +761,13 @@ def __init__(
production_labels=dac_prod_vars,
energy_labels=dac_electricity_vars,
)

self.roadfreight_efficiencies = self.get_iam_efficiencies(
data=data,
production_labels=roadfreight_prod_vars,
energy_labels=roadfreight_energy_vars,
)

self.railfreight_efficiencies = self.get_iam_efficiencies(
data=data,
production_labels=railfreight_prod_vars,
Expand Down
32 changes: 24 additions & 8 deletions premise/report.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,16 +188,24 @@ def fetch_data(
else None
),
"Transport (two-wheelers)": (
iam_data.production_volumes if hasattr(iam_data, "two_wheelers_markets") else None
iam_data.production_volumes
if hasattr(iam_data, "two_wheelers_markets")
else None
),
"Transport (two-wheelers) - eff": (
iam_data.two_wheelers_efficiencies if hasattr(iam_data, "two_wheelers_efficiencies") else None
iam_data.two_wheelers_efficiencies
if hasattr(iam_data, "two_wheelers_efficiencies")
else None
),
"Transport (cars)": (
iam_data.production_volumes if hasattr(iam_data, "passenger_car_markets") else None
iam_data.production_volumes
if hasattr(iam_data, "passenger_car_markets")
else None
),
"Transport (cars) - eff": (
iam_data.passenger_car_efficiencies if hasattr(iam_data, "passenger_car_efficiencies") else None
iam_data.passenger_car_efficiencies
if hasattr(iam_data, "passenger_car_efficiencies")
else None
),
"Transport (buses)": (
iam_data.production_volumes if hasattr(iam_data, "bus_markets") else None
Expand All @@ -206,16 +214,24 @@ def fetch_data(
iam_data.bus_efficiencies if hasattr(iam_data, "bus_efficiencies") else None
),
"Transport (trucks)": (
iam_data.production_volumes if hasattr(iam_data, "roadfreight_markets") else None
iam_data.production_volumes
if hasattr(iam_data, "roadfreight_markets")
else None
),
"Transport (trucks) - eff": (
iam_data.roadfreight_efficiencies if hasattr(iam_data, "roadfreight_efficiencies") else None
iam_data.roadfreight_efficiencies
if hasattr(iam_data, "roadfreight_efficiencies")
else None
),
"Transport (trains)": (
iam_data.production_volumes if hasattr(iam_data, "railfreight_markets") else None
iam_data.production_volumes
if hasattr(iam_data, "railfreight_markets")
else None
),
"Transport (trains) - eff": (
iam_data.railfreight_efficiencies if hasattr(iam_data, "railfreight_efficiencies") else None
iam_data.railfreight_efficiencies
if hasattr(iam_data, "railfreight_efficiencies")
else None
),
}

Expand Down
49 changes: 28 additions & 21 deletions premise/transport.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
import yaml
from wurst import searching as ws

from .activity_maps import InventorySet
from .filesystem_constants import DATA_DIR, IAM_OUTPUT_DIR
from .logger import create_logger
from .transformation import BaseTransformation, IAMDataCollection
from .utils import eidb_label, rescale_exchanges
from .activity_maps import InventorySet
from .validation import CarValidation, TruckValidation
from .logger import create_logger

logger = create_logger("transport")

Expand Down Expand Up @@ -162,15 +162,10 @@ def create_fleet_vehicles(

for region in regions:
if year in arr.coords["year"].values:
region_size_fleet = arr.sel(
region=region,
year=year
)
region_size_fleet = arr.sel(region=region, year=year)

else:
region_size_fleet = arr.sel(region=region).interp(
year=year
)
region_size_fleet = arr.sel(region=region).interp(year=year)

total_km = region_size_fleet.sum()

Expand Down Expand Up @@ -247,7 +242,9 @@ def create_fleet_vehicles(
sizes = ["3.5t", "7.5t", "18t", "26t", "40t"]
for size in sizes:
total_size_km = region_size_fleet.sel(
variables=[v for v in arr.coords["variables"].values if size in v]
variables=[
v for v in arr.coords["variables"].values if size in v
]
).sum()

if total_size_km > 0:
Expand Down Expand Up @@ -279,7 +276,9 @@ def create_fleet_vehicles(
"comment": f"Fleet-average vehicle for the year {year}, for the region {region}.",
}

for pwt in [v for v in arr.coords["variables"].values if size in v]:
for pwt in [
v for v in arr.coords["variables"].values if size in v
]:
indiv_km = region_size_fleet.sel(
variables=pwt,
)
Expand Down Expand Up @@ -366,7 +365,9 @@ def __init__(
mapping = InventorySet(database=database, version=version, model=model)
self.vehicle_map = mapping.generate_transport_map(transport_type=vehicle_type)
self.rev_map = {next(iter(v)): k for k, v in self.vehicle_map.items()}
self.vehicle_fuel_map = mapping.generate_vehicle_fuel_map(transport_type=vehicle_type)
self.vehicle_fuel_map = mapping.generate_vehicle_fuel_map(
transport_type=vehicle_type
)

# check if vehicle map is empty
for v in self.vehicle_map.values():
Expand Down Expand Up @@ -399,7 +400,9 @@ def create_vehicle_markets(self) -> list:

new_datasets = []

for ds in list(set([(v["name"], v["reference product"]) for v in vehicle_datasets])):
for ds in list(
set([(v["name"], v["reference product"]) for v in vehicle_datasets])
):
new_datasets.extend(
self.fetch_proxies(
subset=vehicle_datasets,
Expand All @@ -415,7 +418,9 @@ def create_vehicle_markets(self) -> list:
self.database.append(new_ds)

else:
print(f"Dataset {new_ds['name'], new_ds['location']} already in the database.")
print(
f"Dataset {new_ds['name'], new_ds['location']} already in the database."
)

fleet_act = []

Expand Down Expand Up @@ -445,7 +450,7 @@ def create_vehicle_markets(self) -> list:
scenario=self.scenario,
regions=self.regions,
arr=arr,
mapping=self.vehicle_map
mapping=self.vehicle_map,
)
)

Expand Down Expand Up @@ -529,12 +534,14 @@ def adjust_transport_efficiency(self, dataset):
dataset = rescale_exchanges(
dataset,
scaling_factor,
technosphere_filters=[ws.either(
*[
ws.contains("name", v)
for v in self.vehicle_fuel_map[variable]
]
)],
technosphere_filters=[
ws.either(
*[
ws.contains("name", v)
for v in self.vehicle_fuel_map[variable]
]
)
],
)
if "log parameters" not in dataset:
dataset["log parameters"] = {}
Expand Down
Loading

0 comments on commit 44d1c05

Please sign in to comment.