Merge branch 'develop' of https://github.com/remindmodel/remind into develop

README.md

@@ -13,7 +13,8 @@ The macro-economic core of REMIND is a Ramsey-type optimal growth model
 in which intertemporal global welfare is optimized subject to equilibrium constraints.
 
 ## DOCUMENTATION
-<!-- The model documentation for version 2.1 can be found at XXX.-->
+The model documentation for version 2.1.0 can be found at https://rse.pik-potsdam.de/doc/remind/2.1.0.
+
 A most recent version of the documentation can also be extracted from the
 model source code via the R package goxygen
 (https://github.com/pik-piam/goxygen). To extract the documentation, install the

scripts/start/readme.txt

@@ -2,7 +2,7 @@ Documentation of the new procedure of starting REMIND runs (DK, LB, January 2020
 
 Why did we redesign the procedure?
 
-The old code was spread across more files, the user needed to edit files in order to provide the SLURM options, and a substantial part of the code was run on the login node before finally submiting the job to SLURM. The new structure lets the user choose the SLURM options interactively when starting the runs. The amount of code that is executed on the login node was minimized. Most of the work load that is required to set up a run is included in the SLURM batch job. Finally, the code is strucutred more clearly and spread across less files.
+The old code was spread across many files, the user needed to edit files in order to provide the SLURM options, and a substantial part of the code was run on the login node before finally submiting the job to SLURM. The new structure lets the user choose the SLURM options interactively when starting the runs. The amount of code that is executed on the login node was minimized. Most of the work load that is required to set up a run is included in the SLURM batch job. Finally, the code is strucutred more clearly and spread across less files.
 
 To start a run type in the main directory of REMIND:
 

start.R

@@ -196,6 +196,7 @@ if ('--restart' %in% argv) {
   for (outputdir in outputdirs) {
     cat("Restarting",outputdir,"\n")
     load(paste0("output/",outputdir,"/config.Rdata")) # read config.Rdata from results folder
+    cfg$slurmConfig <- slurmConfig # update the slurmConfig setting to what the user just chose (it was being ignored before)
     submit(cfg, restart = TRUE)
     #cat(paste0("output/",outputdir,"/config.Rdata"),"\n")
   }

tutorials/1_GettingREMIND.md

@@ -6,7 +6,11 @@ Anastasis Giannousakis (<giannou@pik-potsdam.de>), Felix Schreyer (<felix.schrey
 HOW TO INSTALL
 --------------
 
-To get the REMIND code you need to have git installed and then clone the model from <https://github.com/remindmodel/remind.git>.
+To get the REMIND code you need to have git installed and then clone the model from <https://github.com/remindmodel/remind.git>. To get a specific release (e.g. 2.1.0) please type 
+
+``` bash
+git clone -b v2.1.0 https://github.com/remindmodel/remind.git 
+```
 
 REMIND requires *GAMS* (<https://www.gams.com/>) including licenses for the solvers *CONOPT* and (optionally) *CPLEX* for its core calculations. As the model benefits significantly from recent improvements in *GAMS* and *CONOPT4* it is recommended to work with the most recent versions of both. Please make sure that the GAMS installation path is added to the PATH variable of the system: