Make MACRO_CONCURRENT a GAMS compile-time variable

Author: khaeru

message_ix/model/MACRO/macro_solve.gms

@@ -38,32 +38,40 @@ C.FX(node_macro, macro_base_period) = c0(node_macro) ;
 I.FX(node_macro, macro_base_period) = i0(node_macro) ;
 EC.FX(node_macro, macro_base_period) = y0(node_macro) - i0(node_macro) - c0(node_macro) ;
 
-* Conditional execution based on solve_param
-if (solve_param = 1,    
-* solving the model region by region
-    node_active(node) = no ;
-    LOOP(node $ node_macro(node),
-        node_active(node_macro) = no ;
-        node_active(node) = YES;
-*       DISPLAY node_active ;
-* solve statement
-        SOLVE MESSAGE_MACRO MAXIMIZING UTILITY USING NLP ;
-* write model status summary (by node)
-*    status(node,'modelstat') = MESSAGE_MACRO.modelstat ;
-*    status(node,'solvestat') = MESSAGE_MACRO.solvestat ;
-*    status(node,'resUsd')    = MESSAGE_MACRO.resUsd ;
-*    status(node,'objEst')    = MESSAGE_MACRO.objEst ;
-*    status(node,'objVal')    = MESSAGE_MACRO.objVal ;
-     )
-elseif (solve_param = 2),
-*Solving model with all regions concurrently
-    node_active(node_macro) = YES;
-* solve statement
-    SOLVE MESSAGE_MACRO MAXIMIZING UTILITY USING NLP;
-* write model status summary
+$IFTHEN %MACRO_CONCURRENT% == "0"
+
+DISPLAY "Solve MACRO for each node in sequence";
+
+node_active(node) = NO ;
+
+LOOP(node$node_macro(node),
+  node_active(node_macro) = NO ;
+  node_active(node) = YES ;
+*  DISPLAY node_active ;
+
+  SOLVE MESSAGE_MACRO MAXIMIZING UTILITY USING NLP ;
+
+* Write model status summary for the current node
+*  status(node,'modelstat') = MESSAGE_MACRO.modelstat ;
+*  status(node,'solvestat') = MESSAGE_MACRO.solvestat ;
+*  status(node,'resUsd')    = MESSAGE_MACRO.resUsd ;
+*  status(node,'objEst')    = MESSAGE_MACRO.objEst ;
+*  status(node,'objVal')    = MESSAGE_MACRO.objVal ;
+);
+
+$ELSE
+
+DISPLAY "Solve MACRO for all nodes concurrently";
+
+node_active(node_macro) = YES;
+
+SOLVE MESSAGE_MACRO MAXIMIZING UTILITY USING NLP;
+
+* Write model status summary for all nodes
 * status('all','modelstat') = MESSAGE_MACRO.modelstat;
 * status('all','solvestat') = MESSAGE_MACRO.solvestat;
 * status('all','resUsd')    = MESSAGE_MACRO.resUsd;
 * status('all','objEst')    = MESSAGE_MACRO.objEst;
 * status('all','objVal')    = MESSAGE_MACRO.objVal;
-) ;
+
+$ENDIF