delete realization 36_buildings/services_putty and 36_buildings/services_with_capital

core/datainput.gms

@@ -194,10 +194,10 @@ $if not "%cm_learnRate%" == "off" parameter p_new_learnRate(all_te) / %cm_learnR
 $if not "%cm_learnRate%" == "off" fm_dataglob("learn",te)$p_new_learnRate(te)=p_new_learnRate(te);
 
 *RP* the new cost data in generisdata_tech is now in $2015. As long as the model runs in $2005, these values have first to be converted to D2005 by dividing by 1.2 downwards
-fm_dataglob("inco0",te)              = sm_D2015_2_D2005 * fm_dataglob("inco0",te);
-fm_dataglob("incolearn",te)          = sm_D2015_2_D2005 * fm_dataglob("incolearn",te);
-fm_dataglob("omv",te)                = sm_D2015_2_D2005 * fm_dataglob("omv",te);
-p_inco0(ttot,regi,te)               = sm_D2015_2_D2005 * p_inco0(ttot,regi,te);
+fm_dataglob("inco0",te)              = s_D2015_2_D2005 * fm_dataglob("inco0",te);
+fm_dataglob("incolearn",te)          = s_D2015_2_D2005 * fm_dataglob("incolearn",te);
+fm_dataglob("omv",te)                = s_D2015_2_D2005 * fm_dataglob("omv",te);
+p_inco0(ttot,regi,te)               = s_D2015_2_D2005 * p_inco0(ttot,regi,te);
 
 *RP* rescale the global CSP investment costs in REMIND: Originally we assume a SM3/12h setup, while the cost data from IEA for the short term seems rather based on a SM2/6h setup (with 40% average CF)
 *** Accordingly, also decrease long-term costs in REMIND to 0.7 of the current values
@@ -231,10 +231,10 @@ $ENDIF.WindOff
 *** inco0 (and incolearn) are given in $/kW (or $/(tC/a) for ccs-related tech or $/(t/a) for process-based industry)
 *** convert to REMIND units, i.e., T$/TW (or T$/(GtC/a) for ccs-related tech or T$/(Gt/a) for process-based industry)
 *** note that factor for $/kW -> T$/TW is the same as for $/(tC/a) -> T$/(GtC/a)
-fm_dataglob("inco0",te)              = sm_DpKW_2_TDpTW       * fm_dataglob("inco0",te);
-fm_dataglob("incolearn",te)          = sm_DpKW_2_TDpTW       * fm_dataglob("incolearn",te);
+fm_dataglob("inco0",te)              = s_DpKW_2_TDpTW       * fm_dataglob("inco0",te);
+fm_dataglob("incolearn",te)          = s_DpKW_2_TDpTW       * fm_dataglob("incolearn",te);
 fm_dataglob("omv",te)                = s_DpKWa_2_TDpTWa      * fm_dataglob("omv",te);
-p_inco0(ttot,regi,te)               = sm_DpKW_2_TDpTW       * p_inco0(ttot,regi,te);
+p_inco0(ttot,regi,te)               = s_DpKW_2_TDpTW       * p_inco0(ttot,regi,te);
 
 
 table fm_dataemiglob(all_enty,all_enty,all_te,all_enty)  "read-in of emissions factors co2,cco2"

core/declarations.gms

@@ -38,8 +38,6 @@ pm_taxemiMkt_iteration(iteration,ttot,all_regi,all_emiMkt) "CO2 or CO2eq region
 pm_emissionsForeign(tall,all_regi,all_enty)          "total emissions of other regions (nash relevant)"
 pm_co2eqForeign(tall,all_regi)                       "emissions, which are part of the climate policy, of other regions (nash relevant)"
 pm_cesdata(tall,all_regi,all_in,cesParameter)        "parameters of the CES function"
-pm_cesdata_putty(tall,all_regi,all_in,cesParameter)  "quantities for the putty clay factors"
-pm_capital_lifetime_exp(all_regi,all_in)             "number of years for which 25% of the CES capital stocks remains"
 f_pop(tall,all_regi,all_POPscen)                     "population data for all possible scenarios"
 pm_pop(tall,all_regi)                                "population data [bn people]"
 pm_gdp(tall,all_regi)                                "GDP data [trn US$ 2005]"
@@ -261,9 +259,6 @@ p_FEPrice_by_Sector_iter(iteration,ttot,all_regi,all_enty,sector)
 p_FEPrice_by_EmiMkt_iter(iteration,ttot,all_regi,all_enty,emiMkt)               "parameter to save iteration FE marginal price per emission market (tr$2005/TWa)"
 p_FEPrice_by_FE_iter(iteration,ttot,all_regi,all_enty)                          "parameter to save iteration FE marginal price (tr$2005/TWa)"
 
-pm_tau_fe_tax(ttot,all_regi,emi_sectors,all_enty)    "tax path for final energy"
-pm_tau_fe_sub(ttot,all_regi,emi_sectors,all_enty)    "subsidy path for final energy"
-
 *** climate related
 pm_globalMeanTemperature(tall)                       "global mean temperature anomaly"
 pm_globalMeanTemperatureZeroed1900(tall)             "global mean temperature anomaly, zeroed around 1900"
@@ -372,7 +367,6 @@ v_changeProdStartyearSlack(ttot,all_regi,all_te)     "slack variable to allow a
 positive variables
 ***----------------------------------------------------------------------------------------
 ***-------------------------------------------------MACRO module---------------------------
-vm_enerSerAdj(tall,all_regi,all_in)                  "adjustment costs for energy service transformations"
 vm_esCapInv(ttot,all_regi,all_teEs)                   "investment for energy end-use capital at the energy service level"
 ***----------------------------------------------------------------------------------------
 *-----------------------------------------------ESM module---------------------------------
@@ -476,7 +470,7 @@ q_costTeCapital(tall,all_regi,all_te)                "calculation of investment
 
 q_balPe(ttot,all_regi,all_enty)                      "balance of primary energy (pe)"
 q_balSe(ttot,all_regi,all_enty)                      "balance of secondary energy (se)"
-qm_balFe(ttot,all_regi,all_enty,all_enty,all_te)     "balance of final energy (fe)"
+q_balFe(ttot,all_regi,all_enty,all_enty,all_te)     "balance of final energy (fe)"
 q_balFeAfterTax(ttot,all_regi,all_enty,all_enty,emi_sectors,all_emiMkt) "balance of final energy after considering FE sectoral taxes (fe)"
 
 q_transPe2se(ttot,all_regi,all_enty,all_enty,all_te) "energy tranformation pe to se"
@@ -576,8 +570,6 @@ o_modelstat                                           "critical solver status fo
 pm_conv_TWa_EJ                                        "conversion from TWa to EJ"               /31.536/,
 sm_c_2_co2                                            "conversion from c to co2"                /3.666666666667/,
 *** conversion factors of time units
-sm_year_2_day                                         "days per year"                           /365/,
-sm_day_2_hour                                         "hours per day"                           /24/,
 sm_mega_2_non                                         "mega to non"                             /1e+6/,
 sm_giga_2_non                                         "giga to non"                             /1e+9/,
 sm_trillion_2_non                                     "trillion to non"                         /1e+12/,
@@ -592,7 +584,7 @@ sm_TWa_2_kWh                                          "tera Watt year to kilo Wa
 *RP* multiply this number by the conversion factor s_xxx_2_yyy to get the new value in Unit yyy.
 s_NO2_2_N                                             "convert NO2 to N [14 / (14 + 2 * 16)]"   / .304 /
 s_DpKWa_2_TDpTWa                                      "convert Dollar per kWa to TeraDollar per TeraWattYear"       /0.001/
-sm_DpKW_2_TDpTW                                       "convert Dollar per kW to TeraDollar per TeraWatt"            /0.001/
+s_DpKW_2_TDpTW                                       "convert Dollar per kW to TeraDollar per TeraWatt"            /0.001/
 sm_DpGJ_2_TDpTWa                                      "multipl. factor to convert (Dollar per GJoule) to (TerraDollar per TWyear)"    / 31.54e-03/
 s_gwpCH4                                              "Global Warming Potentials of CH4, AR5 WG1 CH08 Table 8.7"     /28/
 s_gwpN2O                                              "Global Warming Potentials of N2O, AR5 WG1 CH08 Table 8.7"     /265/
@@ -603,7 +595,7 @@ sm_tgch4_2_pgc                                         "conversion factor 100-yr
 
 s_MtCH4_2_TWa                                        "Energy content of methane. MtCH4 --> TWa: 1 MtCH4 = 1.23 * 10^6 toe * 42 GJ/toe * 10^-9 EJ/GJ * 1 TWa/31.536 EJ = 0.001638 TWa (BP statistical review)"  /0.001638/
 
-sm_D2015_2_D2005                                      "Convert $2015 to $2005 by dividing by 1.2: 1/1.2 = 0.8333"      /0.8333/
+s_D2015_2_D2005                                      "Convert $2015 to $2005 by dividing by 1.2: 1/1.2 = 0.8333"      /0.8333/
 sm_DptCO2_2_TDpGtC                                    "Conversion multiplier to go from $/tCO2 to T$/GtC: 44/12/1000"     /0.00366667/
 
 s_co2pipe_leakage                                     "Leakage rate of CO2 pipelines. [0..1]"

core/equations.gms

@@ -215,7 +215,7 @@ q_transSe2se(t,regi,se2se(enty,enty2,te))..
 ***---------------------------------------------------------------------------
 *** FE Balance
 ***---------------------------------------------------------------------------
-qm_balFe(t,regi,entySe,entyFe,te)$se2fe(entySe,entyFe,te)..
+q_balFe(t,regi,entySe,entyFe,te)$se2fe(entySe,entyFe,te)..
   vm_prodFe(t,regi,entySe,entyFe,te)
   =e=
   sum((sector2emiMkt(sector,emiMkt),entyFE2sector(entyFE,sector)),

core/sets_calculations.gms

@@ -68,12 +68,7 @@ ppf("lab")  = YES;
 
 *** calculate intermediate production factors
 ipf(all_in) = in(all_in) - ppf(all_in);
-ipf_putty(all_in) = in_putty(all_in) - ppf_putty(all_in);
-loop ( out,
-ppfIO_putty(in)$(cesOut2cesIn(out,in)
-                  AND ipf_putty(in)
-                  AND NOT in_putty(out))          = YES;
-);
+
 *** Initialise cesLevel2cesIO and cesRev2cesIO
 loop (counter$( ord(counter) eq 1 ),
   cesLevel2cesIO(counter,"inco") = YES;   !! the root is at the lowest level
@@ -114,18 +109,10 @@ loop ((cesRev2cesIO(counter,in),cesOut2cesIn(in,in2)),
   cesOut2cesIn_below(in,in2) = YES;
 );
 
-in_below_putty(in) = NO;
-loop (ppf_putty,
-in_below_putty(in)$cesOut2cesIn_below(ppf_putty,in) = YES;
-);
-
-
 *** Aliasing of mappings is not available in all GAMS versions
 cesOut2cesIn2(out,in) = cesOut2cesIn(out,in);
 
-
 *** Computing the reference complentary factors
-
 $offOrder
 sm_tmp = 0;
 loop (cesOut2cesIn(out,in) $ in_complements(in),

main.gms

@@ -328,8 +328,6 @@ $setglobal transport  edge_esm           !! def = edge_esm
 *'---------------------    36_buildings    ---------------------------------
 *'
 *' * (simple): representation of final energy demand via a CES function calibrated to EDGE-Buildings' demand trajectories
-*' * (services_with_capital): representation of the demand by energy service with capital
-*' * (services_putty): representation of the demand by energy service with capital and with putty-clay for buildings insulation
 $setglobal buildings  simple      !! def = simple
 *'---------------------    37_industry    ----------------------------------
 *'
@@ -951,21 +949,11 @@ parameter
 *' * (3) Energy Efficiency policy: higher discount rate until cm_start_year and 25% of the initial value afterwards.
 *' * (4) Energy Efficiency policy: higher discount rate until cm_start_year, decreasing to 25% value linearly until 2030.
 *'
-parameter
-  cm_noReboundEffect      "Switch for allowing a rebound effect when closing the efficiency gap (cm_DiscRateScen)"
-;
-  cm_noReboundEffect     = 0;
-*'  price sensitivity of logit function for heating and cooking technological choice
 parameter
   c_H2InBuildOnlyAfter "Switch to fix H2 in buildings to zero until given year"
 ;
   c_H2InBuildOnlyAfter = 2150;   !! def = 2150 (rule out H2 in buildings)
 *' For all years until the given year, FE demand for H2 in buildings is set to zero
-parameter
-  cm_priceSensiBuild    "Price sensitivity of energy carrier choice in buildings"
-;
-  cm_priceSensiBuild     = -3;
-*'  price sensitivity of logit function for heating and cooking technological choice
 parameter
   c_peakBudgYr       "date of net-zero CO2 emissions for peak budget runs without overshoot"
 ;
@@ -1052,11 +1040,6 @@ parameter
 ;
   cm_build_H2costDecayEnd = 0.1;  !! def = 0.1
 *'
-parameter
-  cm_build_AdjCostActive      "Activate adjustment cost to penalise inter-temporal variation of area-specific weatherisation demand and space cooling efficiency slope (only in putty)"
-;
-  cm_build_AdjCostActive = 0;  !! def = 0: Adjustment cost deactivated (set to 1 to activate)  !! regexp = 0|1
-*'
 parameter
   cm_indst_H2costAddH2Inv     "additional h2 distribution costs for low diffusion levels (default value: 3.25$kg = 0.1 $/kWh)"
 ;
@@ -1091,16 +1074,6 @@ parameter
 *' * (0) none
 *' * (1) no fossil carbon and capture in Germany
 *'
-parameter
-  cm_logitCal_markup_conv_b   "value to which logit calibration markup of standard fe2ue technologies in detailed buildings module converges to"
-;
-  cm_logitCal_markup_conv_b = 0.8;  !! def = 0.8
-*'  long-term convergence value of detailed buildings fe2ue conventional techs price markup
-parameter
-  cm_logitCal_markup_newtech_conv_b "value to which logit calibration markup of new fe2ue technologies in detailed buildings module converges to"
-;
-  cm_logitCal_markup_newtech_conv_b = 0.3; !! def = 0.3
-*'  long-term convergence value of detailed buildings fe2ue new techs price markup
 parameter
   cm_startIter_EDGET          "starting iteration of EDGE-T"
 ;

modules/01_macro/singleSectorGr/bounds.gms

@@ -10,18 +10,12 @@
 vm_cons.lo(t,regi)     = 1e-3;
 vm_cesIO.lo(t,regi,in)$( NOT in_industry_dyn37(in) ) 
   = max(1e-6, abs(pm_cesdata(t,regi,in,"offset_quantity")));
-vm_cesIOdelta.lo(t,regi,in_putty) = 1e-6;
 
 *** fix energy inputs to CES structure in t0 to the parameter values
 vm_cesIO.fx(t0(tall),regi,in)$(   ppfEn(in) 
-                               OR ppfIO_putty(in) 
                                OR industry_ue_calibration_target_dyn37(in) )
   = pm_cesdata(tall,regi,in,"quantity");
 
-vm_cesIOdelta.fx(t0(tall),regi,in)$( ppfEn(in) OR in_putty(in) )
-  = pm_cesdata_putty(tall,regi,in,"quantity");
-
-
 *** set macro investments to bound in 2005
 vm_invMacro.fx("2005",regi,"kap") = p01_boundInvMacro(regi);
 *cb 2012-05-23 lower bound for capital investment to avoid "zero investment" problem for the conopt solver

modules/01_macro/singleSectorGr/declarations.gms

@@ -10,8 +10,8 @@
 ***-------------------------------------------------------------------------------
 parameters
 pm_delta_kap(all_regi,all_in)                                   "Depreciation rate of capital."
-pm_cumDeprecFactor_old(ttot,all_regi,all_in)                    "Investment depreciation within a period, applied to the investment of t -1."
-pm_cumDeprecFactor_new(ttot,all_regi,all_in)                    "Investment depreciation within a period, applied to the investment of t."
+p01_cumDeprecFactor_old(ttot,all_regi,all_in)                    "Investment depreciation within a period, applied to the investment of t -1."
+p01_cumDeprecFactor_new(ttot,all_regi,all_in)                    "Investment depreciation within a period, applied to the investment of t."
 p01_ppfen_ratios(ttot,all_regi,all_in,all_in)                   "Limit ratio of two primary production factors of energy (ppfEn)."
 pm_ppfen_shares(ttot,all_regi,all_in,all_in)                    "Limit the share of one ppfEn in total CES nest inputs."
 pm_consPC(tall,all_regi)                                        "Consumption per capita"
@@ -33,11 +33,9 @@ vm_cesIO(tall,all_regi,all_in)                                  "Production fact
 vm_invMacro(ttot,all_regi,all_in)                               "Investment for capital for ttot"
 v01_invMacroAdj(ttot,all_regi,all_in)                           "Adjustment costs of macro economic investments"
 vm_invInno(ttot,all_regi,all_in)                                "Investment into innovation"
-vm_invImi(ttot, all_regi,all_in)                                "Investment into imitation"     
-
-*** putty-clay variables   
-vm_cesIOdelta(tall,all_regi,all_in)                             "Putty-clay production factor"  
-;   
+vm_invImi(ttot, all_regi,all_in)                                "Investment into imitation" 
+v01_enerSerAdj(tall,all_regi,all_in)                             "adjustment costs for energy service transformations"
+;
 ***------------------------------------------------------------ -------------------
 ***                                   EQUATIONS 
 ***------------------------------------------------------------ -------------------
@@ -52,10 +50,5 @@ q01_invMacroAdj(ttot,all_regi,all_in)                           "Adjustment cost
 q01_limitShPpfen(ttot,all_regi,all_in,all_in)                   "Limit the share of one ppfEn in total CES nest inputs"
 q01_limtRatioPpfen(ttot,all_regi,all_in,all_in)                 "Limit the ratio of two ppfEn"
 
-*** putty-clay equations    
-q01_cesIO_puttyclay(ttot,all_regi,all_in)                       "Putty-clay production function"
-q01_puttyclay(ttot,all_regi,all_in)                             "Putty-clay Correspondance between variations in input and past stocks of input"
-q01_prodCompl_putty(ttot,all_regi,all_in,all_in)                "Putty-Clay constraints for perfect complements in the CES tree"
-q01_kapMo_putty(ttot,all_regi,all_in)                           "Putty-clay capital motion equation"
 ;
 *** EOF ./modules/01_macro/singleSectorGr/declarations.gms