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

tabeado · Mar 4, 2024 · abd21a7 · abd21a7
2 parents 1e73fcf + db6f248
commit abd21a7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -251,7 +251,7 @@ authors:
   affiliation: "Potsdam Institute for Climate Impact Research"
 
 title: REMIND - REgional Model of INvestments and Development
-version: "3.2.1.dev1226"
+version: "3.2.1.dev1230"
 date-released: 2024-03-01
 repository-code: https://github.com/remindmodel/remind
 keywords:

diff --git a/config/default.cfg b/config/default.cfg
@@ -69,7 +69,7 @@ cfg$validationmodel_name <- "VALIDATIONREMIND"
 
 #### model version of the overall model (used for run statistics only).
 # automatically generated for development versions, updated by hand for releases
-cfg$model_version <- "3.2.1.dev1226"
+cfg$model_version <- "3.2.1.dev1230"
 
 #### settings ####
 cfg$gms <- list()

diff --git a/start_bundle_coupled.R b/start_bundle_coupled.R
@@ -552,7 +552,7 @@ for(scen in common){
       errorsfound <- errorsfound + cfg_rem$errorsfoundInCheckFixCfg
     }
 
-    if (! any(c("--test", "--gamscompile")) %in% flags) {
+    if (! any(c("--test", "--gamscompile") %in% flags)) {
       Rdatafile <- paste0(fullrunname, ".RData")
       message("Save settings to ", Rdatafile)
       save(path_remind, path_magpie, cfg_rem, cfg_mag, runname, fullrunname, max_iterations, start_iter,