Merge branch 'dev' into features/market-simulation

openego · Oct 23, 2023 · 673ca88 · 673ca88
2 parents 11621c7 + 93d38a7
commit 673ca88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/etrago/execute/__init__.py b/etrago/execute/__init__.py
@@ -359,6 +359,7 @@ def iterate_lopf(
 
     else:
         run_lopf(etrago, extra_functionality, method)
+        etrago.export_to_csv(path)
 
     if args["lpfile"]:
         network.model.write(lp_path)

diff --git a/etrago/tools/constraints.py b/etrago/tools/constraints.py
@@ -2931,7 +2931,7 @@ def add_chp_constraints_nmp(n):
             for e_chp in elec_chp
         )
 
-        lhs = linexpr((1, lhs_1), (1, lhs_2))
+        lhs = linexpr((1, lhs_1), (-1, lhs_2))
 
         define_constraints(
             n, lhs, "<=", 0, "chplink_" + str(i), "backpressure"