Merge pull request #64 from pommes-public/63-include-updated-commodit…

…y-price-data Include updated commodity prices
pommes-public · Nov 3, 2023 · 27c22f6 · 27c22f6
2 parents de9bf67 + 2c008f2
commit 27c22f6
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 13 deletions.
diff --git a/config.yml b/config.yml
@@ -10,7 +10,6 @@ control_parameters:
     solver: "gurobi"
     solver_commandline_options: False
     fuel_cost_pathway: "NZE"
-    fuel_price_shock: "high"
     emissions_cost_pathway: "long-term"
     activate_emissions_limit: False
     emissions_pathway: "100_percent_linear"

diff --git a/pommesdispatch/cli.py b/pommesdispatch/cli.py
@@ -14,7 +14,6 @@ def create_default_config():
     solver: "gurobi"
     solver_commandline_options: False
     fuel_cost_pathway: "NZE"
-    fuel_price_shock: "high"
     emissions_cost_pathway: "long-term"
     activate_emissions_limit: False
     emissions_pathway: "100_percent_linear"

diff --git a/pommesdispatch/model_funcs/data_input.py b/pommesdispatch/model_funcs/data_input.py
@@ -78,10 +78,7 @@ def parse_input_data(dm):
         "sources_renewables_ts": "sources_renewables_ts",
         "transformers_minload_ts": "transformers_minload_ts",
         "transformers_availability_ts": "transformers_availability_ts",
-        "costs_fuel": (
-            f"costs_fuel_{dm.fuel_cost_pathway}"
-            + f"_{dm.fuel_price_shock}_nominal"
-        ),
+        "costs_fuel": f"costs_fuel_{dm.fuel_cost_pathway}_nominal",
         "costs_fuel_ts": "costs_fuel_ts",
         "costs_emissions": (
             f"costs_emissions_{dm.emissions_cost_pathway}_nominal"

diff --git a/pommesdispatch/model_funcs/model_control.py b/pommesdispatch/model_funcs/model_control.py
@@ -240,7 +240,6 @@ def __init__(self):
         self.solver = None
         self.solver_commandline_options = None
         self.fuel_cost_pathway = None
-        self.fuel_price_shock = None
         self.emissions_cost_pathway = None
         self.activate_emissions_limit = None
         self.emissions_pathway = None

diff --git a/...iles/costs_fuel_NZE_high_nominal_2017.csv → ...csv_files/costs_fuel_NZE_nominal_2017.csv b/...iles/costs_fuel_NZE_high_nominal_2017.csv → ...csv_files/costs_fuel_NZE_nominal_2017.csv
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -40,7 +40,6 @@ def test_create_default_config(self):
                 "solver": "gurobi",
                 "solver_commandline_options": False,
                 "fuel_cost_pathway": "NZE",
-                "fuel_price_shock": "high",
                 "emissions_cost_pathway": "long-term",
                 "activate_emissions_limit": False,
                 "emissions_pathway": "100_percent_linear",

diff --git a/tests/test_data_input.py b/tests/test_data_input.py
@@ -11,7 +11,6 @@ def create_dispatch_model():
         {
             "path_folder_input": "tests/csv_files/",
             "fuel_cost_pathway": "NZE",
-            "fuel_price_shock": "high",
             "emissions_cost_pathway": "long-term",
             "start_time": "2017-01-01 00:00:00",
             "end_time": "2017-01-02 00:00:00",

diff --git a/tests/test_dispatch_model.py b/tests/test_dispatch_model.py
@@ -17,7 +17,6 @@ def create_test_config():
         solver: "cbc"
         solver_commandline_options: False
         fuel_cost_pathway: "NZE"
-        fuel_price_shock: "high"
         emissions_cost_pathway: "long-term"
         activate_emissions_limit: False
         emissions_pathway: "100_percent_linear"

diff --git a/tests/test_model_control.py b/tests/test_model_control.py
@@ -34,7 +34,6 @@ def return_model_and_parameters():
         "solver": "cbc",
         "solver_commandline_options": False,
         "fuel_cost_pathway": "NZE",
-        "fuel_price_shock": "high",
         "emissions_cost_pathway": "long-term",
         "activate_emissions_limit": False,
         "emissions_pathway": "100_percent_linear",
@@ -113,7 +112,6 @@ def test_dispatch_model_constructor(self):
             "countries",
             "solver",
             "fuel_cost_pathway",
-            "fuel_price_shock",
             "activate_emissions_limit",
             "emissions_pathway",
             "activate_demand_response",

diff --git a/tests/test_subroutines.py b/tests/test_subroutines.py
@@ -13,7 +13,6 @@ def create_inputs_model_and_nodes(activate_demand_response=False):
         {
             "path_folder_input": "tests/csv_files/",
             "fuel_cost_pathway": "NZE",
-            "fuel_price_shock": "high",
             "emissions_cost_pathway": "long-term",
             "start_time": "2017-01-01 00:00:00",
             "end_time": "2017-01-02 00:00:00",