recovered original behaviour for <0 case

magpiemodel · May 23, 2024 · 185fedc · 185fedc
1 parent e2f3698
commit 185fedc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/14_yields/managementcalib_aug19/preloop.gms b/modules/14_yields/managementcalib_aug19/preloop.gms
@@ -129,7 +129,8 @@ if ((s14_calib_ir2rf = 1),
    = (sum((cell(i,j),w), fm_croparea("y1995",j,w,knbe14) * i14_yields_calib("y1995",j,knbe14,w)) /
       sum((cell(i,j),w), fm_croparea("y1995",j,w,knbe14)))$(sum((cell(i,j),w), fm_croparea("y1995",j,w,knbe14))>0.00001)
    + (sum((cell(i,j),w), i14_croparea_total("y1995",w,j) * f14_yields("y1995",j,knbe14,w)) /
-      sum((cell(i,j),w), i14_croparea_total("y1995",w,j)))$(sum((cell(i,j),w), fm_croparea("y1995",j,w,knbe14))<0.00001);
+      sum((cell(i,j),w), i14_croparea_total("y1995",w,j)))
+      $(sum((cell(i,j),w), fm_croparea("y1995",j,w,knbe14))<0.00001 and sum((cell(i,j),w), fm_croparea("y1995",j,w,knbe14))>=0);
 
   i14_yields_calib(t,j,knbe14,w) = sum((cell(i,j)), i14_fao_yields_hist("y1995",i,knbe14) /
                                                       i14_modeled_yields_hist2(i,knbe14)) *