From bb16cbfa93068d024c2cd7f62eaf51dd3082b7e0 Mon Sep 17 00:00:00 2001
From: Marianna Rottoli <marianna.rottoli@mail.polimi.it>
Date: Fri, 31 Jan 2020 09:41:13 +0100
Subject: [PATCH] Bugfixes in calibration and new sigmas for transport.
---
modules/29_CES_parameters/calibrate/datainput.gms | 4 ++--
modules/29_CES_parameters/calibrate/declarations.gms | 2 +-
modules/29_CES_parameters/calibrate/preloop.gms | 4 ++--
modules/35_transport/edge_esm/datainput.gms | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/29_CES_parameters/calibrate/datainput.gms b/modules/29_CES_parameters/calibrate/datainput.gms
index 6cd230e..17d0956 100644
--- a/modules/29_CES_parameters/calibrate/datainput.gms
+++ b/modules/29_CES_parameters/calibrate/datainput.gms
@@ -270,8 +270,8 @@ pm_cesdata(t,regi,in,"quantity") $ p29_esdemand(t,regi,"%cm_GDPscen%",in)
= p29_esdemand(t,regi,"%cm_GDPscen%",in);
*** Load exogenous transport demand
-pm_cesdata(t,regi,in,"quantity") $ p29_trpdemand(t,regi,"%cm_GDPscen%",in)
- = p29_trpdemand(t,regi,"%cm_GDPscen%",in);
+pm_cesdata(t,regi,in,"quantity") $ p29_trpdemand(t,regi,"%cm_GDPscen%","%cm_EDGEtr_scen%",in)
+ = p29_trpdemand(t,regi,"%cm_GDPscen%","%cm_EDGEtr_scen%",in);
*** Load capital quantities
diff --git a/modules/29_CES_parameters/calibrate/declarations.gms b/modules/29_CES_parameters/calibrate/declarations.gms
index 866b37f..f5be77c 100644
--- a/modules/29_CES_parameters/calibrate/declarations.gms
+++ b/modules/29_CES_parameters/calibrate/declarations.gms
@@ -17,7 +17,7 @@ Parameters
p29_effGr(tall,all_regi,all_in) "growth of factor efficiency from input.gdx"
p29_fedemand(tall,all_regi,all_GDPscen,all_in) "final energy demand"
p29_cesdata_price(tall,all_regi,all_in) "exogenous prices in case they are needed"
- p29_trpdemand(tall,all_regi,all_GDPscen,all_in) "transport demand"
+ p29_trpdemand(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_in) "transport demand"
p29_esdemand(tall,all_regi,all_GDPscen,all_in) "energy service demand"
p29_efficiency_growth(tall,all_regi,all_GDPscen,all_in) "efficency level paths for ppf beyond calibration"
p29_capitalQuantity(tall,all_regi,all_GDPscen,all_in) "capital quantities"
diff --git a/modules/29_CES_parameters/calibrate/preloop.gms b/modules/29_CES_parameters/calibrate/preloop.gms
index 1459222..26e0a6a 100644
--- a/modules/29_CES_parameters/calibrate/preloop.gms
+++ b/modules/29_CES_parameters/calibrate/preloop.gms
@@ -313,7 +313,7 @@ pm_cesdata(t,regi,in_29,"price") $ (( not ((ord(t) le 1) or (ord(t) eq card(t)))
loop (ttot$( ttot.val ge 2005 AND ttot.val lt 2020),
pm_cesdata(ttot,regi_dyn29(regi),in_29,"price")$(ppf_29(in_29))
= max(
- 1e-2,
+ 1e-3,
( pm_cesdata(ttot,regi,in_29,"price")
+ p29_alpha(regi,in_29) + p29_beta(regi,in_29) * ttot.val
)
@@ -325,7 +325,7 @@ pm_cesdata(t,regi,in_29,"price") $ (( not ((ord(t) le 1) or (ord(t) eq card(t)))
loop (ttot$( ttot.val ge 2005),
pm_cesdata(ttot,regi_dyn29(regi),in_29,"price")$(ppf_29(in_29))
= max(
- 1e-2,
+ 1e-3,
pm_cesdata(ttot,regi,in_29,"price")
);
);
diff --git a/modules/35_transport/edge_esm/datainput.gms b/modules/35_transport/edge_esm/datainput.gms
index f3afadf..65600af 100644
--- a/modules/35_transport/edge_esm/datainput.gms
+++ b/modules/35_transport/edge_esm/datainput.gms
@@ -8,9 +8,9 @@
Parameter
p35_cesdata_sigma(all_in) "substitution elasticities"
/
- entrp 1.3
- entrp_pass 1.1
- entrp_frgt 1.1
+ entrp 0.8
+ entrp_pass 1.3
+ entrp_frgt 1.3
/
;
pm_cesdata_sigma(ttot,in)$p35_cesdata_sigma(in) = p35_cesdata_sigma(in);
--
GitLab