From 3d4728ab27ed6e6f35fe301f707ceec738d56b6c Mon Sep 17 00:00:00 2001 From: Bjoern Soergel <16190669+bs538@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:58:16 +0200 Subject: [PATCH 01/11] fix default settings for IIASA export (SHAPE) inclusion of "NAVIGATE_coupled" template ensures that MAgPIE emissions are mapped correctly to IIASA DB variables --- scripts/output/export/xlsx_IIASA.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/output/export/xlsx_IIASA.R b/scripts/output/export/xlsx_IIASA.R index 265b9f610..4cf62670c 100644 --- a/scripts/output/export/xlsx_IIASA.R +++ b/scripts/output/export/xlsx_IIASA.R @@ -52,7 +52,7 @@ projects <- list( iiasatemplate = "https://files.ece.iiasa.ac.at/ssp-submission/ssp-submission-template.xlsx", renameScen = c("SMIPv03-M-SSP2-NPi-def" = "SSP2 - Medium Emissions", "SMIPv03-LOS-SSP2-EcBudg400-def" = "SSP2 - Low Overshoot", "SMIPv03-ML-SSP2-PkPrice200-fromL" = "SSP2 - Medium-Low Emissions","SMIPv03-L-SSP2-PkPrice265-inc6-def" = "SSP2 - Low Emissions", "SMIPv03-VL-SSP2_SDP_MC-PkPrice300-def" = "SSP2 - Very Low Emissions"), checkSummation = "NAVIGATE"), - SHAPE = list(mapping = c("NAVIGATE", "SHAPE")), + SHAPE = list(mapping = c("NAVIGATE", "NAVIGATE_coupled", "SHAPE")), TESTTHAT = list(mapping = "AR6") ) From 0dc3961987621d4d0dbdd3c1e52a4f23ab5e993d Mon Sep 17 00:00:00 2001 From: REMIND Research Software Engineering Date: Tue, 22 Oct 2024 09:08:50 +0000 Subject: [PATCH 02/11] Release development version 3.3.2.dev867 --- CITATION.cff | 4 ++-- config/default.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index d8fb64d17..6871f76b3 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -271,8 +271,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.dev864" -date-released: 2024-10-21 +version: "3.3.2.dev867" +date-released: 2024-10-22 repository-code: https://github.com/remindmodel/remind keywords: - energy diff --git a/config/default.cfg b/config/default.cfg index f5bf1274b..6ff8e1b96 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -73,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.dev864" +cfg$model_version <- "3.3.2.dev867" #### settings #### cfg$gms <- list() From a0c864bc46ebee98a701f15580539b407615b2e6 Mon Sep 17 00:00:00 2001 From: Lavinia Baumstark Date: Fri, 25 Oct 2024 12:21:22 +0200 Subject: [PATCH 03/11] new input data rev7.1 and new CES parameter and gdx files for input data rev7.1 for SSP2, SSP2-EU21, SSP1, SSP2_lowEn and SSP5, calibration runs: /p/tmp/lavinia/REMIND/REMIND_calibration_2024_10_24/remind/output --- config/default.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/default.cfg b/config/default.cfg index 6ff8e1b96..7bcf4fc26 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -28,10 +28,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv" cfg$extramappings_historic <- "" #### Current input data revision (.) #### -cfg$inputRevision <- "6.99" +cfg$inputRevision <- "7.1" #### Current CES parameter and GDX revision (commit hash) #### -cfg$CESandGDXversion <- "26e9d6764caa46c1e1cdedbaae68ddfe122afd29" +cfg$CESandGDXversion <- "f75d13da9c2efe3ffd2eaa5dbc29f98a8e87a6b8" #### Force the model to download new input data #### cfg$force_download <- FALSE From 2675f0f5fba9665213991a90ffd621bb105102ff Mon Sep 17 00:00:00 2001 From: REMIND Research Software Engineering Date: Fri, 25 Oct 2024 11:57:23 +0000 Subject: [PATCH 04/11] Release development version 3.3.2.dev870 --- CITATION.cff | 4 ++-- config/default.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 6871f76b3..bf09921f4 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -271,8 +271,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.dev867" -date-released: 2024-10-22 +version: "3.3.2.dev870" +date-released: 2024-10-25 repository-code: https://github.com/remindmodel/remind keywords: - energy diff --git a/config/default.cfg b/config/default.cfg index 7bcf4fc26..85ea2c779 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -73,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.dev867" +cfg$model_version <- "3.3.2.dev870" #### settings #### cfg$gms <- list() From c9ee4448b4a1c93f8281086b510a2d9e14b8fd8f Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Mon, 28 Oct 2024 09:43:21 +0100 Subject: [PATCH 05/11] fix vm_demFENonEnergySector to zero if not element of entyFE2sector2emiMkt_NonEn fix remindmodel/development_issues#399 --- modules/37_industry/subsectors/equations.gms | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/37_industry/subsectors/equations.gms b/modules/37_industry/subsectors/equations.gms index e6011ce34..44c861b56 100644 --- a/modules/37_industry/subsectors/equations.gms +++ b/modules/37_industry/subsectors/equations.gms @@ -217,9 +217,9 @@ q37_chemicals_feedstocks_limit(t,regi) .. * p37_chemicals_feedstock_share(t,regi) ; -*' Define the flow of non-energy feedstocks. It is used for emissions accounting and calculating plastics production -q37_demFeFeedstockChemIndst(t,regi,entyFe,emiMkt)$( - entyFE2sector2emiMkt_NonEn(entyFe,"indst",emiMkt) ) .. +*' Define the flow of non-energy feedstocks. It is used for emissions +*' accounting and calculating plastics production +q37_demFeFeedstockChemIndst(t,regi,entyFe,emiMkt) .. sum(se2fe(entySe,entyFe,te), vm_demFENonEnergySector(t,regi,entySe,entyFe,"indst",emiMkt) ) @@ -231,15 +231,13 @@ q37_demFeFeedstockChemIndst(t,regi,entyFe,emiMkt)$( + pm_cesdata(t,regi,in,"offset_quantity") ) * p37_chemicals_feedstock_share(t,regi) - ) + )$( entyFE2sector2emiMkt_NonEn(entyFe,"indst",emiMkt) ) ; *' Feedstocks flow has to be lower than total energy flow into the industry q37_feedstocksLimit(t,regi,entySe,entyFe,emiMkt)$( - sefe(entySe,entyFe) - AND sector2emiMkt("indst",emiMkt) - AND entyFe2Sector(entyFe,"indst") - AND entyFeCC37(entyFe) ) .. + sefe(entySe,entyFe) + AND entyFE2sector2emiMkt_NonEn(entyFe,"indst",emiMkt) ) .. vm_demFeSector_afterTax(t,regi,entySe,entyFe,"indst",emiMkt) =g= vm_demFENonEnergySector(t,regi,entySe,entyFe,"indst",emiMkt) From 7fe7fd5e32a294e661cfd982dd130079b4a4721a Mon Sep 17 00:00:00 2001 From: REMIND Research Software Engineering Date: Mon, 28 Oct 2024 09:07:07 +0000 Subject: [PATCH 06/11] Release development version 3.3.2.dev873 --- CITATION.cff | 4 ++-- config/default.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index bf09921f4..3a04c5ac1 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -271,8 +271,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.dev870" -date-released: 2024-10-25 +version: "3.3.2.dev873" +date-released: 2024-10-28 repository-code: https://github.com/remindmodel/remind keywords: - energy diff --git a/config/default.cfg b/config/default.cfg index 85ea2c779..a68244870 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -73,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.dev870" +cfg$model_version <- "3.3.2.dev873" #### settings #### cfg$gms <- list() From 7a3eaa913b540f3900f76c4c81460ec7c94464f0 Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Fri, 1 Nov 2024 12:03:12 +0100 Subject: [PATCH 07/11] add support for switch to force monotonuosly decreasing solids fossil use per region --- core/declarations.gms | 3 +++ core/equations.gms | 10 ++++++++++ core/sets.gms | 9 +++++++++ main.gms | 3 +++ 4 files changed, 25 insertions(+) diff --git a/core/declarations.gms b/core/declarations.gms index ca4253635..0e16d00c7 100644 --- a/core/declarations.gms +++ b/core/declarations.gms @@ -565,6 +565,9 @@ $IFTHEN.sehe_upper not "%cm_sehe_upper%" == "off" q_heat_limit(ttot,all_regi) "equation to limit maximum level of secondary energy district heating and heat pumps use" $ENDIF.sehe_upper +$ifthen.limitSolidsFossilRegi not %cm_limitSolidsFossilRegi% == "off" + q_fossilSolidsLimitReg(ttot,all_regi,all_enty,all_enty,emi_sectors,all_emiMkt) "limit solids fossil to be lower or equal to previous year values" +$endif.limitSolidsFossilRegi ; ***---------------------------------------------------------------------------------------- *** SCALARS diff --git a/core/equations.gms b/core/equations.gms index 438947d8e..33e3ea384 100644 --- a/core/equations.gms +++ b/core/equations.gms @@ -1127,4 +1127,14 @@ q_shbiofe_lo(t,regi,entyFe,sector,emiMkt)$(pm_secBioShare(t,regi,entyFe,sector) sum((entySeBio,te)$se2fe(entySeBio,entyFe,te), vm_demFeSector_afterTax(t,regi,entySeBio,entyFe,sector,emiMkt)) ; +***--------------------------------------------------------------------------- +*' Limit solids fossil to be lower or equal to previous year values +***--------------------------------------------------------------------------- +$ifthen.limitSolidsFossilRegi not %cm_limitSolidsFossilRegi% == "off" +q_fossilSolidsLimitReg(ttot,regi,entySe,entyFe,sector,emiMkt)$(limitSolidsFossilRegi(regi) and (ttot.val ge max(2020, cm_startyear)) AND sefe(entySe,entyFe) AND sector2emiMkt(sector,emiMkt) AND (sameas(sector,"indst") OR sameas(sector,"build")) AND sameas(entySe,"sesofos")).. + vm_demFeSector_afterTax(ttot,regi,entySe,entyFe,sector,emiMkt) + =l= + vm_demFeSector_afterTax(ttot-1,regi,entySe,entyFe,sector,emiMkt); +$endif.limitSolidsFossilRegi + *** EOF ./core/equations.gms diff --git a/core/sets.gms b/core/sets.gms index 22f210087..d503e87ba 100755 --- a/core/sets.gms +++ b/core/sets.gms @@ -922,6 +922,15 @@ set ; $endif.altFeEmiFac +$ifthen.limitSolidsFossilRegi not %cm_limitSolidsFossilRegi% == "off" + set limitSolidsFossilextRegi(ext_regi) "set to store ext_regi regions that should have solids fossil upper bound limited by previous year" / %cm_limitSolidsFossilRegi% / + limitSolidsFossilRegi(all_regi) "set to store regi regions that should have solids fossil upper bound limited by previous year" + ; + loop(ext_regi$limitSolidsFossilextRegi(ext_regi), + limitSolidsFossilRegi(all_regi)$(regi_group(ext_regi,all_regi)) = YES; + ); +$endif.limitSolidsFossilRegi + ***############################################################################### ***######################## R SECTION START (MODULES) ############################### *** THIS CODE IS CREATED AUTOMATICALLY, DO NOT MODIFY THESE LINES DIRECTLY diff --git a/main.gms b/main.gms index 77e381b79..44def1fc9 100755 --- a/main.gms +++ b/main.gms @@ -1762,6 +1762,9 @@ $setglobal cm_INCONV_PENALTY_FESwitch on !! def = on !! regexp = off|on *** *JH/LB* Activate MOFEX partial fossil fuel extraction cost minimization model *** * Warning: Use a well-converged run since the model uses vm_prodPe from the input GDX $setGlobal cm_MOFEX off !! def = off !! regexp = off|on +*** cm_limitSolidsFossilRegi off !! def=off +*** ext_regi value, e.g. "EUR_regi, USA" "solids fossil in industry and buildings for regions within EUR_regi and USA are forced to be monotonuosly decreasing from 2020 or cm_startyear onward." +$setGlobal cm_limitSolidsFossilRegi off *** cm_Full_Integration *** use "on" to treat wind and solar as fully dispatchable electricity production technologies $setGlobal cm_Full_Integration off !! def = off !! regexp = off|on From cbce8bb3ffbf8ee35ca091e93d42a6f4fb8c405a Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Tue, 5 Nov 2024 14:47:44 +0100 Subject: [PATCH 08/11] improve descriptions and change the eqaution to le --- core/declarations.gms | 2 +- core/equations.gms | 2 +- core/sets.gms | 4 ++-- main.gms | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/declarations.gms b/core/declarations.gms index 0e16d00c7..ace32d0e0 100644 --- a/core/declarations.gms +++ b/core/declarations.gms @@ -566,7 +566,7 @@ q_heat_limit(ttot,all_regi) "equation to limit maximum level of secondary energ $ENDIF.sehe_upper $ifthen.limitSolidsFossilRegi not %cm_limitSolidsFossilRegi% == "off" - q_fossilSolidsLimitReg(ttot,all_regi,all_enty,all_enty,emi_sectors,all_emiMkt) "limit solids fossil to be lower or equal to previous year values" + q_fossilSolidsLimitReg(ttot,all_regi,all_enty,all_enty,emi_sectors,all_emiMkt) "limit solids fossil to be lower or equal to previous year values in each (sector x emiMkt) combination" $endif.limitSolidsFossilRegi ; ***---------------------------------------------------------------------------------------- diff --git a/core/equations.gms b/core/equations.gms index 33e3ea384..476f5049d 100644 --- a/core/equations.gms +++ b/core/equations.gms @@ -1133,7 +1133,7 @@ q_shbiofe_lo(t,regi,entyFe,sector,emiMkt)$(pm_secBioShare(t,regi,entyFe,sector) $ifthen.limitSolidsFossilRegi not %cm_limitSolidsFossilRegi% == "off" q_fossilSolidsLimitReg(ttot,regi,entySe,entyFe,sector,emiMkt)$(limitSolidsFossilRegi(regi) and (ttot.val ge max(2020, cm_startyear)) AND sefe(entySe,entyFe) AND sector2emiMkt(sector,emiMkt) AND (sameas(sector,"indst") OR sameas(sector,"build")) AND sameas(entySe,"sesofos")).. vm_demFeSector_afterTax(ttot,regi,entySe,entyFe,sector,emiMkt) - =l= + =le= vm_demFeSector_afterTax(ttot-1,regi,entySe,entyFe,sector,emiMkt); $endif.limitSolidsFossilRegi diff --git a/core/sets.gms b/core/sets.gms index d503e87ba..54f85cfe2 100755 --- a/core/sets.gms +++ b/core/sets.gms @@ -923,8 +923,8 @@ set $endif.altFeEmiFac $ifthen.limitSolidsFossilRegi not %cm_limitSolidsFossilRegi% == "off" - set limitSolidsFossilextRegi(ext_regi) "set to store ext_regi regions that should have solids fossil upper bound limited by previous year" / %cm_limitSolidsFossilRegi% / - limitSolidsFossilRegi(all_regi) "set to store regi regions that should have solids fossil upper bound limited by previous year" + set limitSolidsFossilextRegi(ext_regi) "set to store ext_regi regions where fossil solids use in each (sector x emiMkt) is limited by the amount used in the previous year" / %cm_limitSolidsFossilRegi% / + limitSolidsFossilRegi(all_regi) "set to store regi regions where fossil solids use in each (sector x emiMkt) is limited by the amount used in the previous year" ; loop(ext_regi$limitSolidsFossilextRegi(ext_regi), limitSolidsFossilRegi(all_regi)$(regi_group(ext_regi,all_regi)) = YES; diff --git a/main.gms b/main.gms index 44def1fc9..91200ec6e 100755 --- a/main.gms +++ b/main.gms @@ -1763,7 +1763,9 @@ $setglobal cm_INCONV_PENALTY_FESwitch on !! def = on !! regexp = off|on *** * Warning: Use a well-converged run since the model uses vm_prodPe from the input GDX $setGlobal cm_MOFEX off !! def = off !! regexp = off|on *** cm_limitSolidsFossilRegi off !! def=off -*** ext_regi value, e.g. "EUR_regi, USA" "solids fossil in industry and buildings for regions within EUR_regi and USA are forced to be monotonuosly decreasing from 2020 or cm_startyear onward." +*** starting in max(2020, cm_startyear), fossil solids use in each (sector x emiMkt) has to decrease compared to the previous time step for each region included in the switch cm_limitSolidsFossilRegi +*** aceptable values: any of the ext_regi set elements +*** e.g. "EUR_regi, USA" "solids fossil in industry and buildings for regions within EUR_regi and USA have to be lower or equal to the previous time step from 2020 or cm_startyear onward." $setGlobal cm_limitSolidsFossilRegi off *** cm_Full_Integration *** use "on" to treat wind and solar as fully dispatchable electricity production technologies From c4b6f0a53db85e9dd2757d0ba248c497b2aae811 Mon Sep 17 00:00:00 2001 From: Lavinia Baumstark Date: Tue, 5 Nov 2024 21:05:22 +0100 Subject: [PATCH 09/11] new input data rev7.11 and new CES parameters and gdx files for SSP2, SSP2-EU21, SSP1, SSP2_lowEn and SSP5, calibration runs here: /p/tmp/lavinia/REMIND/REMIND_calibration_2024_11_04/remind/ --- config/default.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/default.cfg b/config/default.cfg index a68244870..2f56ae4f0 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -28,10 +28,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv" cfg$extramappings_historic <- "" #### Current input data revision (.) #### -cfg$inputRevision <- "7.1" +cfg$inputRevision <- "7.11" #### Current CES parameter and GDX revision (commit hash) #### -cfg$CESandGDXversion <- "f75d13da9c2efe3ffd2eaa5dbc29f98a8e87a6b8" +cfg$CESandGDXversion <- "84b10b9308f97fae38923762b840b8dffd456568" #### Force the model to download new input data #### cfg$force_download <- FALSE From 8e592cb17307454e908aeab90d7e4080a9c1e6a3 Mon Sep 17 00:00:00 2001 From: REMIND Research Software Engineering Date: Wed, 6 Nov 2024 08:55:07 +0000 Subject: [PATCH 10/11] Release development version 3.3.2.dev876 --- CITATION.cff | 4 ++-- config/default.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 3a04c5ac1..510bb1c9d 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -271,8 +271,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.dev873" -date-released: 2024-10-28 +version: "3.3.2.dev876" +date-released: 2024-11-06 repository-code: https://github.com/remindmodel/remind keywords: - energy diff --git a/config/default.cfg b/config/default.cfg index 2f56ae4f0..81dbfa3d4 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -73,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.dev873" +cfg$model_version <- "3.3.2.dev876" #### settings #### cfg$gms <- list() From 5917b0910e51f5f065e5b92500925ace71175d25 Mon Sep 17 00:00:00 2001 From: REMIND Research Software Engineering Date: Wed, 6 Nov 2024 14:37:33 +0000 Subject: [PATCH 11/11] Release development version 3.3.2.dev880 --- CITATION.cff | 2 +- config/default.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 510bb1c9d..e4bd4f569 100644 --- a/CITATION.cff +++ b/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.dev876" +version: "3.3.2.dev880" date-released: 2024-11-06 repository-code: https://github.com/remindmodel/remind keywords: diff --git a/config/default.cfg b/config/default.cfg index 81dbfa3d4..6fcabcca4 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -73,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.dev876" +cfg$model_version <- "3.3.2.dev880" #### settings #### cfg$gms <- list()