Merge pull request #195 from giannou/develop

fix misleading limit set on the number of iterations

config/default.cfg

@@ -478,12 +478,12 @@ cfg$RunsUsingTHISgdxAsBAU <- NA
 ############################################################
 
 #-------------------- switches ----------------------------------------------------
-# cm_iteration_max    "number of Negishi iterations (up to 49)"
+# cm_iteration_max    "number of Negishi iterations"
 # c_solver_try_max      "maximum number of inner iterations within one Negishi iteration (<10)"
 #*** Careful: for each inner_itr_count, the size of remind.lst can increase by 50MB!
 # cm_nash_autoconverge "choice of nash convergence mode"
 #  (0): manually set number of iterations by adjusting cm_iteration_max
-#  (1): run until solution is sufficiently converged  - coarse tolerances, quick solution.  ! donot use in production runs !
+#  (1): run until solution is sufficiently converged  - coarse tolerances, quick solution.  ! do not use in production runs !
 #  (2): run until solution is sufficiently converged  - fine tolerances, for production runs.
 # cm_MAgPIE_coupling "switch on coupling mode with MAgPIE"
 #  (off): off = REMIND expects to be run standalone (emission factors are used, shiftfactors are set to zero)

core/equations.gms

@@ -54,7 +54,7 @@ q_costInvTeAdj(t,regi,teAdj)..
 ;
 
 ***---------------------------------------------------------------------------
-*' Operation and maintenance resut form costs maintenance of existing facilities according to their capacity and
+*' Operation and maintenance costs from maintenance of existing facilities according to their capacity and
 *' operation of energy transformations according to the amount of produced secondary and final energy.
 ***---------------------------------------------------------------------------
 q_costOM(t,regi)..

main.gms

@@ -208,7 +208,7 @@ $setGlobal codePerformance  off       !! def = off
 ***-----------------------------------------------------------------------------
 ***--------------- declaration of parameters for switches ----------------------
 parameters
-cm_iteration_max      "number of Negishi iterations (up to 49)"
+cm_iteration_max      "number of Negishi iterations"
 c_solver_try_max      "maximum number of inner iterations within one Negishi iteration (<10)"
 c_keep_iteration_gdxes   "save intermediate iteration gdxes"
 cm_nash_autoconverge  "choice of nash convergence mode"

modules/32_power/module.gms

@@ -8,12 +8,12 @@
 *** SOF ./modules/32_power/module.gms
 *' @title Power sector
 *'
-*' @description  The 32_power module determine the operation production decision for the electricity supply.
+*' @description  The 32_power module determines the operation production decisions for the electricity supply.
 *'
 *'
-*'               The `IntC` realization (Integrated Costs) assume a single electricity market balance.
+*'               The `IntC` realization (Integrated Costs) assumes a single electricity market balance.
 *'
-*'               The `RLDC` realization (Residual Load Duration Curve) distinguish different operation electricity supply decisions under four distinct load bands, plus additional peak capacity requirements.
+*'               The `RLDC` realization (Residual Load Duration Curve) distinguishes different operation electricity supply decisions under four distinct load bands, plus additional peak capacity requirements.
 *'
 *' @authors Robert Pietzcker, Falko Ueckerdt, Renato Rodrigues