From be5771d547250f92cc7e06844072a4b2f8b3f0fb Mon Sep 17 00:00:00 2001 From: orichters Date: Wed, 2 Aug 2023 11:26:08 +0200 Subject: [PATCH 1/3] remove check_config warning about c_input_gdx_path for empty model --- CHANGELOG.md | 2 +- scripts/start_functions.R | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4523f72d5d..66e2501a97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - ### fixed -- +- **scripts** check_config does not warn about c_input_gdx_path anymore while running empty model ## [4.6.9] - 2023-07-27 diff --git a/scripts/start_functions.R b/scripts/start_functions.R index 25de9122b7..55bda9ae88 100644 --- a/scripts/start_functions.R +++ b/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 From 159a064444990f22e03a660e2735efedfad82c59 Mon Sep 17 00:00:00 2001 From: Jan Philipp Dietrich Date: Wed, 16 Aug 2023 13:53:34 +0200 Subject: [PATCH 2/3] bugfix in output.R --- output.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/output.R b/output.R index 3e3ef4e865..440b6d65d5 100644 --- a/output.R +++ b/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) From 1c6a9d0d9f48602803649ecdce57c7f6125c22b8 Mon Sep 17 00:00:00 2001 From: Jan Philipp Dietrich Date: Wed, 16 Aug 2023 13:56:32 +0200 Subject: [PATCH 3/3] updated CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8bb833e3a..4e5e46ea52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ 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 ## [4.6.9] - 2023-07-27