Merge pull request #1417 from fpiontek/develop

fixes and improvements in inequality and damage modules
remindmodel · Oct 5, 2023 · 9b38af8 · 9b38af8
2 parents c2d90df + d6267d3
commit 9b38af8
Show file tree

Hide file tree

Showing 51 changed files with 84 additions and 65 deletions.
diff --git a/main.gms b/main.gms
@@ -925,6 +925,16 @@ parameter
 ;
   cm_damage_KWSE                        = 0;     !! def = 0
 *'  {1.645 for 90% CI, 1.96 for 95% CI, no correction when 0}
+parameter
+  cm_sccConvergence			  "convergence indicator for SCC iteration"
+;
+  cm_sccConvergence			= 0.05;  !! def = 0.05
+;
+parameter
+  cm_tempConvergence			  "convergence indicator for temperature in damage iteration"
+;
+  cm_tempConvergence			= 0.05;  !! def = 0.05
+;
 parameter
   cm_carbonprice_temperatureLimit "not-to-exceed temperature target in degree above pre-industrial"
 ;

diff --git a/modules/02_welfare/ineqLognormal/datainput.gms b/modules/02_welfare/ineqLognormal/datainput.gms
@@ -41,9 +41,10 @@ display p02_ineqTheil;
 
 * for a policy run, we need to load values coming from the baseline for consumption, tax revenues and energy expenditures:
 if ((cm_emiscen ne 1),
-    Execute_Loadpoint 'input_bau' p02_taxrev_redistr0_ref=v02_taxrev_Add.l;
-    Execute_Loadpoint 'input_bau' p02_cons_ref=vm_cons.l;
-    Execute_Loadpoint 'input_bau' p02_energyExp_ref=v02_energyExp.l;
+    Execute_Loadpoint 'input_ref' p02_taxrev_redistr0_ref=v02_taxrev_Add.l;
+    Execute_Loadpoint 'input_ref' p02_cons_ref=vm_cons.l;
+    Execute_Loadpoint 'input_ref' p02_energyExp_ref=v02_energyExp.l;
+    Execute_Loadpoint 'input_ref' p02_damageFactor_ref=vm_damageFactor.l;
 
 * if energy system costs are used:
 *    Execute_Loadpoint 'input_bau' p02_energyExp_ref=vm_costEnergySys.l;

diff --git a/modules/02_welfare/ineqLognormal/declarations.gms b/modules/02_welfare/ineqLognormal/declarations.gms
@@ -14,6 +14,7 @@ pm_welf(tall)                                     "Weight parameter in the welfa
 pm_w(all_regi)                                    "Negishi weights"
 pm_prtp(all_regi)                                 "Pure rate of time preference"
 p02_cons_ref(ttot,all_regi)                        "consumption in reference run"
+p02_damageFactor_ref(ttot,all_regi)               "damage factor in reference run"
 p02_ineqTheil(ttot,all_regi)		                   "regional Theil-T index = sigma^2/2 for lognormal"
 p02_distrMu(ttot,all_regi)                         "mu of lognormal distribution (prior to mitigation costs)"
 p02_distrSigma(ttot,all_regi)                      "sigma of lognormal distribution (prior to mitigation costs)"

diff --git a/modules/02_welfare/ineqLognormal/equations.gms b/modules/02_welfare/ineqLognormal/equations.gms
@@ -125,7 +125,8 @@ q02_energyexpShare(ttot,regi)$(ttot.val ge cm_startyear)..
     v02_energyexpShare(ttot,regi)
   =e=
 * simply divided by conso
-    v02_energyExp_Add(ttot,regi)/(vm_cons(ttot,regi))
+    v02_energyExp_Add(ttot,regi)/(p02_cons_ref(ttot,regi))
+*    v02_energyExp_Add(ttot,regi)/(vm_cons(ttot,regi))
 * divided by adjusted conso
 *    (v02_energyExp_Add(ttot,regi))/(vm_cons(ttot,regi)+v02_energyExp_Add(ttot,regi)-v02_taxrev_Add(ttot,regi)$(v02_taxrev_Add.l(ttot,regi) ge 0))
 
@@ -145,7 +146,8 @@ q02_relTaxlevels(ttot,regi)$(ttot.val ge cm_startyear)..
     v02_revShare(ttot,regi)
   =e=
 * Simply divided by conso
-    v02_taxrev_Add(ttot,regi)$(v02_taxrev_Add.l(ttot,regi) ge 0)/vm_cons(ttot,regi)
+    v02_taxrev_Add(ttot,regi)$(v02_taxrev_Add.l(ttot,regi) ge 0)/p02_cons_ref(ttot,regi)
+*    v02_taxrev_Add(ttot,regi)$(v02_taxrev_Add.l(ttot,regi) ge 0)/vm_cons(ttot,regi)
 
 * Divided by adjusted conso
 *    (v02_taxrev_Add(ttot,regi)$(v02_taxrev_Add.l(ttot,regi) ge 0))/(vm_cons(ttot,regi)+v02_energyExp_Add(ttot,regi)-v02_taxrev_Add(ttot,regi)$(v02_taxrev_Add.l(ttot,regi) ge 0))
@@ -156,15 +158,17 @@ q02_relTaxlevels(ttot,regi)$(ttot.val ge cm_startyear)..
 q02_consLossShare(ttot,regi)$(ttot.val ge cm_startyear)..
     v02_damageConsShare(ttot,regi)
   =e=
-    1/(p02_damConsFactor1(ttot,regi)+vm_damageFactor(ttot,regi)*p02_damConsFactor2(ttot,regi))-1
+    vm_cons(ttot,regi)/((p02_damConsFactor1(ttot,regi)+vm_damageFactor(ttot,regi)*p02_damConsFactor2(ttot,regi))*p02_cons_ref(ttot,regi))-vm_cons(ttot,regi)/p02_cons_ref(ttot,regi)
+*    1/(p02_damConsFactor1(ttot,regi)+vm_damageFactor(ttot,regi)*p02_damConsFactor2(ttot,regi))-1
 ;
 
 * Alpha, the elasticity of energy expenditure, depends upon the region's GDP
 * We use the functional form and calibration from Soergel et al. 2021    
 q02_distrAlpha(ttot,regi)$(ttot.val ge cm_startyear)..
     v02_distrAlpha(ttot,regi)
     =e=
-    1+1.618788-2*0.09746092*log(1000*vm_cesIO(ttot,regi,"inco")/pm_pop(ttot,regi))
+    1+1.618788-2*0.09746092*log(1000*(vm_cesIO(ttot,regi,"inco")/pm_shPPPMER(regi)*vm_damageFactor(ttot,regi))/pm_pop(ttot,regi))
+*    1+1.618788-2*0.09746092*log(1000*vm_cesIO(ttot,regi,"inco")/pm_pop(ttot,regi))
 * Note that the above equation defines alpha as a parameter depending upon GDP, which could potentially bring a complex feedback (rich countries moderating GDP growth to reduce the regressivity of energy expenditures).
 * For tests, I also used previously consumption in the baseline instead of actual GDP in the current scenario, so that alpha is a parameter
 *    1+1.618788-2*0.09746092*log(1000*p02_cons_ref(ttot,regi)/pm_pop(ttot,regi))

diff --git a/modules/02_welfare/utilitarian/not_used.txt b/modules/02_welfare/utilitarian/not_used.txt
@@ -23,3 +23,4 @@ cm_distrAlphaDam,switch,???
 sm_tgn_2_pgc,scalar,???
 sm_tgch4_2_pgc,scalar,???
 pm_taxCO2eqRegi,input,added by codeCheck
+pm_shPPPMER,input,questionnaire
diff --git a/modules/15_climate/magicc/declarations.gms b/modules/15_climate/magicc/declarations.gms
@@ -31,7 +31,7 @@ p15_oghgf_minaer	"exogenous forcings from RCP: mineral dust",
 p15_oghgf_nitaer	"exogenous forcings from RCP: nitrates",
 p15_emicapregi(tall,all_regi)  "regional emission caps, used for calculation of global emission cap",
 p15_forc_magicc(tall) "actual radiative forcing as calculated by magicc [W/m^2]"
-p15_gmt_conv          "global mean temperature convergence"    
+pm_gmt_conv          "global mean temperature convergence"    
 p15_gmt0(tall)        "global mean temperature convergence saved for the next iteration"
 ;
 

diff --git a/modules/15_climate/magicc/postsolve.gms b/modules/15_climate/magicc/postsolve.gms
@@ -42,8 +42,8 @@ pm_globalMeanTemperature(tall) = pm_globalMeanTemperature(tall) - s15_tempOffset
 display pm_globalMeanTemperature;
 
 *** temperature convergence indicator
-p15_gmt_conv = 100*smax(t,abs(pm_globalMeanTemperature(t)/max(p15_gmt0(t),1e-8) -1));
-display p15_gmt_conv;
+pm_gmt_conv = 100*smax(t,abs(pm_globalMeanTemperature(t)/max(p15_gmt0(t),1e-8) -1));
+display pm_gmt_conv;
 *** save temp from last iteration
 p15_gmt0(tall) = pm_globalMeanTemperature(tall);
 

diff --git a/modules/15_climate/off/not_used.txt b/modules/15_climate/off/not_used.txt
@@ -14,3 +14,4 @@ cm_iterative_target_adj, switch, ???
 pm_globalMeanTemperatureZeroed1900,input,questionnaire
 pm_temperatureImpulseResponseCO2,input,questionnaire
 pm_globalMeanTemperature,input,questionnaire
+pm_gmt_conv,parameter,???
diff --git a/modules/29_CES_parameters/load/datainput.gms b/modules/29_CES_parameters/load/datainput.gms
@@ -8,7 +8,7 @@
 *** Load CES parameters based on current model configuration
 *** ATTENTION the file name is replaced by the function start_run()
 *##################### R SECTION START (CES INPUT) ##########################
-$include "./modules/29_CES_parameters/load/input/indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SSP2EU-GDP_gdp_SSP2EU-En_gdp_SSP2EU-Kap_debt_limit-Reg_62eff8f7.inc"
+$include "./modules/29_CES_parameters/load/input/indu_subsectors-buil_simple-tran_edge_esm-POP_pop_SDP_MC-GDP_gdp_SDP_MC-En_gdp_SDP_MC-Kap_debt_limit-Reg_62eff8f7.inc"
 *###################### R SECTION END (CES INPUT) ###########################
 
 

diff --git a/modules/50_damages/BurkeLike/not_used.txt b/modules/50_damages/BurkeLike/not_used.txt
@@ -16,7 +16,6 @@ pm_tempScaleGlob2Reg,input,questionnaire
 pm_damageMarginalTC,input,questionnaire
 pm_GDPGrossIso,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageProd,input,questionnaire
 pm_damageTC,input,questionnaire
 pm_damageGrowthRateTC,input,questionnaire

diff --git a/modules/50_damages/DiceLike/not_used.txt b/modules/50_damages/DiceLike/not_used.txt
@@ -26,7 +26,6 @@ pm_GDPfrac,input,questionnaire
 pm_gdp,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_shPPPMER,input,questionnaire
 pm_interpolWeight_ttot_tall,input,questionnaire
 pm_tall_2_ttot,input,questionnaire
diff --git a/modules/50_damages/KWLike/not_used.txt b/modules/50_damages/KWLike/not_used.txt
@@ -19,7 +19,6 @@ pm_damageTC,input,questionnaire
 pm_damageGrowthRateTC,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageProd,input,questionnaire
 pm_GDPfrac,input,questionnaire
 pm_gdp,input,questionnaire

diff --git a/modules/50_damages/KWTCint/not_used.txt b/modules/50_damages/KWTCint/not_used.txt
@@ -12,6 +12,5 @@ pm_temperatureImpulseResponseCO2,input,questionnaire
 cm_damage_KWSE,input,questionnaire
 pm_tempScaleGlob2Reg,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
diff --git a/modules/50_damages/KW_SE/datainput.gms b/modules/50_damages/KW_SE/datainput.gms
@@ -34,7 +34,6 @@ p50_cov_b1_b2 = 1.354e-7;
 * initialize
 pm_damage(tall,regi) = 1;
 pm_damageImp(tall,tall2,regi) = 1;
-pm_damageScc(tall,tall2,regi) = 1;
 pm_damageGrowthRate(tall,regi)         = 0;
 pm_damageMarginalT(tall,regi)           = 0;
 pm_damageMarginalTm1(tall,regi)           = 0;

diff --git a/modules/50_damages/KW_SE/declarations.gms b/modules/50_damages/KW_SE/declarations.gms
@@ -11,7 +11,6 @@ p50_regionalTemperatureImp(tall,tall,all_regi)	     "regional temperature with e
 p50_damageGrowthRateImp(tall,tall,all_regi)	     "growth rate damage with emission pulse"
 p50_seImp(tall,tall,all_regi)			     "damage standard error with emission pulse"
 pm_damageImp(tall,tall,all_regi)		     "damage with emission pulse"
-pm_damageScc(tall,tall,all_regi)		     "damage without pulse"
 pm_damage(tall,all_regi)                             "damage factor (reduces GDP)"
 pm_damageGrowthRate(tall,all_regi)                   "damage function for growth rate of GDP"
 pm_damageMarginalT(tall,all_regi)                    "damage function derivative for KW"

diff --git a/modules/50_damages/KW_SE/postsolve.gms b/modules/50_damages/KW_SE/postsolve.gms
@@ -85,6 +85,7 @@ p50_damageGrowthRateImp(tall,tall2,regi)$(tall.val le 2020) = 0;
 *no growth rate damages after 2150 to prevent extreme runaway damages
 pm_damageGrowthRate(tall,regi)$(tall.val gt 2150) = 0;
 p50_damageGrowthRateImp(tall,tall2,regi)$(tall.val gt 2150) = 0;
+p50_damageGrowthRateImp(tall,tall2,regi)$(tall2.val gt 2150) = 0;
 
 *damage function. match observed 2020 GDP, that is, assume that no climate damages unitl then.
 *damage factor for budget equation
@@ -93,12 +94,7 @@ pm_damage(tall,regi)$(tall.val ge 2020 and tall.val le 2300) =
     (1 + pm_damageGrowthRate(tall2,regi))
     )
 ;
-*damage used in SCC calculation
-pm_damageScc(tall,tall2,regi)$(tall.val ge 2020 and tall.val le 2300 and tall2.val ge 2020 and tall2.val le 2300) =
-    prod(tall3$(tall3.val gt tall.val AND tall3.val le tall2.val),
-    (1 + pm_damageGrowthRate(tall3,regi))
-    )
-;
+
 *damage with emission pulse for SCC calculation
 pm_damageImp(tall,tall2,regi)$(tall.val ge 2020 and tall.val le 2300 and tall2.val ge 2020 and tall2.val le 2300) =
     prod(tall3$(tall3.val gt tall.val AND tall3.val le tall2.val),

diff --git a/modules/50_damages/Labor/not_used.txt b/modules/50_damages/Labor/not_used.txt
@@ -26,7 +26,6 @@ pm_GDPfrac,input,questionnaire
 pm_gdp,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_shPPPMER,input,questionnaire
 pm_interpolWeight_ttot_tall,input,questionnaire
 pm_tall_2_ttot,input,questionnaire
diff --git a/modules/50_damages/TC/not_used.txt b/modules/50_damages/TC/not_used.txt
@@ -20,4 +20,3 @@ pm_damageMarginalTm1,input,questionnaire
 pm_damageMarginalTm2,input,questionnaire
 pm_damageMarginalTC,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
diff --git a/modules/50_damages/off/not_used.txt b/modules/50_damages/off/not_used.txt
@@ -29,7 +29,6 @@ pm_gdp,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
 pm_damageTC,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_shPPPMER,input,questionnaire
 pm_interpolWeight_ttot_tall,input,questionnaire
 pm_tall_2_ttot,input,questionnaire
diff --git a/modules/51_internalizeDamages/BurkeLikeItr/declarations.gms b/modules/51_internalizeDamages/BurkeLikeItr/declarations.gms
@@ -14,7 +14,7 @@ p51_sccLastItr(tall) "Social cost of carbon (due to GDP damages) from last itera
 p51_sccParts(tall,tall,all_regi) "Social cost of carbon components (time, region)"
 
 
-p51_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
+pm_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
 ;
 
 *** EOF ./modules/51_internalizeDamages/BurkeLikeItr/declarations.gms
diff --git a/modules/51_internalizeDamages/BurkeLikeItr/not_used.txt b/modules/51_internalizeDamages/BurkeLikeItr/not_used.txt
@@ -19,7 +19,6 @@ pm_GDPfrac,input,questionnaire
 pm_damageMarginalTC,input,questionnaire
 pm_GDPGrossIso,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
 pm_sccIneq,input,questionnaire
diff --git a/modules/51_internalizeDamages/BurkeLikeItr/postsolve.gms b/modules/51_internalizeDamages/BurkeLikeItr/postsolve.gms
@@ -55,7 +55,7 @@ display p51_scc,pm_taxCO2eqSCC;
 
 
 * convergence indicator:
-p51_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
-display p51_sccConvergenceMaxDeviation;
+pm_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
+display pm_sccConvergenceMaxDeviation;
 
 *** EOF ./modules/51_internalizeDamages/BurkeLikeItr/postsolve.gms
diff --git a/modules/51_internalizeDamages/DiceLikeItr/declarations.gms b/modules/51_internalizeDamages/DiceLikeItr/declarations.gms
@@ -10,7 +10,7 @@ parameters
 p51_scc(tall) "Social cost of carbon (due to GDP damages) [$ per tCO2eq]"
 p51_sccLastItr(tall) "Social cost of carbon (due to GDP damages) from last iteration [$ per tCO2eq]"
 
-p51_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
+pm_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
 ;
 
 *** EOF ./modules/51_internalizeDamages/DiceLikeItr/declarations.gms
diff --git a/modules/51_internalizeDamages/DiceLikeItr/not_used.txt b/modules/51_internalizeDamages/DiceLikeItr/not_used.txt
@@ -23,7 +23,6 @@ pm_GDPfrac,input,questionnaire
 pm_damageMarginalTC,input,questionnaire
 pm_GDPGrossIso,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
 pm_sccIneq,input,questionnaire
diff --git a/modules/51_internalizeDamages/DiceLikeItr/postsolve.gms b/modules/51_internalizeDamages/DiceLikeItr/postsolve.gms
@@ -33,7 +33,7 @@ display p51_scc,pm_taxCO2eqSCC;
 
 
 * convergence indicator:
-p51_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
-display p51_sccConvergenceMaxDeviation;
+pm_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
+display pm_sccConvergenceMaxDeviation;
 
 *** EOF ./modules/51_internalizeDamages/DiceLikeItr/postsolve.gms
diff --git a/modules/51_internalizeDamages/KWTCintItr/declarations.gms b/modules/51_internalizeDamages/KWTCintItr/declarations.gms
@@ -16,7 +16,7 @@ p51_sccParts(tall,tall,all_regi) "Social cost of carbon components (time, region
 p51_sccPartsTC(tall,tall,all_regi) "Social cost of carbon components (time, region)"
 
 
-p51_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
+pm_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
 ;
 
 *** EOF ./modules/51_internalizeDamages/KWTCintItr/declarations.gms
diff --git a/modules/51_internalizeDamages/KWTCintItr/not_used.txt b/modules/51_internalizeDamages/KWTCintItr/not_used.txt
@@ -14,7 +14,6 @@ pm_damage,input,questionnaire
 pm_tall_2_ttot,input,questionnaire
 pm_GDPGrossIso,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
 pm_sccIneq,input,questionnaire
diff --git a/modules/51_internalizeDamages/KWTCintItr/postsolve.gms b/modules/51_internalizeDamages/KWTCintItr/postsolve.gms
@@ -72,8 +72,8 @@ display p51_scc,pm_taxCO2eqSCC;
 
 
 * convergence indicator:
-p51_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
-display p51_sccConvergenceMaxDeviation;
+pm_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
+display pm_sccConvergenceMaxDeviation;
 
 
 

diff --git a/modules/51_internalizeDamages/KW_SEitr/declarations.gms b/modules/51_internalizeDamages/KW_SEitr/declarations.gms
@@ -13,7 +13,7 @@ p51_sccLastItr(tall) "Social cost of carbon (due to GDP damages) from last itera
 p51_sccParts(tall,tall,all_regi) "Social cost of carbon components (time, region)"
 
 
-p51_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
+pm_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
 ;
 
 *** EOF ./modules/51_internalizeDamages/KW_SEitr/declarations.gms
diff --git a/modules/51_internalizeDamages/KW_SEitr/not_used.txt b/modules/51_internalizeDamages/KW_SEitr/not_used.txt
@@ -13,7 +13,6 @@ pm_temperatureImpulseResponseCO2,input,questionnaire
 pm_interpolWeight_ttot_tall,input,questionnaire
 pm_tall_2_ttot,input,questionnaire
 pm_tempScaleGlob2Reg,input,questionnaire
-pm_damage,input,questionnaire
 pm_damageGrowthRate,input,questionnaire
 pm_damageMarginalT,input,questionnaire
 pm_damageMarginalTm1,input,questionnaire

diff --git a/modules/51_internalizeDamages/KW_SEitr/postsolve.gms b/modules/51_internalizeDamages/KW_SEitr/postsolve.gms
@@ -13,7 +13,7 @@ p51_sccParts(tall,tall2,regi2)$((tall.val ge 2010) and (tall.val le 2150) and (t
 	 (1 + pm_prtp(regi2) )**(-(tall2.val - tall.val))
 	* pm_consPC(tall,regi2)/pm_consPC(tall2,regi2) 
         * pm_GDPGross(tall2,regi2) 
-	* (pm_damageScc(tall,tall2,regi2)-pm_damageImp(tall,tall2,regi2)) 
+	* (pm_damage(tall2,regi2)-pm_damageImp(tall,tall2,regi2)) 
 ;
 
 *convert unit from tr$/GtC to $/tCO2 as GDP is in tr$ and pulse is 1 GtC
@@ -49,8 +49,8 @@ display pm_taxCO2eqSCC;
 
 
 * convergence indicator:
-p51_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
-display p51_sccConvergenceMaxDeviation;
+pm_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
+display pm_sccConvergenceMaxDeviation;
 
 
 *** EOF ./modules/51_internalizeDamages/KW_SEitr/postsolve.gms
diff --git a/modules/51_internalizeDamages/KWlikeItr/declarations.gms b/modules/51_internalizeDamages/KWlikeItr/declarations.gms
@@ -14,7 +14,7 @@ p51_sccLastItr(tall) "Social cost of carbon (due to GDP damages) from last itera
 p51_sccParts(tall,tall,all_regi) "Social cost of carbon components (time, region)"
 
 
-p51_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
+pm_sccConvergenceMaxDeviation "max deviation of SCC from last iteration [percent]"
 ;
 
 *** EOF ./modules/51_internalizeDamages/KWlikeItr/declarations.gms
diff --git a/modules/51_internalizeDamages/KWlikeItr/not_used.txt b/modules/51_internalizeDamages/KWlikeItr/not_used.txt
@@ -18,6 +18,5 @@ pm_GDPfrac,input,questionnaire
 pm_damageMarginalTC,input,questionnaire
 pm_GDPGrossIso,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
diff --git a/modules/51_internalizeDamages/KWlikeItr/postsolve.gms b/modules/51_internalizeDamages/KWlikeItr/postsolve.gms
@@ -57,8 +57,8 @@ display p51_scc,pm_taxCO2eqSCC;
 
 
 * convergence indicator:
-p51_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
-display p51_sccConvergenceMaxDeviation;
+pm_sccConvergenceMaxDeviation = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall)/max(p51_sccLastItr(tall),1e-8) - 1) );
+display pm_sccConvergenceMaxDeviation;
 
 
 

diff --git a/modules/51_internalizeDamages/KWlikeItrCPnash/declarations.gms b/modules/51_internalizeDamages/KWlikeItrCPnash/declarations.gms
@@ -14,7 +14,7 @@ p51_sccLastItr(tall,all_regi) "Social cost of carbon (due to GDP damages) from l
 p51_sccParts(tall,tall,all_regi) "Social cost of carbon components (time, region)"
 
 
-p51_sccConvergenceMaxDeviation(all_regi) "max deviation of SCC from last iteration [percent]"
+pm_sccConvergenceMaxDeviation(all_regi) "max deviation of SCC from last iteration [percent]"
 ;
 
 *** EOF ./modules/51_internalizeDamages/KWlikeItrCPnash/declarations.gms
diff --git a/modules/51_internalizeDamages/KWlikeItrCPnash/not_used.txt b/modules/51_internalizeDamages/KWlikeItrCPnash/not_used.txt
@@ -19,6 +19,5 @@ pm_GDPfrac,input,questionnaire
 pm_damageMarginalTC,input,questionnaire
 pm_GDPGrossIso,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire
diff --git a/modules/51_internalizeDamages/KWlikeItrCPnash/postsolve.gms b/modules/51_internalizeDamages/KWlikeItrCPnash/postsolve.gms
@@ -55,8 +55,8 @@ display p51_scc,pm_taxCO2eqSCC;
 
 
 * convergence indicator:
-p51_sccConvergenceMaxDeviation(regi) = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall,regi)/max(p51_sccLastItr(tall,regi),1e-8) - 1) );
-display p51_sccConvergenceMaxDeviation;
+pm_sccConvergenceMaxDeviation(regi) = 100 * smax(tall$(tall.val ge cm_startyear and tall.val lt 2150),abs(p51_scc(tall,regi)/max(p51_sccLastItr(tall,regi),1e-8) - 1) );
+display pm_sccConvergenceMaxDeviation;
 
 
 *** EOF ./modules/51_internalizeDamages/KWlikeItrCPnash/postsolve.gms
diff --git a/modules/51_internalizeDamages/KWlikeItrCPreg/declarations.gms b/modules/51_internalizeDamages/KWlikeItrCPreg/declarations.gms
@@ -14,7 +14,7 @@ p51_sccLastItr(tall,all_regi) "Social cost of carbon (due to GDP damages) from l
 p51_sccParts(tall,tall,all_regi) "Social cost of carbon components (time, region)"
 
 
-p51_sccConvergenceMaxDeviation(all_regi) "max deviation of SCC from last iteration [percent]"
+pm_sccConvergenceMaxDeviation(all_regi) "max deviation of SCC from last iteration [percent]"
 ;
 
 *** EOF ./modules/51_internalizeDamages/KWlikeItrCPreg/declarations.gms
diff --git a/modules/51_internalizeDamages/KWlikeItrCPreg/not_used.txt b/modules/51_internalizeDamages/KWlikeItrCPreg/not_used.txt
@@ -18,6 +18,5 @@ pm_GDPfrac,input,questionnaire
 pm_damageMarginalTC,input,questionnaire
 pm_GDPGrossIso,input,questionnaire
 pm_damageImp,input,questionnaire
-pm_damageScc,input,questionnaire
 pm_damageIso,input,questionnaire
 pm_damageGrowthRateIso,input,questionnaire