rename GAMS model "hybrid" to "remindgamsmodel" for more debugging clarity

Author: 0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q

core/loop.gms

@@ -9,21 +9,21 @@
 *--------------------------------------------------------------------------
 ***         solveoptions
 *--------------------------------------------------------------------------
-option limcol    = 0;
-option limrow    = 0;
-hybrid.optfile   = 1;
-hybrid.holdfixed = 1;
-hybrid.scaleopt  = 1;
-option savepoint = 0;
-option resLim    = 3e6;
-option solprint  = off;
-o_modelstat      = 100;
+remindgamsmodel.optfile   = 1;
+remindgamsmodel.holdfixed = 1;
+remindgamsmodel.scaleopt  = 1;
+option limcol             = 0;
+option limrow             = 0;
+option savepoint          = 0;
+option resLim             = 3e6;
+option solprint           = off;
+o_modelstat               = 100;
 
 $ifthen.calibrate "%CES_parameters%" == "calibrate"   !! CES_parameters
 $ifthen.subsectors "%industry%" == "subsectors"       !! industry
 !! Calibrating industry/subsectors lead to random infeasibilities on the order
 !! of 1e-15.  Relaxing this attribute a little solves this problem.
-hybrid.tolinfeas = 1e-14;
+remindgamsmodel.tolinfeas = 1e-14;
 $endif.subsectors
 $endif.calibrate
 

core/preloop.gms

@@ -11,8 +11,8 @@
 ***                   MODEL             HYBRID
 ***------------------------------------------------------------------------------
 ***------------------------------------------------------------------------------
-*** definition of model hybrid 
-model hybrid /all/;
+*** definition of model remindgamsmodel 
+model remindgamsmodel /all/;
 
 ***------------------------------------------------------------------------------
 ***------------------------------------------------------------------------------

modules/80_optimization/nash/solve.gms

@@ -7,11 +7,11 @@
 *** SOF ./modules/80_optimization/nash/solve.gms
 
 regi(all_regi) = NO;
-hybrid.solvelink = 3; !! activate multiple-CPU mode for GAMS
-hybrid.optfile   = 9;
+remindgamsmodel.solvelink = 3; !! activate multiple-CPU mode for GAMS
+remindgamsmodel.optfile   = 9;
 
 if(cm_nash_mode eq 1,
-  hybrid.solvelink = 0;  !! activate single-CPU mode for GAMS
+  remindgamsmodel.solvelink = 0;  !! activate single-CPU mode for GAMS
 );
 
 loop (all_regi,
@@ -50,29 +50,29 @@ $endif.repeatNonOpt
     logfile.nd = sm_tmp2;
   );
 
-  solve hybrid using nlp maximizing vm_welfareGlob;
+  solve remindgamsmodel using nlp maximizing vm_welfareGlob;
 
   if(cm_nash_mode eq 1,
-    p80_repy_thisSolitr(all_regi,"solvestat") = hybrid.solvestat;
-    p80_repy_thisSolitr(all_regi,"modelstat") = hybrid.modelstat;
-    p80_repy_thisSolitr(all_regi,"resusd")    = hybrid.resusd;
-    p80_repy_thisSolitr(all_regi,"objval")    = hybrid.objval;
+    p80_repy_thisSolitr(all_regi,"solvestat") = remindgamsmodel.solvestat;
+    p80_repy_thisSolitr(all_regi,"modelstat") = remindgamsmodel.modelstat;
+    p80_repy_thisSolitr(all_regi,"resusd")    = remindgamsmodel.resusd;
+    p80_repy_thisSolitr(all_regi,"objval")    = remindgamsmodel.objval;
     if (p80_repy_thisSolitr(all_regi,"modelstat") eq 2,
       p80_repyLastOptim(all_regi,"objval") = p80_repy(all_regi,"objval");
     );
   );
 
   regi(all_regi) = NO;
-  p80_handle(all_regi) = hybrid.handle;
+  p80_handle(all_regi) = remindgamsmodel.handle;
 );  !! close regi loop
 
 if(cm_nash_mode eq 2,
 repeat
   loop (all_regi$handlecollect(p80_handle(all_regi)),
-    p80_repy_thisSolitr(all_regi,"solvestat") = hybrid.solvestat;
-    p80_repy_thisSolitr(all_regi,"modelstat") = hybrid.modelstat;
-    p80_repy_thisSolitr(all_regi,"resusd")    = hybrid.resusd;
-    p80_repy_thisSolitr(all_regi,"objval")    = hybrid.objval;
+    p80_repy_thisSolitr(all_regi,"solvestat") = remindgamsmodel.solvestat;
+    p80_repy_thisSolitr(all_regi,"modelstat") = remindgamsmodel.modelstat;
+    p80_repy_thisSolitr(all_regi,"resusd")    = remindgamsmodel.resusd;
+    p80_repy_thisSolitr(all_regi,"objval")    = remindgamsmodel.objval;
 
     if (p80_repy_thisSolitr(all_regi,"modelstat") eq 2,
       p80_repyLastOptim(all_regi,"objval") = p80_repy_thisSolitr(all_regi,"objval");

modules/80_optimization/negishi/solve.gms

@@ -6,7 +6,7 @@
 *** |  Contact: [email protected]
 *** SOF ./modules/80_optimization/negishi/solve.gms
 
-hybrid.optfile = s80_cnptfile;
+remindgamsmodel.optfile = s80_cnptfile;
 
 ***      -------------------------------------------------------------------
 ***                     SOLVE statement
@@ -16,8 +16,8 @@ if (execError > 0,
   abort "at least one execution error occured, abort.gdx written";
 );
 
-solve hybrid using nlp maximizing vm_welfareGlob;
-o_modelstat = hybrid.modelstat;
+solve remindgamsmodel using nlp maximizing vm_welfareGlob;
+o_modelstat = remindgamsmodel.modelstat;
 
 *this parameter is especially useful in nash mode
 pm_SolNonInfes(regi) = 0;

modules/80_optimization/testOneRegi/solve.gms

@@ -6,8 +6,8 @@
 *** |  Contact: [email protected]
 *** SOF ./modules/80_optimization/testOneRegi/solve.gms
 
-hybrid.optfile = 9;
-$IF %cm_quick_mode% == "on" hybrid.optfile = 6;
+remindgamsmodel.optfile = 9;
+$IF %cm_quick_mode% == "on" remindgamsmodel.optfile = 6;
 
 ***reduce the problem to one region
 regi(all_regi) = NO;
@@ -42,9 +42,9 @@ if (cm_keep_presolve_gdxes eq 1,
   logfile.nd = sm_tmp2;
 );
 
-solve hybrid using nlp maximizing vm_welfareGlob;
+solve remindgamsmodel using nlp maximizing vm_welfareGlob;
 
-o_modelstat = hybrid.modelstat;
+o_modelstat = remindgamsmodel.modelstat;
 display o_modelstat;
 
 ***helper parameter to access regional solution status