Refined RE-gas modelling:

- Model version used for paper "Potential role of renewable gas in the transition of electricity and district heating systems" submitted to Energy Strategy Review
- Includes changes from the F4R master that are not in GH master

base/addons/_hooks/balbase1.inc

@@ -6,9 +6,6 @@ $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/combtech_balbase1.i
 $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/hydrogen_balbase1.inc";
 
 $ifi %FLOWBASED%==yes  $include   "../../base/addons/flowbased/flowbased_balbase1.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/maxfor3fuels_balbase1.inc";
-
-
 
 $label endoffile
 

base/addons/_hooks/balbase2.inc

@@ -6,7 +6,5 @@ $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/combtech_balbase2.i
 $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/hydrogen_balbase2.inc";
 
 $ifi %FLOWBASED%==yes  $include   "../../base/addons/flowbased/flowbased_balbase2.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/maxfor3fuels_balbase2.inc";
-
 
 $label endoffile

base/addons/_hooks/balbase3.inc

@@ -7,6 +7,5 @@ $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/hydrogen_balbase3.i
 
 $ifi %FLOWBASED%==yes  $include   "../../base/addons/flowbased/flowbased_balbase3.inc";
 $ifi not %HYRSBB123%==none $include  "../../base/addons/hyrsbb123/hyrsbb123balbase3.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/maxfor3fuels_balbase3.inc";
 
 $label endoffile

base/addons/_hooks/balbase4.inc

@@ -5,7 +5,7 @@ $ifi not %bb4%==yes $goto endoffile
 $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/bb4/hydrogen_balbase4.inc";
 $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/bb4/combtech_balbase4.inc";
 
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/bb4/maxfor3fuels_balbase4.inc";
-
+$ifi %STEPWISEPRICE%==yes  $include   "../../base/addons/stepwiseprice/stepwiseprice_balbase4.inc";
+$ifi %LIMITSFORFUELS%==yes  $include   "../../base/addons/limitsforfuels/bb4/limitsforfuels_balbase4.inc";
 
 $label endoffile

base/addons/_hooks/eqndecdef.inc

@@ -7,14 +7,14 @@ $ifi %HYDROGEN%==yes $include "../../base/addons/hydrogen/hydrogen_eqndecdef.inc
 
 $ifi %FLOWBASED%==yes $include "../../base/addons/flowbased/flowbased_eqndecdef.inc"
 $ifi %BB3%==yes $ifi not %HYRSBB123%==none     $include "../../base/addons/hyrsbb123/hyrsbb123equations.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/maxfor3fuels_eqndecdef.inc";
 
 $ifi not %BB4%==yes $goto endoffile
 
 $label  beginbb4
 
 $ifi %COMBTECH%==yes $include "../../base/addons/combtech/bb4/combtech_eqndecdef.inc"
 $ifi %HYDROGEN%==yes $include "../../base/addons/hydrogen/bb4/hydrogen_eqndecdef.inc"
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/bb4/maxfor3fuels_eqndecdef.inc";
+$ifi %STEPWISEPRICE%==yes  $include   "../../base/addons/stepwiseprice/stepwiseprice_eqndecdef.inc";
+$ifi %LIMITSFORFUELS%==yes  $include   "../../base/addons/limitsforfuels/bb4/limitsforfuels_eqndecdef.inc";
 
-$label endoffile
+$label endoffile

base/addons/_hooks/ipardecdef.inc

@@ -2,7 +2,6 @@
 $ifi %BB4%==yes $goto beginbb4
 
 $ifi %HYDROGEN%==yes   $include   "../../base/addons/hydrogen/hydrogen_ipardecdef.inc";
-$ifi %MAXFOR3FUELS%==yes   $include   "../../base/addons/maxfor3fuels/maxfor3fuels_ipardecdef.inc";
 
 $ifi not %BB4%==yes $goto endoffile
 

base/addons/_hooks/isetdecdef.inc

@@ -12,6 +12,7 @@ $label  beginbb4
 
 $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/bb4/hydrogen_isetdecdef.inc";
 $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/bb4/combtech_isetdecdef.inc";
-
+$ifi %STEPWISEPRICE%==yes  $include   "../../base/addons/stepwiseprice/stepwiseprice_isetdecdef.inc";
+$ifi %LIMITSFORFUELS%==yes  $include   "../../base/addons/limitsforfuels/bb4/limitsforfuels_isetdecdef.inc";
 
 $label endoffile

base/addons/_hooks/pardeclare.inc

@@ -9,13 +9,13 @@ $ifi %FlowBased%==yes    $include "../../base/addons/flowbased/flowbased_pardecl
 $ifi %BB4%==yes $goto beginbb4
 
 $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/hydrogen_pardeclare.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/maxfor3fuels_pardeclare.inc";
 
 $ifi not %BB4%==yes $goto endoffile
 
 $label  beginbb4
 
 $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/bb4/hydrogen_pardeclare.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/bb4/maxfor3fuels_pardeclare.inc"; 
+$ifi %STEPWISEPRICE%==yes  $include   "../../base/addons/stepwiseprice/stepwiseprice_pardeclare.inc";
+$ifi %LIMITSFORFUELS%==yes  $include   "../../base/addons/limitsforfuels/bb4/limitsforfuels_pardeclare.inc";
 
 $label endoffile

base/addons/_hooks/pardefine.inc

@@ -12,15 +12,14 @@ $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/hydrogen_pardefine.
 *This is only tested for BB1 and BB2:
 $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/combtech_pardefine.inc";
 
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/maxfor3fuels_pardefine.inc";
-
 $ifi not %BB4%==yes $goto endoffile
 
 $label  beginbb4
 
 $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/bb4/hydrogen_pardefine.inc";
 $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/bb4/combtech_pardefine.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/bb4/maxfor3fuels_pardefine.inc"; 
+$ifi %STEPWISEPRICE%==yes  $include   "../../base/addons/stepwiseprice/stepwiseprice_pardefine.inc";
+$ifi %LIMITSFORFUELS%==yes  $include   "../../base/addons/limitsforfuels/bb4/limitsforfuels_pardefine.inc";
 
 $label endoffile
 

base/addons/_hooks/qeeq.inc

@@ -15,4 +15,9 @@ $ifi %dflexquant%==yes   $include "../../base/addons/demandflexquant/dflexquant_
 
 $ifi %dflextime%==yes    $include "../../base/addons/demandflextime/dflextime_qeeq.inc";
 
+
+$ifi %vqdebug%==yes   $setglobal equation qeeq
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
 $label endoffile

base/addons/_hooks/qestovolt.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qestovolt
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qestovolts.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qestovolts
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qgfeq.inc

@@ -0,0 +1,11 @@
+* File qgfeq.inc for Balmorel addons that are relevant for equation QGFEQ
+* Latest revision 20180614 (idje)
+$ifi %BB4%==yes $goto beginbb4
+
+$ifi not %BB4%==yes $goto endoffile
+
+$label  beginbb4
+
+$ifi %HYDROGEN%==yes   $include   "../../base/addons/hydrogen/bb4/hydrogen_qgfeq.inc";
+
+$label endoffile

base/addons/_hooks/qgke_up.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qgke_up
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qgkh_up.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qgkh_up
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qgknaccumgross.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qgkaccumgross
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qgknaccumnet.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qgkaccumnet
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qheq.inc

@@ -1,5 +1,5 @@
 * Location of contributions to the RHS of QHEQ by add-ons
-* Latest revision 20170419 (hr)
+* Latest revision 20180418 (hr)
 
 $ifi %dflexquant%==yes    $include "../../base/addons/demandflexquant/dflexquant_qheq.inc";
 
@@ -13,6 +13,10 @@ $label  beginbb4
 
 $ifi not %bb4%==yes $goto endoffile
 
-$ifi %HYDROGEN%==yes   $include   "../../base/addons/hydrogen/bb4/hydrogen_qheq.inc";
+* $ifi %HYDROGEN%==yes   $include   "../../base/addons/hydrogen/bb4/fucked up!!    **** Hans : make better!   fucked up  !! TODO 
+
+$ifi %vqdebug%==yes   $setglobal equation qheq
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
 
 $label endoffile

base/addons/_hooks/qhstovolt.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qhstovolt
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qhstovolts.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qhstovolts
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qhymaxg.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qhymaxg
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qhyrsmaxvol.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qhyrsmaxvol
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qhyrsminvol.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qhyrsminvol
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qhyrsseq.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qhyrsseq
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qkefuela.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qkfuela
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qkefuelc.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qkfuelc
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qkefuelr.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qkfuelc
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qknaccumnet.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qkaccumnet
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qobj.inc

@@ -8,7 +8,6 @@ $ifi %dflexquant%==yes   $include "../../base/addons/demandflexquant/dflexquant_
 $ifi %BB4%==yes $goto beginbb4
 
 $ifi %HYDROGEN%==yes   $include   "../../base/addons/hydrogen/hydrogen_qobj.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/maxfor3fuels_qobj.inc";
 
 $ifi not %BB4%==yes $goto endoffile
 
@@ -17,6 +16,11 @@ $label  beginbb4
 $ifi not %bb4%==yes $goto endoffile
 
 $ifi %HYDROGEN%==yes   $include   "../../base/addons/hydrogen/bb4/hydrogen_qobj.inc";
-$ifi %MAXFOR3FUELS%==yes  $include   "../../base/addons/maxfor3fuels/bb4/maxfor3fuels_qobj.inc"; 
+$ifi %STEPWISEPRICE%==yes  $include   "../../base/addons/stepwiseprice/stepwiseprice_qobj.inc";
+$ifi %LIMITSFORFUELS%==yes  $include   "../../base/addons/limitsforfuels/bb4/limitsforfuels_qobj.inc";
+
+$ifi %vqdebug%==yes   $setglobal equation qobj
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
 
 $label endoffile

base/addons/_hooks/qxk_up.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qxk_up
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/qxknaccumnet.inc

@@ -0,0 +1,8 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %vqdebug%==yes   $setglobal equation qxkaccumnet
+$ifi %vqdebug%==yes   $include   "../../base/addons/vqdebug/bb4/vqdebug_equations.inc";
+
+
+$label endoffile

base/addons/_hooks/setdeclare.inc

@@ -9,6 +9,7 @@ $ifi not %HYRSBB123%==none   $include   "../../base/addons/hyrsbb123/hyrsbb123in
 $ifi %dflexquant%==yes       $include "../../base/addons/demandflexquant/dflexquant_set.inc";
 
 $ifi %FLOWBASED%==yes  $include   "../../base/addons/flowbased/flowbased_setdeclare.inc";
+
 $ifi not %BB4%==yes $goto endoffile
 
 $label  beginbb4
@@ -17,4 +18,8 @@ $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/bb4/combtech_setdec
 
 $ifi %dflexquant%==yes       $include "../../base/addons/demandflexquant/dflexquant_set.inc";
 
+$ifi %STEPWISEPRICE%==yes  $include   "../../base/addons/stepwiseprice/stepwiseprice_setdeclare.inc";
+
+$ifi %LIMITSFORFUELS%==yes  $include   "../../base/addons/limitsforfuels/bb4/limitsforfuels_setdeclare.inc";
+
 $label endoffile

base/addons/_hooks/setdefine.inc

@@ -11,8 +11,6 @@ $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/combtech_setdefine.
 
 $ifi %FLOWBASED%==yes  $include   "../../base/addons/flowbased/flowbased_setdefine.inc";
 
-
-
 $ifi not %BB4%==yes $goto endoffile
 
 
@@ -23,4 +21,8 @@ $ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/bb4/hydrogen_setdef
 
 $ifi %COMBTECH%==yes  $include   "../../base/addons/combtech/bb4/combtech_setdefine.inc";
 
+$ifi %STEPWISEPRICE%==yes  $include   "../../base/addons/stepwiseprice/stepwiseprice_setdefine.inc";
+
+$ifi %LIMITSFORFUELS%==yes  $include   "../../base/addons/limitsforfuels/bb4/limitsforfuels_setdefine.inc";
+
 $label endoffile

base/addons/_hooks/sim.inc

@@ -16,7 +16,5 @@ $ifi not %BB4%==yes $goto endoffile
 
 $label bb4_begin
 
-*NOTE: Hydrogen add-on is loaded first as some technologies used in combtech comes from the hydrogen add-on.
-$ifi %HYDROGEN%==yes  $include   "../../base/addons/hydrogen/bb4/hydrogen_sim.inc";
 
 $label endoffile

base/addons/_hooks/simau.inc

@@ -1,4 +1,3 @@
 * Location of annual update specifications used in add-ons
 
 $ifi %HYDROGEN%==yes   $include   "../../base/addons/hydrogen/hydrogen_simau.inc";
-$ifi %MAXFOR3FUELS%==yes   $include   "../../base/addons/maxfor3fuels/maxfor3fuels_simau.inc";

base/addons/_hooks/solveend.inc

@@ -0,0 +1,17 @@
+* Latest revision 20180418 (hr)
+
+
+$ifi %BB4%==yes $goto beginbb4
+
+
+$ifi not %BB4%==yes $goto endoffile
+
+$label  beginbb4
+
+$ifi %vqdebug%==yes  $include   "../../base/addons/vqdebug/bb4/vqdebug_m2zero.inc";
+
+
+$ifi not %bb4%==yes $goto endoffile
+
+
+$label endoffile