bugfix

magpiemodel · Sep 24, 2024 · 6b93227 · 6b93227
1 parent 7e22298
commit 6b93227
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/70_livestock/fbask_jan16_sticky/presolve.gms b/modules/70_livestock/fbask_jan16_sticky/presolve.gms
@@ -55,14 +55,14 @@ else
 
 *' @stop
 
-p70_cost_share_calibration(i) = f70_hist_cap_share("y2010",i)-(f70_cap_share_reg("slope")*log10(sum(i_to_iso(i,iso),(im_gdp_pc_ppp_iso("y2010",iso) * fm_gdp_defl_ppp)))+f70_cap_share_reg("intercept"));
+p70_cost_share_calibration(i) = f70_hist_cap_share("y2010",i)-(f70_cap_share_reg("slope")*log10(sum(i_to_iso(i,iso),(im_gdp_pc_ppp_iso("y2010",iso) * fm_gdp_defl_ppp(iso))))+f70_cap_share_reg("intercept"));
 
 if (m_year(t)<2010,
  p70_cost_share_livst(t,i,"capital") = f70_hist_cap_share(t,i);
  p70_cost_share_livst(t,i,"labor")   = 1 - f70_hist_cap_share(t,i);
 
 elseif (m_year(t)>=2010),
- p70_cost_share_livst(t,i,"capital") = f70_cap_share_reg("slope")*log10(sum(i_to_iso(i,iso),(im_gdp_pc_ppp_iso(t,iso) * fm_gdp_defl_ppp))))+f70_cap_share_reg("intercept")+p70_cost_share_calibration(i);
+ p70_cost_share_livst(t,i,"capital") = f70_cap_share_reg("slope")*log10(sum(i_to_iso(i,iso),(im_gdp_pc_ppp_iso(t,iso) * fm_gdp_defl_ppp(iso))))+f70_cap_share_reg("intercept")+p70_cost_share_calibration(i);
  p70_cost_share_livst(t,i,"labor")   = 1 - p70_cost_share_livst(t,i,"capital");
 );