diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aa01656c..51efe188b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - ### fixed +- **scripts** Fix call to harmonization and infilling console entry point in `climateAssessmentInterimRun.R` + [[#2484](https://github.com/remindmodel/remind/pull/2484)] - diff --git a/scripts/input/climateAssessmentInterimRun.R b/scripts/input/climateAssessmentInterimRun.R index afe5bad7c..4c7a95824 100644 --- a/scripts/input/climateAssessmentInterimRun.R +++ b/scripts/input/climateAssessmentInterimRun.R @@ -48,7 +48,7 @@ magiccEnv <- c( magiccInit <- condaInit(how = "pik-cluster", log = cfg$logFile, verbose = 1) runHarmoniseAndInfillCmd <- paste( - "python", file.path(cfg$scriptsDir, "run_harm_inf.py"), cfg$remindEmissionsFile, cfg$climateDir, + "ca-harmonize-infill", cfg$remindEmissionsFile, cfg$climateDir, "--infilling-database", cfg$infillingDatabase ) diff --git a/scripts/output/single/MAGICC7_AR6.R b/scripts/output/single/MAGICC7_AR6.R index 577860fdb..03eb495aa 100644 --- a/scripts/output/single/MAGICC7_AR6.R +++ b/scripts/output/single/MAGICC7_AR6.R @@ -51,7 +51,7 @@ dir.create(cfg$workersDir, showWarnings = FALSE) magiccEnv <- c( "MAGICC_EXECUTABLE_7" = cfg$magiccBin, "MAGICC_WORKER_ROOT_DIR" = cfg$workersDir, - "MAGICC_WORKER_NUMBER" = 1 + "MAGICC_WORKER_NUMBER" = 4 ) magiccInit <- piamenv::condaInit(how = "pik-cluster", log = cfg$logFile, verbose = 1)