Adjust lp files to changes

oemof · Oct 6, 2023 · 7400c9c · 7400c9c
1 parent dad4616
commit 7400c9c
Show file tree

Hide file tree

Showing 30 changed files with 1,220 additions and 1,220 deletions.
diff --git a/tests/lp_files/connect_investment_multi_period.lp b/tests/lp_files/connect_investment_multi_period.lp
diff --git a/tests/lp_files/converter_invest_multi_period.lp b/tests/lp_files/converter_invest_multi_period.lp
@@ -2,9 +2,9 @@
 
 min 
 objective:
-+24.462687250116133 InvestmentFlowBlock_invest(powerplant_gas_coal_electricityBus_0)
-+23.98302671580013 InvestmentFlowBlock_invest(powerplant_gas_coal_electricityBus_1)
-+23.512771290000128 InvestmentFlowBlock_invest(powerplant_gas_coal_electricityBus_2)
++3.5273767282312036 InvestmentFlowBlock_invest(powerplant_gas_coal_electricityBus_0)
++2.328225392441188 InvestmentFlowBlock_invest(powerplant_gas_coal_electricityBus_1)
++1.1525868279411837 InvestmentFlowBlock_invest(powerplant_gas_coal_electricityBus_2)
 +50 flow(powerplant_gas_coal_electricityBus_0_0)
 +50 flow(powerplant_gas_coal_electricityBus_0_1)
 +49.01960784313725 flow(powerplant_gas_coal_electricityBus_1_2)
@@ -20,28 +20,28 @@ objective:
 
 s.t.
 
-c_e_BusBlock_balance(coalBus_0_0)_:
-+1 flow(coalBus_powerplant_gas_coal_0_0)
+c_e_BusBlock_balance(electricityBus_0_0)_:
++1 flow(powerplant_gas_coal_electricityBus_0_0)
 = 0
 
-c_e_BusBlock_balance(coalBus_0_1)_:
-+1 flow(coalBus_powerplant_gas_coal_0_1)
+c_e_BusBlock_balance(electricityBus_0_1)_:
++1 flow(powerplant_gas_coal_electricityBus_0_1)
 = 0
 
-c_e_BusBlock_balance(coalBus_1_2)_:
-+1 flow(coalBus_powerplant_gas_coal_1_2)
+c_e_BusBlock_balance(electricityBus_1_2)_:
++1 flow(powerplant_gas_coal_electricityBus_1_2)
 = 0
 
-c_e_BusBlock_balance(coalBus_1_3)_:
-+1 flow(coalBus_powerplant_gas_coal_1_3)
+c_e_BusBlock_balance(electricityBus_1_3)_:
++1 flow(powerplant_gas_coal_electricityBus_1_3)
 = 0
 
-c_e_BusBlock_balance(coalBus_2_4)_:
-+1 flow(coalBus_powerplant_gas_coal_2_4)
+c_e_BusBlock_balance(electricityBus_2_4)_:
++1 flow(powerplant_gas_coal_electricityBus_2_4)
 = 0
 
-c_e_BusBlock_balance(coalBus_2_5)_:
-+1 flow(coalBus_powerplant_gas_coal_2_5)
+c_e_BusBlock_balance(electricityBus_2_5)_:
++1 flow(powerplant_gas_coal_electricityBus_2_5)
 = 0
 
 c_e_BusBlock_balance(gasBus_0_0)_:
@@ -68,30 +68,6 @@ c_e_BusBlock_balance(gasBus_2_5)_:
 +1 flow(gasBus_powerplant_gas_coal_2_5)
 = 0
 
-c_e_BusBlock_balance(electricityBus_0_0)_:
-+1 flow(powerplant_gas_coal_electricityBus_0_0)
-= 0
-
-c_e_BusBlock_balance(electricityBus_0_1)_:
-+1 flow(powerplant_gas_coal_electricityBus_0_1)
-= 0
-
-c_e_BusBlock_balance(electricityBus_1_2)_:
-+1 flow(powerplant_gas_coal_electricityBus_1_2)
-= 0
-
-c_e_BusBlock_balance(electricityBus_1_3)_:
-+1 flow(powerplant_gas_coal_electricityBus_1_3)
-= 0
-
-c_e_BusBlock_balance(electricityBus_2_4)_:
-+1 flow(powerplant_gas_coal_electricityBus_2_4)
-= 0
-
-c_e_BusBlock_balance(electricityBus_2_5)_:
-+1 flow(powerplant_gas_coal_electricityBus_2_5)
-= 0
-
 c_e_BusBlock_balance(thermalBus_0_0)_:
 +1 flow(powerplant_gas_coal_thermalBus_0_0)
 = 0
@@ -116,126 +92,150 @@ c_e_BusBlock_balance(thermalBus_2_5)_:
 +1 flow(powerplant_gas_coal_thermalBus_2_5)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_0_0)_:
--0.2 flow(powerplant_gas_coal_electricityBus_0_0)
-+0.3 flow(coalBus_powerplant_gas_coal_0_0)
+c_e_BusBlock_balance(coalBus_0_0)_:
++1 flow(coalBus_powerplant_gas_coal_0_0)
+= 0
+
+c_e_BusBlock_balance(coalBus_0_1)_:
++1 flow(coalBus_powerplant_gas_coal_0_1)
+= 0
+
+c_e_BusBlock_balance(coalBus_1_2)_:
++1 flow(coalBus_powerplant_gas_coal_1_2)
+= 0
+
+c_e_BusBlock_balance(coalBus_1_3)_:
++1 flow(coalBus_powerplant_gas_coal_1_3)
+= 0
+
+c_e_BusBlock_balance(coalBus_2_4)_:
++1 flow(coalBus_powerplant_gas_coal_2_4)
+= 0
+
+c_e_BusBlock_balance(coalBus_2_5)_:
++1 flow(coalBus_powerplant_gas_coal_2_5)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_electricityBus_0_0)_:
 -0.58 flow(powerplant_gas_coal_electricityBus_0_0)
 +0.3 flow(gasBus_powerplant_gas_coal_0_0)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_0_0)_:
--0.2 flow(powerplant_gas_coal_thermalBus_0_0)
-+0.5 flow(coalBus_powerplant_gas_coal_0_0)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_0_0)_:
+-0.2 flow(powerplant_gas_coal_electricityBus_0_0)
++0.3 flow(coalBus_powerplant_gas_coal_0_0)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_thermalBus_0_0)_:
 -0.58 flow(powerplant_gas_coal_thermalBus_0_0)
 +0.5 flow(gasBus_powerplant_gas_coal_0_0)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_0_1)_:
--0.2 flow(powerplant_gas_coal_electricityBus_0_1)
-+0.3 flow(coalBus_powerplant_gas_coal_0_1)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_0_0)_:
+-0.2 flow(powerplant_gas_coal_thermalBus_0_0)
++0.5 flow(coalBus_powerplant_gas_coal_0_0)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_electricityBus_0_1)_:
 -0.58 flow(powerplant_gas_coal_electricityBus_0_1)
 +0.3 flow(gasBus_powerplant_gas_coal_0_1)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_0_1)_:
--0.2 flow(powerplant_gas_coal_thermalBus_0_1)
-+0.5 flow(coalBus_powerplant_gas_coal_0_1)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_0_1)_:
+-0.2 flow(powerplant_gas_coal_electricityBus_0_1)
++0.3 flow(coalBus_powerplant_gas_coal_0_1)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_thermalBus_0_1)_:
 -0.58 flow(powerplant_gas_coal_thermalBus_0_1)
 +0.5 flow(gasBus_powerplant_gas_coal_0_1)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_1_2)_:
--0.2 flow(powerplant_gas_coal_electricityBus_1_2)
-+0.3 flow(coalBus_powerplant_gas_coal_1_2)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_0_1)_:
+-0.2 flow(powerplant_gas_coal_thermalBus_0_1)
++0.5 flow(coalBus_powerplant_gas_coal_0_1)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_electricityBus_1_2)_:
 -0.58 flow(powerplant_gas_coal_electricityBus_1_2)
 +0.3 flow(gasBus_powerplant_gas_coal_1_2)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_1_2)_:
--0.2 flow(powerplant_gas_coal_thermalBus_1_2)
-+0.5 flow(coalBus_powerplant_gas_coal_1_2)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_1_2)_:
+-0.2 flow(powerplant_gas_coal_electricityBus_1_2)
++0.3 flow(coalBus_powerplant_gas_coal_1_2)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_thermalBus_1_2)_:
 -0.58 flow(powerplant_gas_coal_thermalBus_1_2)
 +0.5 flow(gasBus_powerplant_gas_coal_1_2)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_1_3)_:
--0.2 flow(powerplant_gas_coal_electricityBus_1_3)
-+0.3 flow(coalBus_powerplant_gas_coal_1_3)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_1_2)_:
+-0.2 flow(powerplant_gas_coal_thermalBus_1_2)
++0.5 flow(coalBus_powerplant_gas_coal_1_2)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_electricityBus_1_3)_:
 -0.58 flow(powerplant_gas_coal_electricityBus_1_3)
 +0.3 flow(gasBus_powerplant_gas_coal_1_3)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_1_3)_:
--0.2 flow(powerplant_gas_coal_thermalBus_1_3)
-+0.5 flow(coalBus_powerplant_gas_coal_1_3)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_1_3)_:
+-0.2 flow(powerplant_gas_coal_electricityBus_1_3)
++0.3 flow(coalBus_powerplant_gas_coal_1_3)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_thermalBus_1_3)_:
 -0.58 flow(powerplant_gas_coal_thermalBus_1_3)
 +0.5 flow(gasBus_powerplant_gas_coal_1_3)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_2_4)_:
--0.2 flow(powerplant_gas_coal_electricityBus_2_4)
-+0.3 flow(coalBus_powerplant_gas_coal_2_4)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_1_3)_:
+-0.2 flow(powerplant_gas_coal_thermalBus_1_3)
++0.5 flow(coalBus_powerplant_gas_coal_1_3)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_electricityBus_2_4)_:
 -0.58 flow(powerplant_gas_coal_electricityBus_2_4)
 +0.3 flow(gasBus_powerplant_gas_coal_2_4)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_2_4)_:
--0.2 flow(powerplant_gas_coal_thermalBus_2_4)
-+0.5 flow(coalBus_powerplant_gas_coal_2_4)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_2_4)_:
+-0.2 flow(powerplant_gas_coal_electricityBus_2_4)
++0.3 flow(coalBus_powerplant_gas_coal_2_4)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_thermalBus_2_4)_:
 -0.58 flow(powerplant_gas_coal_thermalBus_2_4)
 +0.5 flow(gasBus_powerplant_gas_coal_2_4)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_2_5)_:
--0.2 flow(powerplant_gas_coal_electricityBus_2_5)
-+0.3 flow(coalBus_powerplant_gas_coal_2_5)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_2_4)_:
+-0.2 flow(powerplant_gas_coal_thermalBus_2_4)
++0.5 flow(coalBus_powerplant_gas_coal_2_4)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_electricityBus_2_5)_:
 -0.58 flow(powerplant_gas_coal_electricityBus_2_5)
 +0.3 flow(gasBus_powerplant_gas_coal_2_5)
 = 0
 
-c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_2_5)_:
--0.2 flow(powerplant_gas_coal_thermalBus_2_5)
-+0.5 flow(coalBus_powerplant_gas_coal_2_5)
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_electricityBus_2_5)_:
+-0.2 flow(powerplant_gas_coal_electricityBus_2_5)
++0.3 flow(coalBus_powerplant_gas_coal_2_5)
 = 0
 
 c_e_ConverterBlock_relation(powerplant_gas_coal_gasBus_thermalBus_2_5)_:
 -0.58 flow(powerplant_gas_coal_thermalBus_2_5)
 +0.5 flow(gasBus_powerplant_gas_coal_2_5)
 = 0
 
+c_e_ConverterBlock_relation(powerplant_gas_coal_coalBus_thermalBus_2_5)_:
+-0.2 flow(powerplant_gas_coal_thermalBus_2_5)
++0.5 flow(coalBus_powerplant_gas_coal_2_5)
+= 0
+
 c_e_InvestmentFlowBlock_total_rule(powerplant_gas_coal_electricityBus_0)_:
 -1 InvestmentFlowBlock_invest(powerplant_gas_coal_electricityBus_0)
 +1 InvestmentFlowBlock_total(powerplant_gas_coal_electricityBus_0)
@@ -343,18 +343,18 @@ bounds
    0 <= flow(powerplant_gas_coal_thermalBus_1_3) <= +inf
    0 <= flow(powerplant_gas_coal_thermalBus_2_4) <= +inf
    0 <= flow(powerplant_gas_coal_thermalBus_2_5) <= +inf
-   0 <= flow(coalBus_powerplant_gas_coal_0_0) <= +inf
-   0 <= flow(coalBus_powerplant_gas_coal_0_1) <= +inf
-   0 <= flow(coalBus_powerplant_gas_coal_1_2) <= +inf
-   0 <= flow(coalBus_powerplant_gas_coal_1_3) <= +inf
-   0 <= flow(coalBus_powerplant_gas_coal_2_4) <= +inf
-   0 <= flow(coalBus_powerplant_gas_coal_2_5) <= +inf
    0 <= flow(gasBus_powerplant_gas_coal_0_0) <= +inf
    0 <= flow(gasBus_powerplant_gas_coal_0_1) <= +inf
    0 <= flow(gasBus_powerplant_gas_coal_1_2) <= +inf
    0 <= flow(gasBus_powerplant_gas_coal_1_3) <= +inf
    0 <= flow(gasBus_powerplant_gas_coal_2_4) <= +inf
    0 <= flow(gasBus_powerplant_gas_coal_2_5) <= +inf
+   0 <= flow(coalBus_powerplant_gas_coal_0_0) <= +inf
+   0 <= flow(coalBus_powerplant_gas_coal_0_1) <= +inf
+   0 <= flow(coalBus_powerplant_gas_coal_1_2) <= +inf
+   0 <= flow(coalBus_powerplant_gas_coal_1_3) <= +inf
+   0 <= flow(coalBus_powerplant_gas_coal_2_4) <= +inf
+   0 <= flow(coalBus_powerplant_gas_coal_2_5) <= +inf
    0 <= InvestmentFlowBlock_total(powerplant_gas_coal_electricityBus_0) <= +inf
    0 <= InvestmentFlowBlock_total(powerplant_gas_coal_electricityBus_1) <= +inf
    0 <= InvestmentFlowBlock_old(powerplant_gas_coal_electricityBus_1) <= +inf