Skip to content

Commit

Permalink
merge with develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
flohump committed Aug 10, 2023
1 parent 1685f12 commit d95ceb2
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 18 deletions.
1 change: 0 additions & 1 deletion modules/14_yields/managementcalib_aug19/preloop.gms
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ if ((s14_calib_ir2rf = 1),
i14_yields_calib(t,j,knbe14,w);

pm_yields_semi_calib(j,knbe14,w) = i14_yields_calib("y1995",j,knbe14,w);
pm_yields_semi_calib(j,"pasture",w) = i14_yields_calib("y1995",j,"pasture",w);
);

*' @stop
Expand Down
2 changes: 1 addition & 1 deletion modules/17_production/flexreg_apr16/declarations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ equations
;

parameters
pm_prod_init(j,k) Production initialization for year 1995 (tDM per yr)
pm_prod_init(j,kcr) Production initialization for year 1995 (tDM per yr)
;

*#################### R SECTION START (OUTPUT DECLARATIONS) ####################
Expand Down
4 changes: 1 addition & 3 deletions modules/17_production/flexreg_apr16/presolve.gms
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@


pm_prod_init(j,kcr)=sum(w,fm_croparea("y1995",j,w,kcr)*pm_yields_semi_calib(j,kcr,w));
pm_prod_init(j,"pasture")=sum(w,pm_land_start(j,"past")*pm_yields_semi_calib(j,"pasture",w));

if (ord(t) = 1,

$ifthen "%c17_prod_init%" == "on"
vm_prod.l(j,kve) = pm_prod_init(j,kve);
vm_prod_reg.l(i,kve) = sum(cell(i,j), pm_prod_init(j,kve));
vm_prod.l(j,kcr) = pm_prod_init(j,kcr);
$endif

);
12 changes: 0 additions & 12 deletions modules/71_disagg_lvst/foragebased_aug18/presolve.gms

This file was deleted.

1 change: 0 additions & 1 deletion modules/71_disagg_lvst/foragebased_aug18/realization.gms
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@ $Ifi "%phase%" == "declarations" $include "./modules/71_disagg_lvst/foragebased_
$Ifi "%phase%" == "equations" $include "./modules/71_disagg_lvst/foragebased_aug18/equations.gms"
$Ifi "%phase%" == "scaling" $include "./modules/71_disagg_lvst/foragebased_aug18/scaling.gms"
$Ifi "%phase%" == "preloop" $include "./modules/71_disagg_lvst/foragebased_aug18/preloop.gms"
$Ifi "%phase%" == "presolve" $include "./modules/71_disagg_lvst/foragebased_aug18/presolve.gms"
$Ifi "%phase%" == "postsolve" $include "./modules/71_disagg_lvst/foragebased_aug18/postsolve.gms"
*######################## R SECTION END (PHASES) ###############################

0 comments on commit d95ceb2

Please sign in to comment.