readd ds["TradeCapacityToActivityUnit"]

transition-zero · Nov 4, 2024 · a7f6525 · a7f6525
1 parent 570e39b
commit a7f6525
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/tz/osemosys/model/constraints/trade.py b/tz/osemosys/model/constraints/trade.py
@@ -60,17 +60,14 @@ def add_trade_constraints(ds: xr.Dataset, m: Model, lex: Dict[str, LinearExpress
 
         # Capacity
         con = lex["GrossTradeCapacity"] * ds["TradeRoute"] * (
-            1
-            - ds["TradeLossBetweenRegions"]
-            # ) >= m["Export"] / (ds["TradeCapacityToActivityUnit"] * ds["YearSplit"])
-        ) >= m["Export"] / (ds["YearSplit"])
+            1 - ds["TradeLossBetweenRegions"]
+        ) >= m["Export"] / (ds["TradeCapacityToActivityUnit"] * ds["YearSplit"])
         m.add_constraints(con, name="TC1a_TradeConstraint_Export")
 
         con = lex["GrossTradeCapacity"] * ds["TradeRoute"] * (
             1 - ds["TradeLossBetweenRegions"]
         ) >= m["Import"].rename({"REGION": "_REGION", "_REGION": "REGION"}) / (
-            # ds["TradeCapacityToActivityUnit"] * ds["YearSplit"]
-            ds["YearSplit"]
+            ds["TradeCapacityToActivityUnit"] * ds["YearSplit"]
         )
         m.add_constraints(con, name="TC1b_TradeConstraint_Import")