Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix MAGICC7 variables to reference run #1744

Merged
merged 1 commit into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/output/single/fixOnRef.R
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Loading