removing duplication for the pm_capCumForeign definition from the opt…

…imization module

modules/80_optimization/nash/not_used.txt

@@ -12,3 +12,4 @@ pm_taxCO2eq,         parameter,   ???
 pm_ttot_val,         parameter,   ???
 pm_welf,             parameter,   ???
 vm_dummyBudget,      input,       questionnaire
+pm_capCumForeign,    parameter,   defined at module 22

modules/80_optimization/nash/presolve.gms

@@ -10,7 +10,6 @@
 *ML+LB 20140107* update of climate externality (carbon market)
 *LB* 20140506 update of climate externality (link to the climate module)
 *AJS* TODO: this is non-optimal: in summing over regi2, we'd like to keep the last known optimal value. To achieve that, param0 should not be overwritten in core/presolve.gms - we'd have to make p80_repynoninfes an interface.  
-pm_capCumForeign(ttot,regi,teLearn)$((ttot.val ge 2005) and (pm_SolNonInfes(regi) eq 1)) = sum(regi2$((NOT sameas(regi,regi2))), pm_capCum0(ttot,regi2,teLearn));
 
 pm_cumEff(ttot,regi, in)$(ttot.val ge 2005 and pm_SolNonInfes(regi) eq 1) = sum( regi2$(pm_SolNonInfes(regi2) eq 1), (pm_cesdata("2005",regi2,in,"eff") * vm_effGr.l(ttot,regi2,in))) - (pm_cesdata("2005",regi,in,"eff") * vm_effGr.l(ttot,regi,in)); !! TODO: take care of the case of infeasible solution