Merge branch 'develop' of github.com:remindmodel/remind into develop

CHANGELOG.md

@@ -24,13 +24,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

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

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()

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),