Merge pull request #40 from Zhanwei-Liu/dev

Allow setting carbon emission limits by zone

Author: Zhanwei-Liu

config.json

@@ -1,6 +1,6 @@
 {
     "general_parameters": {
-        "input_folder": "input",
+        "input_folder": "southeast_asia",
         "output_folder": "output",
         "output_filename": "year",
         "hour": 48,
@@ -12,9 +12,9 @@
     "hydro_parameters": {
             "isinflow": true,
             "error_threshold": 0.001,
-            "iteration_number": 3
+            "iteration_number": 1
         },
     "solver_parameters": {
-        "solver": "highs"
+        "solver": "gurobi"
     }
 }

params.json

@@ -20,8 +20,8 @@
         "file_name": "carbon_emission_limit",
         "index_cols": [0],
         "header_rows": [0],
-        "unstack_levels": null,
-        "first_col_only": true,
+        "unstack_levels": [0],
+        "first_col_only": false,
         "drop_na": true
     },
     "emission_factor": {

prepshot/_model/co2.py

@@ -49,11 +49,11 @@ def __init__(self, model : object) -> None:
             rule=self.emission_calc_rule
         )
         model.emission_limit_cons = poi.make_tupledict(
-            model.year,
+            model.year, model.zone,
             rule=self.emission_limit_rule
         )
 
-    def emission_limit_rule(self, y : int) -> poi.ConstraintIndex:
+    def emission_limit_rule(self, y : int, z : str) -> poi.ConstraintIndex:
         """Annual carbon emission limits across all zones and technologies.
         
         Parameters
@@ -67,10 +67,10 @@ def emission_limit_rule(self, y : int) -> poi.ConstraintIndex:
             A constraint of the model.
         """
         model = self.model
-        limit = model.params['carbon_emission_limit']
-        if limit[y] == np.Inf:
+        limit = model.params['carbon_emission_limit'][z, y]
+        if limit == np.Inf:
             return None
-        lhs = model.carbon[y] - limit[y]
+        lhs = model.carbon_capacity[y, z] - limit
         return model.add_linear_constraint(lhs, poi.Leq, 0)
 
     def emission_calc_rule(self, y : int) -> poi.ConstraintIndex:
@@ -135,4 +135,6 @@ def carbon_breakdown(
         model = self.model
         ef = model.params['emission_factor'][te, y]
         w = model.params['weight']
+        if ef == 0:
+            return poi.ExprBuilder(0)
         return 1 / w * ef * poi.quicksum(model.gen.select('*', '*', y, z, te))