Skip to content

Commit

Permalink
added R generated updated of sections of modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@DavidhoPIK
DavidhoPIK committed May 27, 2024
1 parent a963021 commit 32e2b07
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 46 deletions.
18 changes: 9 additions & 9 deletions modules/70_livestock/fbask_jan16_sticky/declarations.gms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ parameters

*#################### R SECTION START (OUTPUT DECLARATIONS) ####################
parameters
ov_dem_feed(t,i,kap,kall,type) Regional feed demand including byproducts (mio. tDM per yr)
ov_cost_prod_livst(t,i,factors,type) Livestock factor costs (mio. USD05MER per yr)
ov_cost_prod_fish(t,i,type) Fish factor costs (mio. USD05MER per yr)
ov70_investment(t,i,kli,type) Investment costs in immobile farm capital (mio USD05MER per yr)
oq70_feed(t,i,kap,kall,type) Regional feed demand
oq70_cost_prod_liv_labor(t,i,type) Regional labor costs for livestock production
oq70_cost_prod_liv_capital(t,i,type) Regional investment costs for livestock production
oq70_investment(t,i,kli,type) Cellular immobile investments into farm capital (mio USD05MER)
oq70_cost_prod_fish(t,i,type) Regional factor input costs for fish production
ov_dem_feed(t,i,kap,kall,type) Regional feed demand including byproducts (mio. tDM per yr)
ov_cost_prod_livst(t,i,factors,type) Livestock factor costs (mio. USD05MER per yr)
ov_cost_prod_fish(t,i,type) Fish factor costs (mio. USD05MER per yr)
ov70_investment(t,i,kli,type) Investment in immobile farm capital (mio USD05MER per yr)
oq70_feed(t,i,kap,kall,type) Regional feed demand
oq70_cost_prod_liv_labor(t,i,type) Regional labor costs for livestock production
oq70_cost_prod_liv_capital(t,i,type) Regional investment costs in farm capital
oq70_investment(t,i,kli,type) Regional investments into farm capital
oq70_cost_prod_fish(t,i,type) Regional factor input costs for fish production
;
*##################### R SECTION END (OUTPUT DECLARATIONS) #####################
72 changes: 36 additions & 36 deletions modules/70_livestock/fbask_jan16_sticky/postsolve.gms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,41 @@
p70_capital(t+1,i,kli) = p70_capital(t,i,kli) + v70_investment.l(i,kli);

*#################### R SECTION START (OUTPUT DEFINITIONS) #####################
ov_dem_feed(t,i,kap,kall,"marginal") = vm_dem_feed.m(i,kap,kall);
ov_cost_prod_livst(t,i,factors,"marginal") = vm_cost_prod_livst.m(i,factors);
ov_cost_prod_fish(t,i,"marginal") = vm_cost_prod_fish.m(i);
ov70_investment(t,i,kli,"marginal") = v70_investment.m(i,kli);
oq70_feed(t,i,kap,kall,"marginal") = q70_feed.m(i,kap,kall);
oq70_cost_prod_liv_labor(t,i,"marginal") = q70_cost_prod_liv_labor.m(i);
oq70_cost_prod_liv_capital(t,i,"marginal") = q70_cost_prod_liv_capital.m(i);
oq70_investment(t,i,kli,"marginal") = q70_investment.m(i,kli);
oq70_cost_prod_fish(t,i,"marginal") = q70_cost_prod_fish.m(i);
ov_dem_feed(t,i,kap,kall,"level") = vm_dem_feed.l(i,kap,kall);
ov_cost_prod_livst(t,i,factors,"level") = vm_cost_prod_livst.l(i,factors);
ov_cost_prod_fish(t,i,"level") = vm_cost_prod_fish.l(i);
ov70_investment(t,i,kli,"level") = v70_investment.l(i,kli);
oq70_feed(t,i,kap,kall,"level") = q70_feed.l(i,kap,kall);
oq70_cost_prod_liv_labor(t,i,"level") = q70_cost_prod_liv_labor.l(i);
oq70_cost_prod_liv_capital(t,i,"level") = q70_cost_prod_liv_capital.l(i);
oq70_investment(t,i,kli,"level") = q70_investment.l(i,kli);
oq70_cost_prod_fish(t,i,"level") = q70_cost_prod_fish.l(i);
ov_dem_feed(t,i,kap,kall,"upper") = vm_dem_feed.up(i,kap,kall);
ov_cost_prod_livst(t,i,factors,"upper") = vm_cost_prod_livst.up(i,factors);
ov_cost_prod_fish(t,i,"upper") = vm_cost_prod_fish.up(i);
ov70_investment(t,i,kli,"upper") = v70_investment.up(i,kli);
oq70_feed(t,i,kap,kall,"upper") = q70_feed.up(i,kap,kall);
oq70_cost_prod_liv_labor(t,i,"upper") = q70_cost_prod_liv_labor.up(i);
oq70_cost_prod_liv_capital(t,i,"upper") = q70_cost_prod_liv_capital.up(i);
oq70_investment(t,i,kli,"upper") = q70_investment.up(i,kli);
oq70_cost_prod_fish(t,i,"upper") = q70_cost_prod_fish.up(i);
ov_dem_feed(t,i,kap,kall,"lower") = vm_dem_feed.lo(i,kap,kall);
ov_cost_prod_livst(t,i,factors,"lower") = vm_cost_prod_livst.lo(i,factors);
ov_cost_prod_fish(t,i,"lower") = vm_cost_prod_fish.lo(i);
ov70_investment(t,i,kli,"lower") = v70_investment.lo(i,kli);
oq70_feed(t,i,kap,kall,"lower") = q70_feed.lo(i,kap,kall);
oq70_cost_prod_liv_labor(t,i,"lower") = q70_cost_prod_liv_labor.lo(i);
oq70_cost_prod_liv_capital(t,i,"lower") = q70_cost_prod_liv_capital.lo(i);
oq70_investment(t,i,kli,"lower") = q70_investment.lo(i,kli);
oq70_cost_prod_fish(t,i,"lower") = q70_cost_prod_fish.lo(i);
ov_dem_feed(t,i,kap,kall,"marginal") = vm_dem_feed.m(i,kap,kall);
ov_cost_prod_livst(t,i,factors,"marginal") = vm_cost_prod_livst.m(i,factors);
ov_cost_prod_fish(t,i,"marginal") = vm_cost_prod_fish.m(i);
ov70_investment(t,i,kli,"marginal") = v70_investment.m(i,kli);
oq70_feed(t,i,kap,kall,"marginal") = q70_feed.m(i,kap,kall);
oq70_cost_prod_liv_labor(t,i,"marginal") = q70_cost_prod_liv_labor.m(i);
oq70_cost_prod_liv_capital(t,i,"marginal") = q70_cost_prod_liv_capital.m(i);
oq70_investment(t,i,kli,"marginal") = q70_investment.m(i,kli);
oq70_cost_prod_fish(t,i,"marginal") = q70_cost_prod_fish.m(i);
ov_dem_feed(t,i,kap,kall,"level") = vm_dem_feed.l(i,kap,kall);
ov_cost_prod_livst(t,i,factors,"level") = vm_cost_prod_livst.l(i,factors);
ov_cost_prod_fish(t,i,"level") = vm_cost_prod_fish.l(i);
ov70_investment(t,i,kli,"level") = v70_investment.l(i,kli);
oq70_feed(t,i,kap,kall,"level") = q70_feed.l(i,kap,kall);
oq70_cost_prod_liv_labor(t,i,"level") = q70_cost_prod_liv_labor.l(i);
oq70_cost_prod_liv_capital(t,i,"level") = q70_cost_prod_liv_capital.l(i);
oq70_investment(t,i,kli,"level") = q70_investment.l(i,kli);
oq70_cost_prod_fish(t,i,"level") = q70_cost_prod_fish.l(i);
ov_dem_feed(t,i,kap,kall,"upper") = vm_dem_feed.up(i,kap,kall);
ov_cost_prod_livst(t,i,factors,"upper") = vm_cost_prod_livst.up(i,factors);
ov_cost_prod_fish(t,i,"upper") = vm_cost_prod_fish.up(i);
ov70_investment(t,i,kli,"upper") = v70_investment.up(i,kli);
oq70_feed(t,i,kap,kall,"upper") = q70_feed.up(i,kap,kall);
oq70_cost_prod_liv_labor(t,i,"upper") = q70_cost_prod_liv_labor.up(i);
oq70_cost_prod_liv_capital(t,i,"upper") = q70_cost_prod_liv_capital.up(i);
oq70_investment(t,i,kli,"upper") = q70_investment.up(i,kli);
oq70_cost_prod_fish(t,i,"upper") = q70_cost_prod_fish.up(i);
ov_dem_feed(t,i,kap,kall,"lower") = vm_dem_feed.lo(i,kap,kall);
ov_cost_prod_livst(t,i,factors,"lower") = vm_cost_prod_livst.lo(i,factors);
ov_cost_prod_fish(t,i,"lower") = vm_cost_prod_fish.lo(i);
ov70_investment(t,i,kli,"lower") = v70_investment.lo(i,kli);
oq70_feed(t,i,kap,kall,"lower") = q70_feed.lo(i,kap,kall);
oq70_cost_prod_liv_labor(t,i,"lower") = q70_cost_prod_liv_labor.lo(i);
oq70_cost_prod_liv_capital(t,i,"lower") = q70_cost_prod_liv_capital.lo(i);
oq70_investment(t,i,kli,"lower") = q70_investment.lo(i,kli);
oq70_cost_prod_fish(t,i,"lower") = q70_cost_prod_fish.lo(i);
*##################### R SECTION END (OUTPUT DEFINITIONS) ######################

2 changes: 1 addition & 1 deletion modules/70_livestock/fbask_jan16_sticky/preloop.gms
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ $if "%c70_fac_req_regr%" == "reg" i70_fac_req_livst(t_all,i,kli)$(m_year(t_all)

*** Section implementing the "sticky" part of the realization
* Get the initial production from the historic data
p70_initial_1995_prod(i,kli) = f70_hist_prod_livst("y1995",i,kli,"dm");
p70_initial_1995_prod(i,kli) = f70_hist_prod_livst("y1995",i,kli,"dm");

0 comments on commit 32e2b07

Please sign in to comment.