From 34aea1b37d30fb189c967335654252ff8c334fe6 Mon Sep 17 00:00:00 2001 From: orichters Date: Mon, 15 Jul 2024 09:07:32 +0200 Subject: [PATCH 1/2] fix MAGICC7 variables to reference run --- CHANGELOG.md | 4 +++- scripts/output/single/fixOnRef.R | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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), From 76ae6408ac0816c7b4b16a26f900becc31b5724b Mon Sep 17 00:00:00 2001 From: REMIND Research Software Engineering Date: Fri, 26 Jul 2024 07:54:33 +0000 Subject: [PATCH 2/2] Release development version 3.3.2.dev246 --- CITATION.cff | 4 ++-- config/default.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 7ea6b5328..185971380 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -266,8 +266,8 @@ abstract: REMIND (REgional Model of Investment and Development) is a numerical technology, policy and climate constraints. It also accounts for regional trade characteristics on goods, energy fuels, and emissions allowances. All greenhouse gas emissions due to human activities are represented in the model. -version: "3.3.2.dev243" -date-released: 2024-07-25 +version: "3.3.2.dev246" +date-released: 2024-07-26 repository-code: https://github.com/remindmodel/remind keywords: - energy diff --git a/config/default.cfg b/config/default.cfg index 73704ece8..a6d0a84c5 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -71,7 +71,7 @@ cfg$validationmodel_name <- "VALIDATIONREMIND" #### model version of the overall model (used for run statistics only). # automatically generated for development versions, updated by hand for releases -cfg$model_version <- "3.3.2.dev243" +cfg$model_version <- "3.3.2.dev246" #### settings #### cfg$gms <- list()