Updated CHP equations for the integer clustering formulation

energy-modelling-toolkit · Dec 21, 2017 · 170c98e · 170c98e
1 parent 1fe378b
commit 170c98e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/DispaSET/GAMS/UCM_h.gms b/DispaSET/GAMS/UCM_h.gms
@@ -696,7 +696,7 @@ EQ_CHP_extraction(chp,i)$(CHPType(chp,'Extraction'))..
 EQ_CHP_extraction_Pmax(chp,i)$(CHPType(chp,'Extraction'))..
          Power(chp,i)
          =L=
-         PowerCapacity(chp)  - StorageInput(chp,i) * CHPPowerLossFactor(chp)
+         PowerCapacity(chp)*Nunits(chp)  - StorageInput(chp,i) * CHPPowerLossFactor(chp)
 ;
 
 EQ_CHP_backpressure(chp,i)$(CHPType(chp,'Back-Pressure'))..
@@ -714,7 +714,7 @@ EQ_CHP_P2H(chp,i)$(CHPType(chp,'P2H'))..
 EQ_CHP_max_heat(chp,i)..
          StorageInput(chp,i)
          =L=
-         CHPMaxHeat(chp)
+         CHPMaxHeat(chp)*Nunits(chp)
 ;
 
 EQ_CHP_demand_satisfaction(chp,i)..
@@ -736,7 +736,7 @@ EQ_Heat_Storage_balance(chp,i)..
 
 *Storage level must be above a minimum
 EQ_Heat_Storage_minimum(chp,i)..
-         StorageMinimum(chp)
+         StorageMinimum(chp)*Nunits(chp)
          =L=
          StorageLevel(chp,i)
 ;
@@ -745,7 +745,7 @@ EQ_Heat_Storage_minimum(chp,i)..
 EQ_Heat_Storage_level(chp,i)..
          StorageLevel(chp,i)
          =L=
-         StorageCapacity(chp)
+         StorageCapacity(chp)*Nunits(chp)
 ;
 
 * Minimum level at the end of the optimization horizon:

diff --git a/DispaSET/postprocessing/postprocessing.py b/DispaSET/postprocessing/postprocessing.py
@@ -511,7 +511,7 @@ def plot_energy_country_fuel(inputs, results, PPindicators):
 
     GenPerCountry = pd.DataFrame(index=countries, columns=fuels)
     # First make sure that all fuels are present. If not, initialize an empty series
-    for f in ['NUC', 'LIG', 'HRD', 'BIO', 'GAS', 'OIL', 'WST', 'SUN', 'WIN', 'FlowIn', 'WAT']:
+    for f in commons['Fuels'] + ['FlowIn']:
         if f not in GenPerCountry:
             GenPerCountry[f] = 0
     for c in countries: