bugfix

magpiemodel · Aug 22, 2023 · c33ebca · c33ebca
1 parent a9c1230
commit c33ebca
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/modules/70_livestock/fbask_jan16/presolve.gms b/modules/70_livestock/fbask_jan16/presolve.gms
@@ -35,13 +35,13 @@ p70_cattle_feed_pc_proxy(t,i,kli_rd) = pm_kcal_pc_initial(t,i,kli_rd)*im_feed_ba
 *' The parameter `p70_incr_cattle` describes the changes in the number of cattle
 *' relative to the previous time step:
 
-p70_incr_cattle(t,i)  =  1$(ord(t)=1)
-     + (
-          ( p70_cattle_feed_pc_proxy(t,i,"livst_rum") * (p70_cattle_stock_proxy(t,i)/p70_cattle_stock_proxy(t-1,i))
-            +
-            p70_cattle_feed_pc_proxy(t,i,"livst_milk") * (p70_milk_cow_proxy(t,i)/p70_milk_cow_proxy(t-1,i)) )
-          / sum(kli_rd, p70_cattle_feed_pc_proxy(t,i,kli_rd) )
-       )$(ord(t)>1);
+if (ord(t)>1,
+   p70_incr_cattle(t,i) = ( (p70_cattle_feed_pc_proxy(t,i,"livst_rum")  + 10**(-6))* (p70_cattle_stock_proxy(t,i)/p70_cattle_stock_proxy(t-1,i))
+                                          +  (p70_cattle_feed_pc_proxy(t,i,"livst_milk") + 10**(-6)) * (p70_milk_cow_proxy(t,i)/p70_milk_cow_proxy(t-1,i)) )
+                                        / sum(kli_rd, p70_cattle_feed_pc_proxy(t,i,kli_rd) + 10**(-6));
+else
+   p70_incr_cattle(t,i) = 1;
+);
 
 *' The pasture management factor is calculated by applying a linear relationship 
 *' that links changes in pasture management with changes in the number of cattle: