Skip to content
Snippets Groups Projects
Commit 73148ce1 authored by Alois Dirnaichner's avatar Alois Dirnaichner
Browse files

When calibrating, load EDGE input data only when needed.

This fixes the undefined set bug where `EDGE_scenario_all` could not
be found.
parent f45d0b0f
No related branches found
No related tags found
1 merge request!87Calibration hotfix of a bug introduced by the EDGE-T merger
......@@ -161,7 +161,6 @@ $offdelim
/
p29_esdemand "energy service demand"
/
$ondelim
......@@ -169,12 +168,14 @@ $include "./modules/29_CES_parameters/calibrate/input/pm_es_demand.cs4r"
$offdelim
/
$ifthen.edgesm %transport% == "edge_esm"
p29_trpdemand "transport demand"
/
$ondelim
$include "./modules/29_CES_parameters/calibrate/input/pm_trp_demand.cs4r"
$offdelim
/
$endif.edgesm
p29_efficiency_growth "efficency growth for ppf beyond calibration"
......
......@@ -17,7 +17,9 @@ 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"
$ifthen.edgesm %transport% == "edge_esm"
p29_trpdemand(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_in) "transport demand for the edge_esm transport module, unit: trillion passenger/ton km"
$endif.edgesm
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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment