abort statement if intake_detail_scen_target is negative

magpiemodel · Jan 18, 2024 · 400eb2d · 400eb2d
1 parent 9195bcc
commit 400eb2d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/15_food/anthro_iso_jun22/exodietmacro.gms b/modules/15_food/anthro_iso_jun22/exodietmacro.gms
@@ -595,8 +595,10 @@ elseif s15_exo_diet = 3,
     (i15_intake_scen_target(t,iso) - sum(EAT_nonstaples, i15_intake_detailed_scen_target(t,iso,EAT_nonstaples)))
      * (p15_intake_detail(t,iso,EAT_staples) / sum(EAT_staples2, p15_intake_detail(t,iso,EAT_staples2)));
 
-  if (i15_intake_detailed_scen_target(t,iso,EAT_staples) < 0, abort "The parameter i15_intake_detailed_scen_target became negative after calorie balancing.", i15_intake_detailed_scen_target(t,iso,EAT_staples););
-* JAN: Is there if(any(x)) in GAMS? Or does this above check for each individual and therefore is a if any?
+  if (smin((iso,EAT_staples), i15_intake_detailed_scen_target(t,iso,EAT_staples)) < 0,
+     abort "The parameter i15_intake_detailed_scen_target became negative after calorie balancing.";
+     );
+
 
 );
 *** End of MAgPIE-specific realization of the EAT Lancet diet