diff --git a/CHANGELOG.md b/CHANGELOG.md index cb3b09855..81a7dfd9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,13 +17,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [[#1723](https://github.com/remindmodel/remind/pull/1723)] - **scripts** define defaults for script selections in output.R [[#1739](https://github.com/remindmodel/remind/pull/1739)] -- **scripts** fail transparently on duplicated column names in scenario_config*.csv files +- **scripts** fail transparently on duplicated column names in `scenario_config*.csv` files [[#1742](https://github.com/remindmodel/remind/pull/1742)] ### fixed - included CCS from plastic waste incineration in CCS mass flows so it is subject to injection constraints (but did not add CCS costs, see https://github.com/remindmodel/development_issues/issues/274 +- **MAGICC7** fix climate data for t < cm_startyear on reference run + [[#1744](https://github.com/remindmodel/remind/pull/1744)] - **scripts** fix tax convergence reporting in modelSummary [[#1728](https://github.com/remindmodel/remind/pull/1728)] - **scripts** cleanup non-existing realizations from settings_config.csv diff --git a/scripts/output/single/fixOnRef.R b/scripts/output/single/fixOnRef.R index c347662da..687e4bba9 100644 --- a/scripts/output/single/fixOnRef.R +++ b/scripts/output/single/fixOnRef.R @@ -38,8 +38,8 @@ findRefMif <- function(outputdir, envi) { } fixMAGICC <- function(d, dref, startyear, scen) { - magiccgrep <- "^Forcing|^Temperature|^Concentration" - message("Fixing MAGICC6 data before ", startyear) + magiccgrep <- "^Forcing|^Temperature|^Concentration|^MAGICC7 AR6" + message("Fixing MAGICC6 and 7 data before ", startyear) dnew <- rbind( filter(dref, grepl(magiccgrep, .data$variable),