diff --git a/CHANGELOG.md b/CHANGELOG.md index 324df04d0..7c2d862d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** add MAGICCv7.5.3 with AR6 settings as output script, add compareScenarios2 option [[#1475](https://github.com/remindmodel/remind/pull/1475), [[#1615](https://github.com/remindmodel/remind/pull/1615)] - **scripts** add 'make test-fix' which runs codeCheck in interactive mode, adjusting not_used.txt files - [[#1625](https://github.com/remindmodel/remind/pull/1625) + [[#1625](https://github.com/remindmodel/remind/pull/1625)] +- **80_optimization** For Nash mode: after infeasibilities continue in debug mode before aborting + [[#1636](https://github.com/remindmodel/remind/pull/1636)] ### fixed - fixed weights of energy carriers in `pm_IndstCO2Captured` diff --git a/main.gms b/main.gms index 39aef401b..09de085aa 100755 --- a/main.gms +++ b/main.gms @@ -455,7 +455,7 @@ parameter cm_iteration_max = 1; !! def = 1 *' parameter - cm_abortOnConsecFail "number of iterations of consecutive infeasibilities/failures to solve for one region, after which the run is automatically aborted" + cm_abortOnConsecFail "number of iterations of consecutive infeasibilities/failures to solve for one region, after which the run automatically switches to serial debug mode" ; cm_abortOnConsecFail = 5; !! def = 5 *' diff --git a/modules/80_optimization/nash/solve.gms b/modules/80_optimization/nash/solve.gms index 6d93144dc..b9ef1f1b0 100644 --- a/modules/80_optimization/nash/solve.gms +++ b/modules/80_optimization/nash/solve.gms @@ -124,10 +124,8 @@ $endif.repeatNonOpt *** in cm_nash_mode=1 (debug) mode, enable solprint for next sol_itr when last *** iteration was non-optimal: -if(cm_nash_mode eq 1, -if (o_modelstat ne 2, - option solprint = on; -); +if(cm_nash_mode eq 1 AND o_modelstat ne 2, + option solprint = on; ); !! add information if this region was solved in this iteration