Merge branch 'remindmodel:develop' into develop

CHANGELOG.md

@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **core** add process emissions from chemicals subsector and from plastics incineration
 - **37_industry** add process-based steel model as alternative to CES-tree branch
 - **47_regipol** add support for delaying quantity targets and improving regional emission tax convergence
+- **core** change of preference parameters and associated computation of interest rates/mark ups 	
 
 ### fixed
 - fixed weights of energy carriers in `pm_IndstCO2Captured`

CITATION.cff

@@ -251,8 +251,8 @@ authors:
   affiliation: "Potsdam Institute for Climate Impact Research"
 
 title: REMIND - REgional Model of INvestments and Development
-version: "3.2.1.dev1128"
-date-released: 2024-02-28
+version: "3.2.1.dev1226"
+date-released: 2024-03-01
 repository-code: https://github.com/remindmodel/remind
 keywords:
   - energy

DESCRIPTION

@@ -54,12 +54,12 @@ Imports:
     piamInterfaces (>= 0.12.18),
     plotly,
     purrr,
-    quitte (>= 0.3123.0),
+    quitte (>= 0.3128.4),
     R.utils,
     raster,
     readr,
     readxl,
-    remind2 (>= 1.125.0),
+    remind2 (>= 1.135.6),
     renv,
     reshape2,
     reticulate,

Makefile

@@ -91,6 +91,10 @@ test-full:       ## Run all tests, including coupling tests and a default
 	$(info Full tests take more than an hour to run, please be patient)
 	@TESTTHAT_RUN_SLOW=TRUE Rscript -e 'testthat::test_dir("tests/testthat")'
 
+test-full-slurm: ##test-full, but on slurm
+	$(info Full tests take more than an hour to run, please be patient)
+	@sbatch --qos=priority --wrap="make test-full" --job-name=test-full --mail-type=END --output=test-full.log --comment="test-full.log"
+
 test-validation: ## Run validation tests, requires a full set of runs in the output folder
 	$(info Run validation tests, requires a full set of runs in the output folder)
 	@TESTTHAT_RUN_SLOW=TRUE Rscript -e 'testthat::test_dir("tests/testthat/validation")'	

config/default.cfg

@@ -49,6 +49,12 @@ cfg$runstatistics <- "/p/projects/rd3mod/models/statistics/remind"
 # copied into remind when starting a run and required to calculate climate responses (e.g. temperature).
 cfg$magicc_template <- "/p/projects/rd3mod/magicc/"
 
+#### Folder containing files for climate-assessment that cannot be published with REMIND
+# These files currently all have permissive licenses and can be easily found online
+cfg$climate_assessment_root       <- "/p/projects/rd3mod/python/climate-assessment/src/"
+cfg$climate_assessment_files_dir  <- "/p/projects/rd3mod/climate-assessment-files/"
+cfg$climate_assessment_magicc_bin <- "/p/projects/rd3mod/climate-assessment-files/magicc-v7.5.3/bin/magicc"
+
 #### Output folder of the modeltests generated by running config/scenario_config_AMT.csv
 # start.R searches in this folder for finished runs to be used as path_gdx...
 cfg$modeltests_folder <- "/p/projects/remind/modeltests/remind/output"
@@ -63,7 +69,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.2.1.dev1128"
+cfg$model_version <- "3.2.1.dev1226"
 
 #### settings ####
 cfg$gms <- list()
@@ -110,7 +116,7 @@ cfg$logoption <- 2
 
 # Just list the name of the output scripts that should be used by output.R
 # At the moment there are several R-scripts located in scripts/output/
-cfg$output <- c("reporting","reportCEScalib","rds_report","fixOnRef") #,"validation","emulator","reportCEScalib","validationSummary","dashboard")
+cfg$output <- c("reporting","reportCEScalib","rds_report","fixOnRef") #"ar6Climate","emulator"
 
 # Set the format for the results folder, type string :date: in order to use the current time stamp in the folder name (e.g. "results:date:") use :title: to use the current title in the folder name
 cfg$results_folder <- "output/:title::date:"