Include transport work from Jonas

polca · Jul 30, 2024 · 3266fce · 3266fce
1 parent c8f7572
commit 3266fce
Show file tree

Hide file tree

Showing 29 changed files with 852 additions and 945 deletions.
diff --git a/dev/Untitled1.ipynb b/dev/Untitled1.ipynb
diff --git a/premise/activity_maps.py b/premise/activity_maps.py
@@ -22,6 +22,11 @@
     DATA_DIR / "GAINS_emission_factors" / "gains_ecoinvent_sectoral_mapping.yaml"
 )
 HEAT_TECHS = VARIABLES_DIR / "heat_variables.yaml"
+PASSENGER_CARS = VARIABLES_DIR / "transport_passenger_cars_variables.yaml"
+TWO_WHEELERS = VARIABLES_DIR / "transport_two_wheelers_variables.yaml"
+BUSES = VARIABLES_DIR / "transport_bus_variables.yaml"
+TRUCKS = VARIABLES_DIR / "transport_roadfreight_variables.yaml"
+TRAINS = VARIABLES_DIR / "transport_railfreight_variables.yaml"
 
 
 def get_mapping(filepath: Path, var: str, model: str = None) -> dict:

diff --git a/premise/battery.py b/premise/battery.py
@@ -9,7 +9,6 @@
 from .filesystem_constants import DATA_DIR
 from .logger import create_logger
 from .transformation import BaseTransformation, IAMDataCollection, List, np, ws
-from .utils import rescale_exchanges
 
 logger = create_logger("battery")
 

diff --git a/premise/data/iam_output_files/remind_SSP1-Base.csv b/premise/data/iam_output_files/remind_SSP1-Base.csv
diff --git a/premise/data/iam_output_files/remind_SSP1-NDC.csv b/premise/data/iam_output_files/remind_SSP1-NDC.csv
diff --git a/premise/data/iam_output_files/remind_SSP1-NPi.csv b/premise/data/iam_output_files/remind_SSP1-NPi.csv
diff --git a/premise/data/iam_output_files/remind_SSP1-PkBudg1150.csv b/premise/data/iam_output_files/remind_SSP1-PkBudg1150.csv
diff --git a/premise/data/iam_output_files/remind_SSP1-PkBudg500.csv b/premise/data/iam_output_files/remind_SSP1-PkBudg500.csv
diff --git a/premise/data/iam_output_files/remind_SSP2-Base.csv b/premise/data/iam_output_files/remind_SSP2-Base.csv
diff --git a/premise/data/iam_output_files/remind_SSP2-NDC.csv b/premise/data/iam_output_files/remind_SSP2-NDC.csv
diff --git a/premise/data/iam_output_files/remind_SSP2-NPi.csv b/premise/data/iam_output_files/remind_SSP2-NPi.csv
diff --git a/premise/data/iam_output_files/remind_SSP2-PkBudg1150.csv b/premise/data/iam_output_files/remind_SSP2-PkBudg1150.csv
diff --git a/premise/data/iam_output_files/remind_SSP2-PkBudg500.csv b/premise/data/iam_output_files/remind_SSP2-PkBudg500.csv