Merge pull request #1 from remindmodel/develop

Merge remindmodel/remind develop into my repo

config/default.cfg

@@ -273,7 +273,7 @@ cfg$gms$cm_bioenergymaxscen  <- 0       # def <- 0
 cfg$gms$c_tradecost_bio      <- 2       # def <- 2
 cfg$gms$cm_LU_emi_scen       <- "SSP2"  # def <- "SSP2"
 cfg$gms$cm_1stgen_phaseout   <- 0       # def <- 0
-cfg$gms$c21_cprice_red_factor <- 0.5  	# def = 0.5
+cfg$gms$cm_cprice_red_factor <- 0.5  	# def = 0.5
 
 cfg$gms$cm_POPscen            <- "pop_SSP2"     # def <- "pop_SSP2"
 cfg$gms$cm_GDPscen            <- "gdp_SSP2"     # def <- "gdp_SSP2"

core/datainput.gms

@@ -847,7 +847,7 @@ $offdelim
 
 *** then calculate the financing costs during construction
 loop(te$(fm_dataglob("constrTme",te) > 0),
-  pm_tkpremused(regi,te) = 1/fm_dataglob("constrTme",te)
+  p_tkpremused(regi,te) = 1/fm_dataglob("constrTme",te)
     * sum(integ$(integ.val <= fm_dataglob("constrTme",te)),
 $if %cm_techcosts% == "REG"  (1.03 + pm_prtp(regi) + p_risk_premium_constr(regi) )  ** (integ.val - 0.5) - 1
 $if %cm_techcosts% == "GLO"  (1.03 + pm_prtp(regi) )                                 ** (integ.val - 0.5) - 1
@@ -855,14 +855,14 @@ $if %cm_techcosts% == "GLO"  (1.03 + pm_prtp(regi) )
 );
 *** nuclear sees 3% higher interest rates during construction time due to higher construction time risk, see "The economic future of nuclear power - A study conducted at The University of Chicago" (2004)
 loop(te$sameas(te,"tnrs"),
-  pm_tkpremused(regi,te) = 1/fm_dataglob("constrTme",te)
+  p_tkpremused(regi,te) = 1/fm_dataglob("constrTme",te)
     * sum(integ$(integ.val <= fm_dataglob("constrTme",te)),
 $if %cm_techcosts% == "REG"  (1.03 + 0.03 + pm_prtp(regi) + p_risk_premium_constr(regi) )  ** (integ.val - 0.5) - 1
 $if %cm_techcosts% == "GLO"  (1.03 + 0.03 + pm_prtp(regi) )                                 ** (integ.val - 0.5) - 1
       )
 );
 
-display pm_tkpremused;
+display p_tkpremused;
 ***for those technologies, for which differentiated costs are available for 2015-2040, use those
 ***$if %cm_techcosts% == "REG"   loop(teRegTechCosts(te)$(not teLearn(te)),
 ***$if %cm_techcosts% == "REG"   pm_inco0_t(ttot,regi,te)$(ttot.val ge 2015 AND ttot.val lt 2040) = p_inco0(ttot,regi,te);
@@ -876,11 +876,11 @@ display pm_tkpremused;
 
 
 
-pm_data(regi,"inco0",te)       = (1 + pm_tkpremused(regi,te) ) * pm_data(regi,"inco0",te);
-pm_data(regi,"incolearn",te)   = (1 + pm_tkpremused(regi,te) ) * pm_data(regi,"incolearn",te);
-p_inco0(ttot,regi,teRegTechCosts)  = (1 + pm_tkpremused(regi,teRegTechCosts) ) * p_inco0(ttot,regi,teRegTechCosts);
-*** take region average pm_tkpremused for global convergence price
-fm_dataglob("inco0",te)       = (1 + sum(regi, pm_tkpremused(regi,te))/sum(regi, 1)) * fm_dataglob("inco0",te);
+pm_data(regi,"inco0",te)       = (1 + p_tkpremused(regi,te) ) * pm_data(regi,"inco0",te);
+pm_data(regi,"incolearn",te)   = (1 + p_tkpremused(regi,te) ) * pm_data(regi,"incolearn",te);
+p_inco0(ttot,regi,teRegTechCosts)  = (1 + p_tkpremused(regi,teRegTechCosts) ) * p_inco0(ttot,regi,teRegTechCosts);
+*** take region average p_tkpremused for global convergence price
+fm_dataglob("inco0",te)       = (1 + sum(regi, p_tkpremused(regi,te))/sum(regi, 1)) * fm_dataglob("inco0",te);
 
 if( cm_solwindenergyscen = 2,
     loop(te$( sameas(te,"spv") OR sameas(te,"csp") OR sameas(te,"wind") ),

core/declarations.gms

@@ -136,7 +136,7 @@ p_boundtmp(tall,all_regi,all_te,rlf)                 "read-in bound on capacitie
 p_bound_cap(tall,all_regi,all_te,rlf)                "read-in bound on capacities"
 pm_data(all_regi,char,all_te)                        "Large array for most technical parameters of technologies; more detail on the individual technical parameters can be found in the declaration of the set 'char' "
 pm_cf(tall,all_regi,all_te)                          "Installed capacity availability - capacity factor (fraction of the year that a plant is running)"
-pm_tkpremused(all_regi,all_te)                       "turn-key cost premium used in the model (with a discount rate of 3+ pure rate of time preference); in comparison to overnight costs)"
+p_tkpremused(all_regi,all_te)                       "turn-key cost premium used in the model (with a discount rate of 3+ pure rate of time preference); in comparison to overnight costs)"
 p_aux_tlt(all_te)                                    "auxilliary parameter to determine maximal lifetime of a technology"
 p_aux_check_omeg(all_te)                             "auxiliary parameter for an automated check that no technology is erroneously entered with pm_omeg('1') value of 0"
 p_aux_check_tlt(all_te)                              "auxiliary parameter for an automated check that the pm_omeg calculation and filling of the opTimeYr2te mapping is in accordance"

core/presolve.gms

@@ -127,7 +127,7 @@ p_priceCO2forMAC(ttot,regi,enty) = pm_priceCO2(ttot,regi);
 *** The co2 price for land-use entities needs to be reduced by the same factor as in MAgPIE.
 *** Attention: the reduction factors need to be the same as in MAgPIE -> if they change in MAgPIE they need to be adapted here!
 *** 1. Reduce co2 price for land-use entities by 50%, see s56_cprice_red_factor in MAgPIE
-p_priceCO2forMAC(ttot,regi,MacSectorMagpie) = p_priceCO2forMAC(ttot,regi,MacSectorMagpie) * c21_cprice_red_factor;
+p_priceCO2forMAC(ttot,regi,MacSectorMagpie) = p_priceCO2forMAC(ttot,regi,MacSectorMagpie) * cm_cprice_red_factor;
 *** 2. Phase-in of co2 price for land-use entities, see line 22-35 in preloop.gms in modules/56_ghg_policy/price_jan19 in MAgPIE
 p_priceCO2forMAC(ttot,regi,MacSectorMagpie)$(ttot.val lt cm_startyear)    = 0;
 p_priceCO2forMAC(ttot,regi,MacSectorMagpie)$(ttot.val eq cm_startyear)    = 0.1 * p_priceCO2forMAC(ttot,regi,MacSectorMagpie);

main.gms

@@ -199,7 +199,7 @@ cm_bioenergy_tax      "level of bioenergy tax in fraction of bioenergy price"
 cm_bioenergymaxscen   "bound on global pebiolc production excluding residues"
 c_tradecost_bio       "choose financal tradecosts for biomass (purpose grown pebiolc)"
 cm_1stgen_phaseout    "choose if 1st generation biofuels should phase out after 2020 (delatcap=0)"
-c21_cprice_red_factor "reduction factor for price on co2luc when calculating the revenues. Replicates the reduction applied in MAgPIE"
+cm_cprice_red_factor "reduction factor for price on co2luc when calculating the revenues. Replicates the reduction applied in MAgPIE"
 cm_startyear          "first optimized modelling time step"
 cm_stagestart             "start of staged accession for delay runs"
 cm_stageend                       "end of staged accession for delay runs"
@@ -293,7 +293,7 @@ cm_bioenergymaxscen = 0;         !! def = 3
 c_tradecost_bio     = 2;         !! def = 2
 $setglobal cm_LU_emi_scen  SSP2   !! def = SSP2
 cm_1stgen_phaseout  = 0;         !! def = 0
-c21_cprice_red_factor  = 0.5;         !! def = 0.5
+cm_cprice_red_factor  = 0.5;         !! def = 0.5
 
 $setglobal cm_POPscen  pop_SSP2  !! def = pop_SSP2
 $setglobal cm_GDPscen  gdp_SSP2  !! def = gdp_SSP2

modules/21_tax/off/not_used.txt

@@ -47,3 +47,6 @@ pm_ttot_val,input,questionnaire
 pm_tau_fe_tax_ES_st,input,questionnaire
 pm_tau_fe_sub_ES_st,input,questionnaire
 p21_implicitDiscRateMarg,input,questionnaire
+vm_emiMacSector,input,questionnaire
+cm_multigasscen,input,questionnaire
+cm_cprice_red_factor,input,questionnaire

modules/21_tax/on/equations.gms

@@ -59,7 +59,7 @@ v21_taxrevGHG(t,regi) =g= ( pm_taxCO2eq(t,regi)  + pm_taxCO2eqSCC(t,regi) + pm_t
 *'  Documentation of overall tax approach is above at q21_taxrev.
 ***---------------------------------------------------------------------------
 q21_taxrevCO2luc(t,regi)$(t.val ge max(2010,cm_startyear))..
-v21_taxrevCO2luc(t,regi) =g= ( pm_taxCO2eq(t,regi)  + pm_taxCO2eqSCC(t,regi) + pm_taxCO2eqHist(t,regi))* c21_cprice_red_factor * vm_emiMacSector(t,regi,"co2luc")$(cm_multigasscen ne 3)
+v21_taxrevCO2luc(t,regi) =g= ( pm_taxCO2eq(t,regi)  + pm_taxCO2eqSCC(t,regi) + pm_taxCO2eqHist(t,regi))* cm_cprice_red_factor * vm_emiMacSector(t,regi,"co2luc")$(cm_multigasscen ne 3)
                            - p21_taxrevCO2LUC0(t,regi);
 
 ***---------------------------------------------------------------------------

modules/21_tax/on/postsolve.gms

@@ -19,7 +19,7 @@ OPTION decimals =3;
 *JH* !!Warning!! The same allocation block exists in presolve.gms.
 ***                Do not forget to update the other file.
 p21_taxrevGHG0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * (vm_co2eq.l(ttot,regi) - vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3));
-p21_taxrevCO2luc0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * c21_cprice_red_factor * vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3);
+p21_taxrevCO2luc0(ttot,regi) = ( pm_taxCO2eq(ttot,regi) + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * cm_cprice_red_factor * vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3);
 p21_taxrevCCS0(ttot,regi) = cm_frac_CCS * pm_data(regi,"omf","ccsinje") * pm_inco0_t(ttot,regi,"ccsinje") 
                             * ( sum(teCCS2rlf(te,rlf), sum(ccs2te(ccsCO2(enty),enty2,te), vm_co2CCS.l(ttot,regi,enty,enty2,te,rlf) ) ) )
                             * (1/sm_ccsinjecrate) * sum(teCCS2rlf(te,rlf), sum(ccs2te(ccsCO2(enty),enty2,te), vm_co2CCS.l(ttot,regi,enty,enty2,te,rlf) ) ) / pm_dataccs(regi,"quan","1");

modules/21_tax/on/presolve.gms

@@ -17,7 +17,7 @@ p21_tau_so2_tax(ttot,regi)$(ttot.val>2100)=p21_tau_so2_tax("2100",regi);
 ***                Do not forget to update the other file.
 *** save level value of all taxes
 p21_taxrevGHG0(ttot,regi) = ( pm_taxCO2eq(ttot,regi)  + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * (vm_co2eq.l(ttot,regi) - vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3));
-p21_taxrevCO2luc0(ttot,regi) = ( pm_taxCO2eq(ttot,regi)  + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * c21_cprice_red_factor * vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3);
+p21_taxrevCO2luc0(ttot,regi) = ( pm_taxCO2eq(ttot,regi)  + pm_taxCO2eqSCC(ttot,regi) + pm_taxCO2eqHist(ttot,regi)) * cm_cprice_red_factor * vm_emiMacSector.l(ttot,regi,"co2luc")$(cm_multigasscen ne 3);
 p21_taxrevCCS0(ttot,regi) = cm_frac_CCS * pm_data(regi,"omf","ccsinje") * pm_inco0_t(ttot,regi,"ccsinje") 
                             * ( sum(teCCS2rlf(te,rlf), sum(ccs2te(ccsCO2(enty),enty2,te), vm_co2CCS.l(ttot,regi,enty,enty2,te,rlf) ) ) )
                             * (1/sm_ccsinjecrate) * sum(teCCS2rlf(te,rlf), sum(ccs2te(ccsCO2(enty),enty2,te), vm_co2CCS.l(ttot,regi,enty,enty2,te,rlf) ) ) / pm_dataccs(regi,"quan","1");			

modules/26_agCosts/costs_trade/not_used.txt

+name,type,reason
+pm_macCost,input,questionnaire

modules/26_agCosts/off/not_used.txt

+name,type,reason
+pm_macCost,input,questionnaire

modules/39_CCU/off/not_used.txt

+name,type,reason
+vm_prodSe,input,questionnaire
+vm_co2capture,input,questionnaire
+fm_dataemiglob,input,questionnaire

modules/40_techpol/CombLowCandCoalPO/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
 vm_prodSe, variable, ???
 vm_demPe,variable,???
 pm_prodCouple,parameter,???
 pm_pop,parameter,???
-sm_EJ_2_TWa,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
 pm_gdp,input,questionnaire
 vm_shUePeT,input,questionnaire
 pm_NuclearConstraint,input,questionnaire

modules/40_techpol/EVmandates/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
-sm_EJ_2_TWa,input,questionnaire
 vm_cap,parameter,???
 vm_demPe,parameter,???
 vm_prodSe,parameter,???
 pm_pop,parameter,???
 pm_ttot_val,parameter,???
 pm_prodCouple,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
 pm_gdp,input,questionnaire
 vm_shUePeT,input,questionnaire
 pm_NuclearConstraint,input,questionnaire

modules/40_techpol/NDC2018/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
 pm_ttot_val,parameter,???
-sm_EJ_2_TWa,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-vm_prodFe,input,questionnaire
-pm_tkpremused,input,questionnaire
-pm_inco0_t,input,questionnaire
 pm_NuclearConstraint,input,questionnaire

modules/40_techpol/NDC2018plus/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
 pm_ttot_val,parameter,???
-sm_EJ_2_TWa,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-vm_prodFe,input,questionnaire
-pm_tkpremused,input,questionnaire
-pm_inco0_t,input,questionnaire

modules/40_techpol/NPi2018/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
 pm_ttot_val,parameter,???
-sm_EJ_2_TWa,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-vm_prodFe,input,questionnaire
-pm_tkpremused,input,questionnaire
-pm_inco0_t,input,questionnaire
 vm_deltaCap,input,questionnaire
 pm_NuclearConstraint,input,questionnaire

modules/40_techpol/coalPhaseout/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
 vm_cap, variable, ???
 vm_prodSe, variable, ???
 vm_demPe,variable,???
 pm_prodCouple,parameter,???
 pm_pop,parameter,???
-sm_EJ_2_TWa,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
 pm_gdp,input,questionnaire
 vm_shUePeT,input,questionnaire
 pm_NuclearConstraint,input,questionnaire

modules/40_techpol/coalPhaseoutRegional/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
 vm_cap, variable, ???
 vm_prodSe, variable, ???
 vm_demPe,variable,???
 pm_prodCouple,parameter,???
-sm_EJ_2_TWa,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
 pm_gdp,input,questionnaire
 vm_shUePeT,input,questionnaire
 pm_NuclearConstraint,input,questionnaire

modules/40_techpol/lowCarbonPush/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
 vm_deltaCap, variable, ???
 vm_prodSe, variable, ???
@@ -11,12 +5,6 @@ pm_ttot_val, parameter, ???
 vm_demPe,variable,???
 pm_prodCouple,parameter,???
 pm_pop,parameter,???
-sm_EJ_2_TWa,parameter,???
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
 pm_gdp,input,questionnaire
 vm_shUePeT,input,questionnaire
 pm_NuclearConstraint,input,questionnaire