Merge branch 'develop' into modeltest

CHANGELOG.md

@@ -0,0 +1,25 @@
+
+# Changelog
+
+All notable changes to this project will be documented in this file.
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+
+## [Unreleased]
+
+
+## [3.2.1] - 2023-07-13 (incomplete)
+
+### changed
+- **documentation** MAgPIE coupling, DIETER coupling, input changes
+- **config** NGFS, SHAPE
+- **scripts** re-enable summation checks for IIASA submission
+
+### added
+- **45_carbonprice** added realization for National Policies Implemented 
+- **47_carbonpriceRegi** now supports BECCS quantity targets
+- **MAgPIE coupling** added `qos=auto` mode
+- **MAgPIE coupling** added renv support mode
+
+[Unreleased]: https://github.com/remindmodel/remind/compare/v3.2.1...HEAD
+[3.2.1]: https://github.com/remindmodel/remind/compare/v3.2.0...v3.2.1

pull_request_template.md

@@ -22,6 +22,7 @@
 - [ ] I adjusted the reporting in [`remind2`](https://github.com/pik-piam/remind2) where it was needed
 - [ ] I adjusted `forbiddenColumnNames` in [readCheckScenarioConfig.R](https://github.com/remindmodel/remind/blob/develop/scripts/start/readCheckScenarioConfig.R) in case the PR leads to deprecated switches
 - [ ] All automated model tests pass (`FAIL 0` in the output of `make test`)
+- [ ] The changelog `CHANGELOG.md` [has been updated correctly](https://gitlab.pik-potsdam.de/rse/rsewiki/-/wikis/Standards-for-Writing-a-Changelog)
 
 ## Further information (optional):