Merge pull request #1926 from LaviniaBaumstark/develop

merge master containing release v3.4.0 into develop

CHANGELOG.md

@@ -4,8 +4,25 @@
 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]
 
+### input data/calibration
+
+### changed
+-
+
+### added
+-
+
+### removed
+-
+
+### fixed
+-
+
+## [3.4.0] - 2024-12-11
+
 ### 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) 
@@ -80,7 +97,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
     [[#1871](https://github.com/remindmodel/remind/pull/1871)]
 
 ### fixed
-- included CCS from plastic waste incineration in CCS mass flows so it is
+- **30_biomass** reset 1st gen. biofuel bound from 2045 to 2030
+    [[#1890](https://github.com/remindmodel/remind/pull/1890)]
+- **37_industry** 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 time before cm_startyear on reference run
@@ -93,8 +112,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
     [[#1768](https://github.com/remindmodel/remind/pull/1768)]
 - **scripts** limit slurm runtime of output.R scripts to 2 hours
     [[#1783](https://github.com/remindmodel/remind/pull/1783)]
-- **30_biomass** reset 1st gen. biofuel bound from 2045 to 2030
-    [[#1890](https://github.com/remindmodel/remind/pull/1890)]
 
 ### removed
 - **45_carbonprice** removed superseded realizations linear, exponential and diffCurvPhaseIn2Lin

CITATION.cff

@@ -271,7 +271,7 @@ 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.dev1198"
+version: 3.4.0
 date-released: 2024-12-11
 repository-code: https://github.com/remindmodel/remind
 keywords:

main.gms

@@ -76,7 +76,6 @@
 *' OUTPUT
 *' ```
 *'
-*'
 *' The GAMS code follows a Coding Etiquette:
 *'
 *' #### Naming conventions:

scripts/utils/release.R

@@ -75,8 +75,8 @@ release <- function(newVersion) {
 
   message("Creating tag")
   tag <- paste0("v",newVersion)
-  git_tag_create(name = tag, message = "new tag", repo = ".")
-  git_tag_push(name = tag, repo = ".")
+  gert::git_tag_create(name = tag, message = "new tag", repo = ".")
+  gert::git_tag_push(name = tag, repo = ".")
 
   message("Creating a PR on GitHub")
   # gh pr create --help