Removed temporary fixes, relaxed bound on geothermal electricity.

core/bounds.gms

@@ -24,14 +24,6 @@ AND (not sameas(te,"tnrs"))),
   vm_cap.lo(t,regi,te,"1")$(t.val gt 2021) = 1e-6;
 );
 
-*** FIXME: temporarily define bounds for dummy variable to relax the bounds on geohdr, due to infeasibilities in NDC runs with edge_esm
-vm_dummyGeot.fx(ttot, all_regi, all_te, rlf) = 0;
-vm_dummyGeot.up(ttot, all_regi, all_te, rlf)$(sameas(all_te, "geohdr") AND (ttot.val ge 2025 OR ttot.val le 2030)) = 0.002;
-vm_dummyGeot.lo(ttot, all_regi, all_te, rlf)$(sameas(all_te, "geohdr") AND (ttot.val ge 2025 OR ttot.val le 2030)) = -0.002;
-
-*vm_dummyGeot.up(ttot, all_regi, all_te, rlf)$(sameas(all_te, "geohdr") AND sameas(ttot, "2030")) = 0.002;
-*vm_dummyGeot.lo(ttot, all_regi, all_te, rlf)$(sameas(all_te, "geohdr") AND sameas(ttot, "2030")) = -0.002;
-
 *** RP 20160405 make sure that the model also sees the se2se technologies (seel <--> seh2)
 loop(se2se(enty,enty2,te),
   vm_cap.lo(t,regi,te,"1")$(t.val gt 2021) = 1e-6;

core/datainput.gms

@@ -596,6 +596,9 @@ display p_efFossilFuelExtr;
 pm_dataren(regi,"nur",rlf,te)     = f_datarenglob("nur",rlf,te);
 pm_dataren(regi,"maxprod",rlf,te) = sm_EJ_2_TWa * f_datarenglob("maxprod",rlf,te);
 
+*** allow for slightly higher geothermal electricity to avoid INFES
+pm_dataren(regi,"maxprod","1","geohdr") = 1.01*pm_dataren(regi,"maxprod","1","geohdr");
+
 *RP* hydro, spv and csp get maxprod for all regions and grades from external file
 table f_maxProdGradeRegiHydro(all_regi,char,rlf)                  "input of regionalized maximum from hydro [EJ/a]"
 $ondelim

core/equations.gms

@@ -396,7 +396,7 @@ qm_fuel2pe(t,regi,peRicardian(enty))..
 ***---------------------------------------------------------------------------
 *ml* assuming maxprod to be technical potential
 q_limitProd(t,regi,teRe2rlfDetail(teReNoBio(te),rlf))..
-  pm_dataren(regi,"maxprod",rlf,te)+vm_dummyGeot(t, regi, te, rlf)
+  pm_dataren(regi,"maxprod",rlf,te)
   =g=
   ( 1$teRLDCDisp(te) +  pm_dataren(regi,"nur",rlf,te)$(NOT teRLDCDisp(te)) ) * vm_capFac(t,regi,te) * vm_capDistr(t,regi,te,rlf);
   

modules/30_biomass/magpie_40/bounds.gms

@@ -16,9 +16,11 @@
 *** Prescribe upper and lower limit for first generation biomass from 2030/45 on, so REMIND has freedom before.
 *** To avoid infeasibilities it was necessary to modify the initial vintage structure for bioeths.
 
-*** FIXME: temporarily remove limit to available biomass, due to infeasibilities in NDC runs with edge_esm
-***vm_fuExtr.up(t,regi,"pebios","5")$(t.val ge 2045)  = 1.2*p30_datapebio(regi,"pebios","5","maxprod",t);
-***vm_fuExtr.up(t,regi,"pebioil","5")$(t.val ge 2030) = 1.2*p30_datapebio(regi,"pebioil","5","maxprod",t);
+*** Slightly relaxed extraction bounds for biofuels.
+vm_fuExtr.up(t,regi,"pebios","5")$(t.val ge 2045)  = 1.4*p30_datapebio(regi,"pebios","5","maxprod",t);
+vm_fuExtr.up(t,regi,"pebios","5")$(t.val ge 2055)  = p30_datapebio(regi,"pebios","5","maxprod",t);
+vm_fuExtr.up(t,regi,"pebioil","5")$(t.val ge 2030) = 1.5*p30_datapebio(regi,"pebioil","5","maxprod",t);
+vm_fuExtr.up(t,regi,"pebioil","5")$(t.val ge 2050) = p30_datapebio(regi,"pebioil","5","maxprod",t);
 
 if(cm_1stgen_phaseout=0,
     vm_fuExtr.lo(t,regi,"pebios","5")$(t.val ge 2030)  = p30_datapebio(regi,"pebios","5","maxprod",t)*0.9;

modules/80_optimization/nash/datainput.gms

@@ -22,7 +22,6 @@ cm_iteration_max = 100;
  if(cm_nash_autoconverge eq 1,
 ***convergences thresholds - coarse 
   p80_surplusMaxTolerance(tradePe) = 1.5 * sm_EJ_2_TWa;          !! convert EJ/yr into internal unit TWa
-  p80_surplusMaxTolerance("pebiolc") = 4 * sm_EJ_2_TWa;         !! FIXME: temporarily use less refined value for pebiolc
   p80_surplusMaxTolerance("good") = 100/1000;                  !! in internal unit, trillion Dollar
   p80_surplusMaxTolerance("perm") = 300 * 12/44 / 1000;                !! convert MtCO2eq into internal unit GtC
    );