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

.Rprofile

@@ -76,16 +76,12 @@ if (!dir.exists(".venv/")
 # REMIND_repos_dirs="C:\my\first\path;D:\my\second\path"
 remindReposDirs <- Sys.getenv("REMIND_repos_dirs")
 
-# unless specified otherwise, use cluster defaults
-use_cluster_defaults <- TRUE
-
 # add local directories, if any
 if ("" != remindReposDirs) {
   directories <- unlist(strsplit(remindReposDirs, .Platform$path.sep, fixed = TRUE))
   directoriesList <- rep(list(NULL), length(directories))
   names(directoriesList) <- directories
   options(remind_repos = c(options("remind_repos")[[1]], directoriesList))
-  use_cluster_defaults <- FALSE
 }
 
 # Include local calibration results, if they exist, from either the main

CHANGELOG.md

@@ -8,13 +8,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### input data/calibration
 - new input data rev6.84 [[#1757](https://github.com/remindmodel/remind/pull/1757)]
+- new input data rev6.95 in US$2017[[#1812]] (https://github.com/remindmodel/remind/pull/1812) 
 - CES parameter and gdx files calibrated with new default diffLin2Lin for NPi 
     [[#1747](https://github.com/remindmodel/remind/pull/1747)] and
     [[#1757](https://github.com/remindmodel/remind/pull/1757)]
 - Update of NDC goals with cutoff data August 31, 2024
     [[#1816](https://github.com/remindmodel/remind/pull/1816)]
+- Prepare to make input data available for externals. Do not stop on missing validation data.
+  [[1828]][(https://github.com/remindmodel/remind/pull/1828)]
 
 ### changed
+- shift base unit from US$2005 to US$2017 [[#1812]] (https://github.com/remindmodel/remind/pull/1812)
 - plastic waste by default does not lag plastics production by ten years
     anymore; can be re-activated using `cm_wastelag`
 - moved to edgeTransport 2.0 version [[#1749](https://github.com/remindmodel/remind/pull/1749)]

CITATION.cff

@@ -271,13 +271,14 @@ 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.dev585"
-date-released: 2024-09-13
+version: "3.3.2.dev713"
+date-released: 2024-09-27
 repository-code: https://github.com/remindmodel/remind
 keywords:
   - energy
   - economy
   - modeling
   - model
+  - active-development
 license: AGPL-3.0-or-later
 url: https://www.pik-potsdam.de/research/transformation-pathways/models/remind

DESCRIPTION

@@ -17,15 +17,15 @@ Imports:
     data.table,
     devtools,
     dplyr,
-    edgeTransport (>= 2.3.0),
-    reporttransport (>= 0.0.11),
+    edgeTransport (>= 2.7.0),
+    reporttransport (>= 0.5.0),
     flexdashboard,
     GDPuc,
     gdx (>= 1.53.0),
     gdxdt,
     gdxrrw,
     ggplot2,
-    gms (>= 0.32.1),
+    gms (>= 0.33.0),
     goxygen (>= 1.4.4),
     gridExtra,
     gtools,
@@ -45,13 +45,16 @@ Imports:
     magpiesets,
     mip (>= 0.150.0),
     modelstats,
-    mrremind,
+    mrremind (>= 0.191.2),
+    mrcommons (>= 1.43.6),
+    mrdrivers (>= 3.0.0),
+    mrtransport (>= 0.7.1),
     mrvalidation,
     ncdf4,
     nleqslv,
     optparse,
     piamenv (>= 0.4.0),
-    piamInterfaces (>= 0.27.2),
+    piamInterfaces (>= 0.31.0),
     piamPlotComparison (>= 0.0.10),
     piamutils,
     plotly,
@@ -61,7 +64,7 @@ Imports:
     raster,
     readr,
     readxl,
-    remind2 (>= 1.147.2),
+    remind2 (>= 1.156.1),
     renv,
     reshape2,
     reticulate,

config/default.cfg

@@ -28,10 +28,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
 cfg$extramappings_historic <- ""
 
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$inputRevision <- "6.92"
+cfg$inputRevision <- "6.95"
 
 #### Current CES parameter and GDX revision (commit hash) ####
-cfg$CESandGDXversion <- "d4c62a8f11e8a6827310519df09c98eb425a4070"
+cfg$CESandGDXversion <- "ffbff5da0c24de39586df082716e5af449f5f231"
 
 #### Force the model to download new input data ####
 cfg$force_download <- FALSE
@@ -41,7 +41,8 @@ cfg$force_replace <- FALSE
 
 #### list of repositories containing input data
 # defined in your local .Rprofile or on the cluster /p/projects/rd3mod/R/.Rprofile
-cfg$repositories <- getOption("remind_repos")
+cfg$repositories <- append(list("https://rse.pik-potsdam.de/data/remind/public" = NULL),
+                           getOption("remind_repos"))
 
 #### Folder run statistics should be submitted to
 cfg$runstatistics <- "/p/projects/rd3mod/models/statistics/remind"
@@ -72,7 +73,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.dev585"
+cfg$model_version <- "3.3.2.dev713"
 
 #### settings ####
 cfg$gms <- list()