Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/remindmodel/remind into …
Browse files Browse the repository at this point in the history
…GDPaPOPaSSP2
  • Loading branch information
LaviniaBaumstark committed Sep 20, 2024
2 parents 2e15a37 + 7d34a64 commit badc99d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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.dev592"
date-released: 2024-09-17
version: "3.3.2.dev596"
date-released: 2024-09-20
repository-code: https://github.com/remindmodel/remind
keywords:
- energy
Expand Down
2 changes: 1 addition & 1 deletion config/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,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.dev592"
cfg$model_version <- "3.3.2.dev596"

#### settings ####
cfg$gms <- list()
Expand Down
1 change: 1 addition & 0 deletions core/presolve.gms
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ vm_macBase.fx(ttot,regi,"ch4wstl")$(ttot.val ge 2005) = p_emineg_econometric(reg
vm_macBase.fx(ttot,regi,"n2owaste")$(ttot.val ge 2005) = p_emineg_econometric(regi,"n2owaste","p1") * pm_pop(ttot,regi) * (1000*pm_gdp(ttot,regi) / (pm_pop(ttot,regi)*pm_shPPPMER(regi)))**p_emineg_econometric(regi,"n2owaste","p2");


vm_macBase.lo(ttot,regi,"co2cement_process")$( ttot.val ge 2005 ) = 0;
$ifthen.fixed_shares "%industry%" == "fixed_shares"
vm_macBase.fx(ttot,regi,"co2cement_process")$( ttot.val ge 2005 )
= ( pm_pop(ttot,regi)
Expand Down
6 changes: 4 additions & 2 deletions modules/37_industry/subsectors/equations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ $endif.exogDem_scen
*' energy mix, as that is what can be captured); vm_emiIndBase itself is not used for emission
*' accounting, just as a CCS baseline.
***------------------------------------------------------
q37_emiIndBase(t,regi,enty,secInd37)$( entyFeCC37(enty)
OR sameas(enty,"co2cement_process") ) ..
q37_emiIndBase(t,regi,enty,secInd37)$(
entyFeCC37(enty)
OR ( sameas(enty,"co2cement_process")
AND cm_CCS_cement eq 1 ) ) ..
vm_emiIndBase(t,regi,enty,secInd37)
=e=
sum((secInd37_2_pf(secInd37,ppfen_industry_dyn37(in)),fe2ppfEn(entyFeCC37(enty),in)),
Expand Down
11 changes: 10 additions & 1 deletion modules/37_industry/subsectors/sets.gms
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,15 @@ $ifthen.cm_subsec_model_steel "%cm_subsec_model_steel%" == "processes"
$endif.cm_subsec_model_steel
/

teCCPrc(tePrc) "Technologies used in process-based model (only CCS)"
/
$$ifthen.cm_subsec_model_steel "%cm_subsec_model_steel%" == "processes"
bfcc
idrcc
$$endif.cm_subsec_model_steel
/


mat(all_enty) "Materials considered in process-based model; Can be input and/or output of a process"
/
$ifthen.cm_subsec_model_steel "%cm_subsec_model_steel%" == "processes"
Expand Down Expand Up @@ -634,7 +643,7 @@ pf_quan_target_dyn29(pf_quan_target_dyn37) = YES;
$endif.calibrate

teMat2rlf(tePrc,"1") = YES;
alias(tePrc,teCCPrc,tePrc1,tePrc2);
alias(tePrc,tePrc1,tePrc2);
alias(opmoPrc,opmoCCPrc,opmoPrc1,opmoPrc2);
alias(route,route2);
alias(entyFeCC37,entyFeCC37_2);
Expand Down

0 comments on commit badc99d

Please sign in to comment.