Merge pull request remindmodel#1258 from tabeado/deltaCap_for_capCum

remove deltaCap time split for vm_capCum
fpiontek · Jan 12, 2024 · 2646a08 · 2646a08
2 parents f43a105 + 754e3ca
commit 2646a08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/core/equations.gms b/core/equations.gms
@@ -373,8 +373,7 @@ qm_deltaCapCumNet(ttot,regi,teLearn)$(ord(ttot) lt card(ttot) AND pm_ttot_val(tt
   vm_capCum(ttot+1,regi,teLearn)
   =e=
   sum(te2rlf(teLearn,rlf),
-         (pm_ts(ttot) / 2 * vm_deltaCap(ttot,regi,teLearn,rlf)) + (pm_ts(ttot+1) / 2 * vm_deltaCap(ttot+1,regi,teLearn,rlf))
-  )
+        pm_ts(ttot+1)* vm_deltaCap(ttot+1,regi,teLearn,rlf))
   +
   vm_capCum(ttot,regi,teLearn);
 

diff --git a/modules/22_subsidizeLearning/globallyOptimal/presolve.gms b/modules/22_subsidizeLearning/globallyOptimal/presolve.gms
@@ -18,9 +18,7 @@ display pm_capCumForeign;
 * calculate marginal benefit of spillovers in each region. This expression for the subsidy can be derived analytically.
 loop(regi$(pm_SolNonInfes(regi) eq 1),
     p22_marginalCapcumBenefit(ttot,regi,teLearn)  =  
-	pm_ts(ttot)/2 * (abs(qm_deltaCapCumNet.m(ttot,regi,teLearn)) / max(abs(qm_budget.m(ttot,regi)),1E-9)) 
-      + pm_ts(ttot)/2 * (abs(qm_deltaCapCumNet.m(ttot -1,regi,teLearn)) / max(abs(qm_budget.m(ttot,regi)),1E-9)) 
-
+	pm_ts(ttot) * (abs(qm_deltaCapCumNet.m(ttot,regi,teLearn)) / max(abs(qm_budget.m(ttot,regi)),1E-9)) 
 );