From d95ceb244809d1a8355543919fd303f8f2bca36d Mon Sep 17 00:00:00 2001
From: florianh <humpenoeder@pik-potsdam.de>
Date: Thu, 10 Aug 2023 09:45:06 +0200
Subject: [PATCH] merge with develop branch

---
 modules/14_yields/managementcalib_aug19/preloop.gms  |  1 -
 modules/17_production/flexreg_apr16/declarations.gms |  2 +-
 modules/17_production/flexreg_apr16/presolve.gms     |  4 +---
 .../71_disagg_lvst/foragebased_aug18/presolve.gms    | 12 ------------
 .../71_disagg_lvst/foragebased_aug18/realization.gms |  1 -
 5 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 modules/71_disagg_lvst/foragebased_aug18/presolve.gms

diff --git a/modules/14_yields/managementcalib_aug19/preloop.gms b/modules/14_yields/managementcalib_aug19/preloop.gms
index 005966b8b8..b674237a64 100644
--- a/modules/14_yields/managementcalib_aug19/preloop.gms
+++ b/modules/14_yields/managementcalib_aug19/preloop.gms
@@ -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
diff --git a/modules/17_production/flexreg_apr16/declarations.gms b/modules/17_production/flexreg_apr16/declarations.gms
index 8187fd3fa9..235855f322 100644
--- a/modules/17_production/flexreg_apr16/declarations.gms
+++ b/modules/17_production/flexreg_apr16/declarations.gms
@@ -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) ####################
diff --git a/modules/17_production/flexreg_apr16/presolve.gms b/modules/17_production/flexreg_apr16/presolve.gms
index c0def1bbc7..09413ece73 100644
--- a/modules/17_production/flexreg_apr16/presolve.gms
+++ b/modules/17_production/flexreg_apr16/presolve.gms
@@ -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
 
     );
diff --git a/modules/71_disagg_lvst/foragebased_aug18/presolve.gms b/modules/71_disagg_lvst/foragebased_aug18/presolve.gms
deleted file mode 100644
index 70d4ee4a61..0000000000
--- a/modules/71_disagg_lvst/foragebased_aug18/presolve.gms
+++ /dev/null
@@ -1,12 +0,0 @@
-*** |  (C) 2008-2023 Potsdam Institute for Climate Impact Research (PIK)
-*** |  authors, and contributors see CITATION.cff file. This file is part
-*** |  of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of
-*** |  AGPL-3.0, you are granted additional permissions described in the
-*** |  MAgPIE License Exception, version 1.0 (see LICENSE file).
-*** |  Contact: magpie@pik-potsdam.de
-
-i71_forage_cell_prod_share(j,kforage) =
-*       vm_prod.l(j,kforage) / (sum(cell(i,j),sum(cell2(i,j3), vm_prod.l(j3,kforage))) + 10**(-6));
-       vm_prod.l(j,kforage) / (sum(cell(i,j), vm_prod_reg.l(i,kforage)) + 10**(-6));
-
-* Note that $10^{-6}$ is required to avoid division by zero.
diff --git a/modules/71_disagg_lvst/foragebased_aug18/realization.gms b/modules/71_disagg_lvst/foragebased_aug18/realization.gms
index 5d59ae546a..11effc8e81 100644
--- a/modules/71_disagg_lvst/foragebased_aug18/realization.gms
+++ b/modules/71_disagg_lvst/foragebased_aug18/realization.gms
@@ -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) ###############################