Skip to content

Commit

Permalink
Update CHANGELOG.md and comment.
Browse files Browse the repository at this point in the history
  • Loading branch information
dklein-pik committed Mar 26, 2024
1 parent 5eefde2 commit 23eed36
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion main.gms
Original file line number Diff line number Diff line change
Expand Up @@ -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
*'
Expand Down
6 changes: 2 additions & 4 deletions modules/80_optimization/nash/solve.gms
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 23eed36

Please sign in to comment.