From 73148ce11439747d77433a3d7e87d7333237236e Mon Sep 17 00:00:00 2001 From: Alois Dirnaichner <alodi@directbox.com> Date: Mon, 2 Mar 2020 11:35:39 +0100 Subject: [PATCH] When calibrating, load EDGE input data only when needed. This fixes the undefined set bug where `EDGE_scenario_all` could not be found. --- modules/29_CES_parameters/calibrate/datainput.gms | 3 ++- modules/29_CES_parameters/calibrate/declarations.gms | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/29_CES_parameters/calibrate/datainput.gms b/modules/29_CES_parameters/calibrate/datainput.gms index 46f4da4..b2dacad 100644 --- a/modules/29_CES_parameters/calibrate/datainput.gms +++ b/modules/29_CES_parameters/calibrate/datainput.gms @@ -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" diff --git a/modules/29_CES_parameters/calibrate/declarations.gms b/modules/29_CES_parameters/calibrate/declarations.gms index f9bb79e..cb29d27 100644 --- a/modules/29_CES_parameters/calibrate/declarations.gms +++ b/modules/29_CES_parameters/calibrate/declarations.gms @@ -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" -- GitLab