Merge branch 'develop' of github.com:magpiemodel/magpie

CHANGELOG.md

@@ -21,7 +21,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### fixed
 - **scripts** fixed output/extra/disaggregation_LUH2.R. The script was not working any more because magpie4::protectedArea was changed to return protected area for all land types. Moreover, the script now also works for runs without dynamic forestry (default run) but with a warning message.
-
+- **scripts** fixed erronoeous if clause in output.R
+- **scripts** check_config does not warn about c_input_gdx_path anymore while running empty model
 
 ## [4.6.9] - 2023-07-27
 

output.R

@@ -64,7 +64,7 @@ runOutputs <- function(comp=NULL, output=NULL, outputdir=NULL, submit=NULL) {
     }
     identifier <- tmp
     # PATTERN
-    if(length(identifier==1) && identifier==(length(dirs)+1)){
+    if(length(identifier) == 1 && identifier == length(dirs) + 1) {
       cat("\nInsert the search pattern or the regular expression: ")
       pattern <- gms::getLine()
       id <- grep(pattern=pattern, dirs[-1], perl=TRUE)

scripts/start_functions.R

@@ -244,7 +244,7 @@ start_run <- function(cfg, scenario = NULL, codeCheck = TRUE, lock_model = TRUE)
 
   # Apply scenario settings ans check configuration file for consistency
   if(!is.null(scenario)) cfg <- gms::setScenario(cfg,scenario)
-  cfg <- gms::check_config(cfg, extras = c("info", "repositories"), saveCheck = TRUE)
+  cfg <- gms::check_config(cfg, extras = c("info", "repositories", "gms$c_input_gdx_path"), saveCheck = TRUE)
 
   # save model version
   cfg$info$version <- citation::read_cff("CITATION.cff")$version