From 512ce2e61699384cfb5e02bf17a19f911d1aaf69 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:51:33 +0200 Subject: [PATCH 1/7] cleanup --- inst/extdata/scenParDemFactors.csv | 84 ------ inst/extdata/scenParEnergyIntensity.csv | 382 ++++++++++++------------ inst/extdata/scenParLoadFactor.csv | 17 +- 3 files changed, 195 insertions(+), 288 deletions(-) diff --git a/inst/extdata/scenParDemFactors.csv b/inst/extdata/scenParDemFactors.csv index 2605cfb..ca48a85 100755 --- a/inst/extdata/scenParDemFactors.csv +++ b/inst/extdata/scenParDemFactors.csv @@ -167,90 +167,6 @@ SSP2_demRedWeak;REF;trn_pass;2050;0.95 SSP2_demRedWeak;SSA;trn_pass;2050;0.95 SSP2_demRedWeak;UKI;trn_pass;2050;0.95 SSP2_demRedWeak;USA;trn_pass;2050;0.95 -SSP2_demRedLow;CAZ;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;CHA;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;DEU;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;ECE;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;ECS;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;ENC;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;ESC;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;ESW;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;EWN;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;FRA;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;IND;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;JPN;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;LAM;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;MEA;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;NEN;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;NES;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;OAS;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;REF;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;SSA;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;UKI;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;USA;trn_aviation_intl;2050;0.93 -SSP2_demRedLow;CAZ;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;CHA;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;DEU;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;ECE;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;ECS;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;ENC;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;ESC;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;ESW;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;EWN;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;FRA;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;IND;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;JPN;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;LAM;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;MEA;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;NEN;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;NES;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;OAS;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;REF;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;SSA;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;UKI;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;USA;trn_shipping_intl;2050;0.99 -SSP2_demRedLow;CAZ;trn_freight;2050;0.92 -SSP2_demRedLow;CHA;trn_freight;2050;0.92 -SSP2_demRedLow;DEU;trn_freight;2050;0.92 -SSP2_demRedLow;ECE;trn_freight;2050;0.92 -SSP2_demRedLow;ECS;trn_freight;2050;0.92 -SSP2_demRedLow;ENC;trn_freight;2050;0.92 -SSP2_demRedLow;ESC;trn_freight;2050;0.92 -SSP2_demRedLow;ESW;trn_freight;2050;0.92 -SSP2_demRedLow;EWN;trn_freight;2050;0.92 -SSP2_demRedLow;FRA;trn_freight;2050;0.92 -SSP2_demRedLow;IND;trn_freight;2050;0.92 -SSP2_demRedLow;JPN;trn_freight;2050;0.92 -SSP2_demRedLow;LAM;trn_freight;2050;0.92 -SSP2_demRedLow;MEA;trn_freight;2050;0.92 -SSP2_demRedLow;NEN;trn_freight;2050;0.92 -SSP2_demRedLow;NES;trn_freight;2050;0.92 -SSP2_demRedLow;OAS;trn_freight;2050;0.92 -SSP2_demRedLow;REF;trn_freight;2050;0.92 -SSP2_demRedLow;SSA;trn_freight;2050;0.92 -SSP2_demRedLow;UKI;trn_freight;2050;0.92 -SSP2_demRedLow;USA;trn_freight;2050;0.92 -SSP2_demRedLow;CAZ;trn_pass;2050;0.98 -SSP2_demRedLow;CHA;trn_pass;2050;0.98 -SSP2_demRedLow;DEU;trn_pass;2050;0.98 -SSP2_demRedLow;ECE;trn_pass;2050;0.98 -SSP2_demRedLow;ECS;trn_pass;2050;0.98 -SSP2_demRedLow;ENC;trn_pass;2050;0.98 -SSP2_demRedLow;ESC;trn_pass;2050;0.98 -SSP2_demRedLow;ESW;trn_pass;2050;0.98 -SSP2_demRedLow;EWN;trn_pass;2050;0.98 -SSP2_demRedLow;FRA;trn_pass;2050;0.98 -SSP2_demRedLow;IND;trn_pass;2050;0.98 -SSP2_demRedLow;JPN;trn_pass;2050;0.98 -SSP2_demRedLow;LAM;trn_pass;2050;0.98 -SSP2_demRedLow;MEA;trn_pass;2050;0.98 -SSP2_demRedLow;NEN;trn_pass;2050;0.98 -SSP2_demRedLow;NES;trn_pass;2050;0.98 -SSP2_demRedLow;OAS;trn_pass;2050;0.98 -SSP2_demRedLow;REF;trn_pass;2050;0.98 -SSP2_demRedLow;SSA;trn_pass;2050;0.98 -SSP2_demRedLow;UKI;trn_pass;2050;0.98 -SSP2_demRedLow;USA;trn_pass;2050;0.98 SSP2_demDiffer;CAZ;trn_aviation_intl;2040;0.7 SSP2_demDiffer;CHA;trn_aviation_intl;2040;1 SSP2_demDiffer;DEU;trn_aviation_intl;2040;0.7 diff --git a/inst/extdata/scenParEnergyIntensity.csv b/inst/extdata/scenParEnergyIntensity.csv index 27f1ee6..ab9480c 100644 --- a/inst/extdata/scenParEnergyIntensity.csv +++ b/inst/extdata/scenParEnergyIntensity.csv @@ -1,192 +1,192 @@ SSPscen;transportPolScen;FVvehvar;technology;annualImprovementRate;startYear;endYear -SSP2EU;ECEMF_HighEl_HighEff;Aviation;Electric;1;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Aviation;Hydrogen;1;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Aviation;Liquids;0.8;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Bus;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Bus;FCEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Bus;Liquids;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Bus;Gases;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;LDV|2W;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;LDV|2W;Liquids;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;LDV|4W;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;LDV|4W;FCEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;LDV|4W;Hybrid electric;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;LDV|4W;Liquids;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;LDV|4W;Gases;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Rail;Electric;0.6;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Rail;Liquids;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Ship;Electric;1;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Ship;Liquids;1;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Truck|heavy;BEV;1.7;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Truck|heavy;FCEV;1.7;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Truck|heavy;Liquids;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Truck|heavy;Gases;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Truck|light;BEV;1.7;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Truck|light;FCEV;1.7;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Truck|light;Liquids;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_HighEff;Truck|light;Gases;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Aviation;Electric;1;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Aviation;Hydrogen;1;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Aviation;Liquids;1;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Bus;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Bus;FCEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Bus;Liquids;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Bus;Gases;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;LDV|2W;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;LDV|2W;Liquids;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;LDV|4W;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;LDV|4W;FCEV;1.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;LDV|4W;Hybrid electric;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;LDV|4W;Liquids;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;LDV|4W;Gases;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Rail;Electric;0.6;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Rail;Liquids;0.2;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Ship;Electric;1;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Ship;Hydrogen;1;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Ship;Liquids;1;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Truck|heavy;BEV;1.7;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Truck|heavy;FCEV;1.7;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Truck|heavy;Liquids;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Truck|heavy;Gases;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Truck|light;BEV;1.7;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Truck|light;FCEV;1.7;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Truck|light;Liquids;0.5;2020;2050 -SSP2EU;ECEMF_HighEl_LifestCha;Truck|light;Gases;0.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Aviation;Electric;0.8;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Aviation;Hydrogen;1;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Aviation;Liquids;1;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Bus;BEV;1;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Bus;FCEV;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Bus;Liquids;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Bus;Gases;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;LDV|2W;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;LDV|2W;Liquids;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;LDV|4W;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;LDV|4W;FCEV;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;LDV|4W;Hybrid electric;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;LDV|4W;Liquids;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;LDV|4W;Gases;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Rail;Electric;0.6;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Rail;Liquids;0.6;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Ship;Electric;1;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Ship;Hydrogen;1;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Ship;Liquids;1;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Truck|heavy;BEV;1;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Truck|heavy;FCEV;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Truck|heavy;Liquids;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Truck|heavy;Gases;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Truck|light;BEV;1;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Truck|light;FCEV;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Truck|light;Liquids;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_HighEff;Truck|light;Gases;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Aviation;Electric;0.8;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Aviation;Hydrogen;1;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Aviation;Liquids;1;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Bus;BEV;1;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Bus;FCEV;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Bus;Liquids;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Bus;Gases;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;LDV|2W;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;LDV|2W;Liquids;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;LDV|4W;BEV;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;LDV|4W;FCEV;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;LDV|4W;Hybrid electric;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;LDV|4W;Liquids;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;LDV|4W;Gases;1.5;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Rail;Electric;0.6;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Rail;Liquids;0.6;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Ship;Electric;1;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Ship;Hydrogen;1;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Ship;Liquids;1;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Truck|heavy;BEV;1;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Truck|heavy;FCEV;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Truck|heavy;Liquids;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Truck|heavy;Gases;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Truck|light;BEV;1;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Truck|light;FCEV;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Truck|light;Liquids;1.7;2020;2050 -SSP2EU;ECEMF_HighH2_LifestCha;Truck|light;Gases;1.7;2020;2050 -SSP2EU;NAV_act;Ship;Electric;0.56;2020;2050 -SSP2EU;NAV_act;Ship;Hydrogen;0.56;2020;2050 -SSP2EU;NAV_act;Ship;Liquids;0.56;2020;2050 -SSP2EU;NAV_all;Aviation;Electric;1;2020;2050 -SSP2EU;NAV_all;Aviation;Hydrogen;1;2020;2050 -SSP2EU;NAV_all;Aviation;Liquids;1;2020;2050 -SSP2EU;NAV_all;Bus;BEV;1.5;2020;2050 -SSP2EU;NAV_all;Bus;FCEV;1.5;2020;2050 -SSP2EU;NAV_all;Bus;Liquids;1.5;2020;2050 -SSP2EU;NAV_all;Bus;Gases;1.5;2020;2050 -SSP2EU;NAV_all;LDV|2W;BEV;1.5;2020;2050 -SSP2EU;NAV_all;LDV|2W;Liquids;1.5;2020;2050 -SSP2EU;NAV_all;LDV|4W;BEV;1.5;2020;2050 -SSP2EU;NAV_all;LDV|4W;FCEV;1.5;2020;2050 -SSP2EU;NAV_all;LDV|4W;Hybrid electric;1.5;2020;2050 -SSP2EU;NAV_all;LDV|4W;Liquids;1.5;2020;2050 -SSP2EU;NAV_all;LDV|4W;Gases;1.5;2020;2050 -SSP2EU;NAV_all;Rail;Electric;0.6;2020;2050 -SSP2EU;NAV_all;Rail;Liquids;0.6;2020;2050 -SSP2EU;NAV_all;Ship;Electric;1.3;2020;2050 -SSP2EU;NAV_all;Ship;Hydrogen;1.3;2020;2050 -SSP2EU;NAV_all;Ship;Liquids;1.3;2020;2050 -SSP2EU;NAV_all;Truck|heavy;BEV;2;2020;2050 -SSP2EU;NAV_all;Truck|heavy;FCEV;2;2020;2050 -SSP2EU;NAV_all;Truck|heavy;Liquids;2;2020;2050 -SSP2EU;NAV_all;Truck|heavy;Gases;2;2020;2050 -SSP2EU;NAV_all;Truck|light;BEV;2;2020;2050 -SSP2EU;NAV_all;Truck|light;FCEV;2;2020;2050 -SSP2EU;NAV_all;Truck|light;Liquids;2;2020;2050 -SSP2EU;NAV_all;Truck|light;Gases;2;2020;2050 -SSP2EU;NAV_lce;Aviation;Electric;1;2020;2050 -SSP2EU;NAV_lce;Aviation;Hydrogen;1;2020;2050 -SSP2EU;NAV_lce;Aviation;Liquids;1;2020;2050 -SSP2EU;NAV_lce;Bus;BEV;1.5;2020;2050 -SSP2EU;NAV_lce;Bus;FCEV;1.5;2020;2050 -SSP2EU;NAV_lce;Bus;Liquids;1.5;2020;2050 -SSP2EU;NAV_lce;Bus;Gases;1.5;2020;2050 -SSP2EU;NAV_lce;LDV|2W;BEV;1.5;2020;2050 -SSP2EU;NAV_lce;LDV|2W;Liquids;1.5;2020;2050 -SSP2EU;NAV_lce;LDV|4W;BEV;1.5;2020;2050 -SSP2EU;NAV_lce;LDV|4W;FCEV;1.5;2020;2050 -SSP2EU;NAV_lce;LDV|4W;Hybrid electric;1.5;2020;2050 -SSP2EU;NAV_lce;LDV|4W;Liquids;1.5;2020;2050 -SSP2EU;NAV_lce;LDV|4W;Gases;1.5;2020;2050 -SSP2EU;NAV_lce;Rail;Electric;0.6;2020;2050 -SSP2EU;NAV_lce;Rail;Liquids;0.6;2020;2050 -SSP2EU;NAV_lce;Ship;Electric;1.8;2020;2050 -SSP2EU;NAV_lce;Ship;Hydrogen;1.8;2020;2050 -SSP2EU;NAV_lce;Ship;Liquids;1.8;2020;2050 -SSP2EU;NAV_lce;Truck|heavy;BEV;2;2020;2050 -SSP2EU;NAV_lce;Truck|heavy;FCEV;2;2020;2050 -SSP2EU;NAV_lce;Truck|heavy;Liquids;2;2020;2050 -SSP2EU;NAV_lce;Truck|heavy;Gases;2;2020;2050 -SSP2EU;NAV_lce;Truck|light;BEV;2;2020;2050 -SSP2EU;NAV_lce;Truck|light;FCEV;2;2020;2050 -SSP2EU;NAV_lce;Truck|light;Liquids;2;2020;2050 -SSP2EU;NAV_lce;Truck|light;Gases;2;2020;2050 -SSP2EU;NAV_tec;Aviation;Electric;1;2020;2050 -SSP2EU;NAV_tec;Aviation;Hydrogen;1;2020;2050 -SSP2EU;NAV_tec;Aviation;Liquids;1;2020;2050 -SSP2EU;NAV_tec;Bus;BEV;1.5;2020;2050 -SSP2EU;NAV_tec;Bus;FCEV;1.5;2020;2050 -SSP2EU;NAV_tec;Bus;Liquids;1.5;2020;2050 -SSP2EU;NAV_tec;Bus;Gases;1.5;2020;2050 -SSP2EU;NAV_tec;LDV|2W;BEV;1.5;2020;2050 -SSP2EU;NAV_tec;LDV|2W;Liquids;1.5;2020;2050 -SSP2EU;NAV_tec;LDV|4W;BEV;1.5;2020;2050 -SSP2EU;NAV_tec;LDV|4W;FCEV;1.5;2020;2050 -SSP2EU;NAV_tec;LDV|4W;Hybrid electric;1.5;2020;2050 -SSP2EU;NAV_tec;LDV|4W;Liquids;1.5;2020;2050 -SSP2EU;NAV_tec;LDV|4W;Gases;1.5;2020;2050 -SSP2EU;NAV_tec;Rail;Electric;0.6;2020;2050 -SSP2EU;NAV_tec;Rail;Liquids;0.6;2020;2050 -SSP2EU;NAV_tec;Ship;Electric;1.3;2020;2050 -SSP2EU;NAV_tec;Ship;Hydrogen;1.3;2020;2050 -SSP2EU;NAV_tec;Ship;Liquids;1.3;2020;2050 -SSP2EU;NAV_tec;Truck|heavy;BEV;2;2020;2050 -SSP2EU;NAV_tec;Truck|heavy;FCEV;2;2020;2050 -SSP2EU;NAV_tec;Truck|heavy;Liquids;2;2020;2050 -SSP2EU;NAV_tec;Truck|heavy;Gases;2;2020;2050 -SSP2EU;NAV_tec;Truck|light;BEV;2;2020;2050 -SSP2EU;NAV_tec;Truck|light;FCEV;2;2020;2050 -SSP2EU;NAV_tec;Truck|light;Liquids;2;2020;2050 -SSP2EU;NAV_tec;Truck|light;Gases;2;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Aviation;Electric;1;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Aviation;Hydrogen;1;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Aviation;Liquids;0.8;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Bus;BEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Bus;FCEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Bus;Liquids;0.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Bus;Gases;0.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;LDV|2W;BEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;LDV|2W;Liquids;0.2;2020;2050 +SSP2;ECEMF_HighEl_HighEff;LDV|4W;BEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;LDV|4W;FCEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;LDV|4W;Hybrid electric;0.2;2020;2050 +SSP2;ECEMF_HighEl_HighEff;LDV|4W;Liquids;0.2;2020;2050 +SSP2;ECEMF_HighEl_HighEff;LDV|4W;Gases;0.2;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Rail;Electric;0.6;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Rail;Liquids;0.2;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Ship;Electric;1;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Ship;Liquids;1;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Truck|heavy;BEV;1.7;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Truck|heavy;FCEV;1.7;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Truck|heavy;Liquids;0.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Truck|heavy;Gases;0.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Truck|light;BEV;1.7;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Truck|light;FCEV;1.7;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Truck|light;Liquids;0.5;2020;2050 +SSP2;ECEMF_HighEl_HighEff;Truck|light;Gases;0.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Aviation;Electric;1;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Aviation;Hydrogen;1;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Aviation;Liquids;1;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Bus;BEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Bus;FCEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Bus;Liquids;0.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Bus;Gases;0.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;LDV|2W;BEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;LDV|2W;Liquids;0.2;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;LDV|4W;BEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;LDV|4W;FCEV;1.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;LDV|4W;Hybrid electric;0.2;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;LDV|4W;Liquids;0.2;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;LDV|4W;Gases;0.2;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Rail;Electric;0.6;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Rail;Liquids;0.2;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Ship;Electric;1;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Ship;Hydrogen;1;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Ship;Liquids;1;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Truck|heavy;BEV;1.7;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Truck|heavy;FCEV;1.7;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Truck|heavy;Liquids;0.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Truck|heavy;Gases;0.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Truck|light;BEV;1.7;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Truck|light;FCEV;1.7;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Truck|light;Liquids;0.5;2020;2050 +SSP2;ECEMF_HighEl_LifestCha;Truck|light;Gases;0.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Aviation;Electric;0.8;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Aviation;Hydrogen;1;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Aviation;Liquids;1;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Bus;BEV;1;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Bus;FCEV;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Bus;Liquids;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Bus;Gases;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;LDV|2W;BEV;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;LDV|2W;Liquids;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;LDV|4W;BEV;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;LDV|4W;FCEV;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;LDV|4W;Hybrid electric;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;LDV|4W;Liquids;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;LDV|4W;Gases;1.5;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Rail;Electric;0.6;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Rail;Liquids;0.6;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Ship;Electric;1;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Ship;Hydrogen;1;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Ship;Liquids;1;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Truck|heavy;BEV;1;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Truck|heavy;FCEV;1.7;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Truck|heavy;Liquids;1.7;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Truck|heavy;Gases;1.7;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Truck|light;BEV;1;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Truck|light;FCEV;1.7;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Truck|light;Liquids;1.7;2020;2050 +SSP2;ECEMF_HighH2_HighEff;Truck|light;Gases;1.7;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Aviation;Electric;0.8;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Aviation;Hydrogen;1;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Aviation;Liquids;1;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Bus;BEV;1;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Bus;FCEV;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Bus;Liquids;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Bus;Gases;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;LDV|2W;BEV;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;LDV|2W;Liquids;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;LDV|4W;BEV;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;LDV|4W;FCEV;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;LDV|4W;Hybrid electric;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;LDV|4W;Liquids;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;LDV|4W;Gases;1.5;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Rail;Electric;0.6;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Rail;Liquids;0.6;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Ship;Electric;1;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Ship;Hydrogen;1;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Ship;Liquids;1;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Truck|heavy;BEV;1;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Truck|heavy;FCEV;1.7;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Truck|heavy;Liquids;1.7;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Truck|heavy;Gases;1.7;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Truck|light;BEV;1;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Truck|light;FCEV;1.7;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Truck|light;Liquids;1.7;2020;2050 +SSP2;ECEMF_HighH2_LifestCha;Truck|light;Gases;1.7;2020;2050 +SSP2;NAV_act;Ship;Electric;0.56;2020;2050 +SSP2;NAV_act;Ship;Hydrogen;0.56;2020;2050 +SSP2;NAV_act;Ship;Liquids;0.56;2020;2050 +SSP2;NAV_all;Aviation;Electric;1;2020;2050 +SSP2;NAV_all;Aviation;Hydrogen;1;2020;2050 +SSP2;NAV_all;Aviation;Liquids;1;2020;2050 +SSP2;NAV_all;Bus;BEV;1.5;2020;2050 +SSP2;NAV_all;Bus;FCEV;1.5;2020;2050 +SSP2;NAV_all;Bus;Liquids;1.5;2020;2050 +SSP2;NAV_all;Bus;Gases;1.5;2020;2050 +SSP2;NAV_all;LDV|2W;BEV;1.5;2020;2050 +SSP2;NAV_all;LDV|2W;Liquids;1.5;2020;2050 +SSP2;NAV_all;LDV|4W;BEV;1.5;2020;2050 +SSP2;NAV_all;LDV|4W;FCEV;1.5;2020;2050 +SSP2;NAV_all;LDV|4W;Hybrid electric;1.5;2020;2050 +SSP2;NAV_all;LDV|4W;Liquids;1.5;2020;2050 +SSP2;NAV_all;LDV|4W;Gases;1.5;2020;2050 +SSP2;NAV_all;Rail;Electric;0.6;2020;2050 +SSP2;NAV_all;Rail;Liquids;0.6;2020;2050 +SSP2;NAV_all;Ship;Electric;1.3;2020;2050 +SSP2;NAV_all;Ship;Hydrogen;1.3;2020;2050 +SSP2;NAV_all;Ship;Liquids;1.3;2020;2050 +SSP2;NAV_all;Truck|heavy;BEV;2;2020;2050 +SSP2;NAV_all;Truck|heavy;FCEV;2;2020;2050 +SSP2;NAV_all;Truck|heavy;Liquids;2;2020;2050 +SSP2;NAV_all;Truck|heavy;Gases;2;2020;2050 +SSP2;NAV_all;Truck|light;BEV;2;2020;2050 +SSP2;NAV_all;Truck|light;FCEV;2;2020;2050 +SSP2;NAV_all;Truck|light;Liquids;2;2020;2050 +SSP2;NAV_all;Truck|light;Gases;2;2020;2050 +SSP2;NAV_lce;Aviation;Electric;1;2020;2050 +SSP2;NAV_lce;Aviation;Hydrogen;1;2020;2050 +SSP2;NAV_lce;Aviation;Liquids;1;2020;2050 +SSP2;NAV_lce;Bus;BEV;1.5;2020;2050 +SSP2;NAV_lce;Bus;FCEV;1.5;2020;2050 +SSP2;NAV_lce;Bus;Liquids;1.5;2020;2050 +SSP2;NAV_lce;Bus;Gases;1.5;2020;2050 +SSP2;NAV_lce;LDV|2W;BEV;1.5;2020;2050 +SSP2;NAV_lce;LDV|2W;Liquids;1.5;2020;2050 +SSP2;NAV_lce;LDV|4W;BEV;1.5;2020;2050 +SSP2;NAV_lce;LDV|4W;FCEV;1.5;2020;2050 +SSP2;NAV_lce;LDV|4W;Hybrid electric;1.5;2020;2050 +SSP2;NAV_lce;LDV|4W;Liquids;1.5;2020;2050 +SSP2;NAV_lce;LDV|4W;Gases;1.5;2020;2050 +SSP2;NAV_lce;Rail;Electric;0.6;2020;2050 +SSP2;NAV_lce;Rail;Liquids;0.6;2020;2050 +SSP2;NAV_lce;Ship;Electric;1.8;2020;2050 +SSP2;NAV_lce;Ship;Hydrogen;1.8;2020;2050 +SSP2;NAV_lce;Ship;Liquids;1.8;2020;2050 +SSP2;NAV_lce;Truck|heavy;BEV;2;2020;2050 +SSP2;NAV_lce;Truck|heavy;FCEV;2;2020;2050 +SSP2;NAV_lce;Truck|heavy;Liquids;2;2020;2050 +SSP2;NAV_lce;Truck|heavy;Gases;2;2020;2050 +SSP2;NAV_lce;Truck|light;BEV;2;2020;2050 +SSP2;NAV_lce;Truck|light;FCEV;2;2020;2050 +SSP2;NAV_lce;Truck|light;Liquids;2;2020;2050 +SSP2;NAV_lce;Truck|light;Gases;2;2020;2050 +SSP2;NAV_tec;Aviation;Electric;1;2020;2050 +SSP2;NAV_tec;Aviation;Hydrogen;1;2020;2050 +SSP2;NAV_tec;Aviation;Liquids;1;2020;2050 +SSP2;NAV_tec;Bus;BEV;1.5;2020;2050 +SSP2;NAV_tec;Bus;FCEV;1.5;2020;2050 +SSP2;NAV_tec;Bus;Liquids;1.5;2020;2050 +SSP2;NAV_tec;Bus;Gases;1.5;2020;2050 +SSP2;NAV_tec;LDV|2W;BEV;1.5;2020;2050 +SSP2;NAV_tec;LDV|2W;Liquids;1.5;2020;2050 +SSP2;NAV_tec;LDV|4W;BEV;1.5;2020;2050 +SSP2;NAV_tec;LDV|4W;FCEV;1.5;2020;2050 +SSP2;NAV_tec;LDV|4W;Hybrid electric;1.5;2020;2050 +SSP2;NAV_tec;LDV|4W;Liquids;1.5;2020;2050 +SSP2;NAV_tec;LDV|4W;Gases;1.5;2020;2050 +SSP2;NAV_tec;Rail;Electric;0.6;2020;2050 +SSP2;NAV_tec;Rail;Liquids;0.6;2020;2050 +SSP2;NAV_tec;Ship;Electric;1.3;2020;2050 +SSP2;NAV_tec;Ship;Hydrogen;1.3;2020;2050 +SSP2;NAV_tec;Ship;Liquids;1.3;2020;2050 +SSP2;NAV_tec;Truck|heavy;BEV;2;2020;2050 +SSP2;NAV_tec;Truck|heavy;FCEV;2;2020;2050 +SSP2;NAV_tec;Truck|heavy;Liquids;2;2020;2050 +SSP2;NAV_tec;Truck|heavy;Gases;2;2020;2050 +SSP2;NAV_tec;Truck|light;BEV;2;2020;2050 +SSP2;NAV_tec;Truck|light;FCEV;2;2020;2050 +SSP2;NAV_tec;Truck|light;Liquids;2;2020;2050 +SSP2;NAV_tec;Truck|light;Gases;2;2020;2050 diff --git a/inst/extdata/scenParLoadFactor.csv b/inst/extdata/scenParLoadFactor.csv index 8afe183..b4f34ff 100644 --- a/inst/extdata/scenParLoadFactor.csv +++ b/inst/extdata/scenParLoadFactor.csv @@ -1,13 +1,4 @@ -SSPscen demScen percentChange targetYear -SDP_RC default 0.3 2060 -SSP1 demRedWeak 0.2 2050 -SSP2 demRedWeak 0.2 2050 -SSP2EU demRedWeak 0.2 2050 -SSP5 demRedWeak 0.2 2050 -SSP2EU demRedWeak 0.2 2050 -SDP demRedWeak 0.2 2050 -SSP1 demRedStrong 0.4 2050 -SSP2 demRedStrong 0.4 2050 -SSP2EU demRedStrong 0.4 2050 -SSP5 demRedStrong 0.4 2050 -SDP demRedStrong 0.4 2050 +SSPscen;demScen;percentChange;targetYear +SDP_RC;default;0.3;2060 +SSP2;SSP2_demRedWeak;0.2;2050 +SSP2;SSP2_demRedStrong;0.4;2050 \ No newline at end of file From ca429ec0471d72475867a388e76fe456747c180a Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Tue, 8 Oct 2024 08:55:54 +0200 Subject: [PATCH 2/7] fix unitShift --- R/toolEdgeTransportSA.R | 2 +- R/toolLoadmrremindData.R | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/R/toolEdgeTransportSA.R b/R/toolEdgeTransportSA.R index 8a6f0af..35cb8ea 100644 --- a/R/toolEdgeTransportSA.R +++ b/R/toolEdgeTransportSA.R @@ -34,7 +34,7 @@ toolEdgeTransportSA <- function(SSPscen, isAnalyticsReported = FALSE){ # set GDP cutoff to differentiate between regions - GDPcutoff <- 25000 # [constant 2005 US$MER] + GDPcutoff <- 30800 # [constant 2017 US$MER] # Year when scenario differentiation sets in policyStartYear <- 2021 # last time step of historical data diff --git a/R/toolLoadmrremindData.R b/R/toolLoadmrremindData.R index 76a9219..69a0f34 100644 --- a/R/toolLoadmrremindData.R +++ b/R/toolLoadmrremindData.R @@ -13,9 +13,6 @@ toolLoadmrremindData <- function(helpers) { setnames(subsidies, "variable", "technology") #average between legal and private entities subsidies <- subsidies[, .(value = mean(value)), by = c("region", "period", "technology")] - # exchange rate 2020: 1 euro = 1.12 dollar - # conversion from EUR2020 to US$2017 : inflation/exchange rate = 1.3504/1.12 = 1.205714286 - subsidies[, value := value / 1.205714286] # in 2005 USD subsidies[, value := - value] # count subsidies negative completeSub <- unique(subsidies[, c("region", "technology")])[, temporal := "all"] temporal <- data.table(period = yrs)[, temporal := "all"] From fe2313a506b4cc112fbe8d5c0da3590504407c88 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Tue, 8 Oct 2024 09:00:24 +0200 Subject: [PATCH 3/7] temporary fix for fuel price unitshift --- R/toolLoadREMINDfuelCosts.R | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/R/toolLoadREMINDfuelCosts.R b/R/toolLoadREMINDfuelCosts.R index 76e5001..21811eb 100644 --- a/R/toolLoadREMINDfuelCosts.R +++ b/R/toolLoadREMINDfuelCosts.R @@ -22,6 +22,14 @@ toolLoadREMINDfuelCosts <- function(gdxPath, hybridElecShare, helpers){ # load prices from REMIND gdx fuelCosts <- readGDX(gdxPath, "pm_FEPrice", format = "first_found", restore_zeros = FALSE)[,, "trans.ES", pmatch = TRUE] + + fuelCosts <- GDPuc::convertGDP( + gdp = fuelCosts, + unit_in = "constant 2005 US$MER", + unit_out = "constant 2017 US$MER", + replace_NAs = "with_USA" + ) + ## smooth prices from REMIND gdx (over years) and convert to data.table fuelCosts <- fuelCosts %>% lowpass() %>% magpie2dt() setnames(fuelCosts, c("all_regi", "ttot"), c("region", "period")) @@ -32,6 +40,7 @@ toolLoadREMINDfuelCosts <- function(gdxPath, hybridElecShare, helpers){ fuelCosts[, value := value * tdptwyr2dpgj * GJtoMJ] # US$2017/MJ # map on EDGE-T structure fuelCosts <- merge(fuelCosts, mapEdgeToREMIND, by = "all_enty", all.y = TRUE, allow.cartesian = TRUE)[, all_enty := NULL] + # calculate price for hybrids dummy <- fuelCosts[univocalName %in% helpers$filterEntries$trn_pass_road_LDV_4W & technology %in% c("BEV", "Liquids")] fuelCostsHybrids <- dummy %>% From 704cb215011428a53c46b7756823b8394a1bf47c Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:59:07 +0200 Subject: [PATCH 4/7] chane fulldata.gdx to version number before unit shift --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 5 +++-- R/toolEdgeTransportSA.R | 2 +- README.md | 6 +++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 9724b99..1d1a312 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '5418103' +ValidationKey: '5441904' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index b4be71d..9da4e77 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'edgeTransport: Prepare EDGE Transport Data for the REMIND model' -version: 2.7.1 -date-released: '2024-09-27' +version: 2.7.2 +date-released: '2024-10-11' abstract: EDGE-T is a fork of the GCAM transport module https://jgcri.github.io/gcam-doc/energy.html#transportation with a high level of detail in its representation of technological and modal options. It is a partial equilibrium model with a nested multinomial logit structure and diff --git a/DESCRIPTION b/DESCRIPTION index 71373df..b88c23c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 2.7.1 +Version: 2.7.2 Authors@R: c( person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0009-0004-6753-5090")), @@ -18,7 +18,7 @@ Encoding: UTF-8 LazyData: true RoxygenNote: 7.3.2 VignetteBuilder: knitr -Date: 2024-09-27 +Date: 2024-10-11 Config/testthat/edition: 3 Imports: rmndt, @@ -30,6 +30,7 @@ Imports: gdxrrw, zoo, gdxdt, + GDPuc, reporttransport (>= 0.0.13) Suggests: testthat (>= 3.0.0), diff --git a/R/toolEdgeTransportSA.R b/R/toolEdgeTransportSA.R index 35cb8ea..17fbb0f 100644 --- a/R/toolEdgeTransportSA.R +++ b/R/toolEdgeTransportSA.R @@ -47,7 +47,7 @@ toolEdgeTransportSA <- function(SSPscen, ######################################################## if (is.null(outputFolder) & isStored) stop("Please provide an outputfolder to store your results") if (is.null(gdxPath)) {gdxPath <- file.path(getConfig("sourcefolder"), - "REMINDinputForTransportStandalone", "v1.1", "fulldata.gdx")} + "REMINDinputForTransportStandalone", "v1.0", "fulldata.gdx")} if (!file.exists(gdxPath)) stop("Please provide valid path to REMIND fulldata.gdx as input for fuel costs") inputs <- toolLoadInputs(SSPscen, transportPolScen, demScen, gdxPath, hybridElecShare) diff --git a/README.md b/README.md index 51af731..f574dbb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **2.7.1** +R package **edgeTransport**, version **2.7.2** [![CRAN status](https://www.r-pkg.org/badges/version/edgeTransport)](https://cran.r-project.org/package=edgeTransport) [![R build status](https://github.com/pik-piam/edgeTransport/workflows/check/badge.svg)](https://github.com/pik-piam/edgeTransport/actions) [![codecov](https://codecov.io/gh/pik-piam/edgeTransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/edgeTransport) [![r-universe](https://pik-piam.r-universe.dev/badges/edgeTransport)](https://pik-piam.r-universe.dev/builds) @@ -46,7 +46,7 @@ In case of questions / problems please contact Johanna Hoppe . +Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.7.2, . A BibTeX entry for LaTeX users is @@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is title = {edgeTransport: Prepare EDGE Transport Data for the REMIND model}, author = {Johanna Hoppe and Alois Dirnaichner and Marianna Rottoli and Jarusch Muessel}, year = {2024}, - note = {R package version 2.7.1}, + note = {R package version 2.7.2}, url = {https://github.com/pik-piam/edgeTransport}, } ``` From f9cc953dcde35a850343fdadd2913811ef06d976 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:22:03 +0200 Subject: [PATCH 5/7] adjust GDPuc usage --- DESCRIPTION | 4 ++-- R/toolLoadREMINDfuelCosts.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b88c23c..3883532 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -11,7 +11,8 @@ Description: EDGE-T is a fork of the GCAM transport module https://jgcri.github. Depends: R (>= 3.5.0), data.table (>= 1.11.0), - mrtransport (>= 0.6.0) + mrtransport (>= 0.6.0), + GDPuc (>= 1.3.0) License: GPL-3 URL: https://github.com/pik-piam/edgeTransport Encoding: UTF-8 @@ -30,7 +31,6 @@ Imports: gdxrrw, zoo, gdxdt, - GDPuc, reporttransport (>= 0.0.13) Suggests: testthat (>= 3.0.0), diff --git a/R/toolLoadREMINDfuelCosts.R b/R/toolLoadREMINDfuelCosts.R index 21811eb..70185d6 100644 --- a/R/toolLoadREMINDfuelCosts.R +++ b/R/toolLoadREMINDfuelCosts.R @@ -23,7 +23,7 @@ toolLoadREMINDfuelCosts <- function(gdxPath, hybridElecShare, helpers){ # load prices from REMIND gdx fuelCosts <- readGDX(gdxPath, "pm_FEPrice", format = "first_found", restore_zeros = FALSE)[,, "trans.ES", pmatch = TRUE] - fuelCosts <- GDPuc::convertGDP( + fuelCosts <- GDPuc::toolConvertGDP( gdp = fuelCosts, unit_in = "constant 2005 US$MER", unit_out = "constant 2017 US$MER", From 774df86fc7c9deeb33d33096948f6fe96aef2503 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:27:49 +0200 Subject: [PATCH 6/7] Update DESCRIPTION --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 3883532..0583cf7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -31,6 +31,7 @@ Imports: gdxrrw, zoo, gdxdt, + GDPuc, reporttransport (>= 0.0.13) Suggests: testthat (>= 3.0.0), From fcff67ef1a6fa32bd615e97cb59c2f179ae1677f Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Fri, 11 Oct 2024 18:38:39 +0200 Subject: [PATCH 7/7] increment version --- .buildlibrary | 2 +- .github/workflows/check.yaml | 16 ++++++++-------- CITATION.cff | 2 +- DESCRIPTION | 3 +-- NAMESPACE | 1 + R/imports.R | 2 +- README.md | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 1d1a312..d54967d 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '5441904' +ValidationKey: '5461911' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index f6ea5d4..23545e6 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -23,14 +23,14 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: | - any::lucode2 - any::covr - any::madrat - any::magclass - any::citation - any::gms - any::goxygen - any::GDPuc + lucode2 + covr + madrat + magclass + citation + gms + goxygen + GDPuc # piam packages also available on CRAN (madrat, magclass, citation, # gms, goxygen, GDPuc) will usually have an outdated binary version # available; by using extra-packages we get the newest version diff --git a/CITATION.cff b/CITATION.cff index 9da4e77..9376674 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'edgeTransport: Prepare EDGE Transport Data for the REMIND model' -version: 2.7.2 +version: 2.7.3 date-released: '2024-10-11' abstract: EDGE-T is a fork of the GCAM transport module https://jgcri.github.io/gcam-doc/energy.html#transportation with a high level of detail in its representation of technological and modal options. diff --git a/DESCRIPTION b/DESCRIPTION index 0583cf7..574fcd6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 2.7.2 +Version: 2.7.3 Authors@R: c( person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0009-0004-6753-5090")), @@ -31,7 +31,6 @@ Imports: gdxrrw, zoo, gdxdt, - GDPuc, reporttransport (>= 0.0.13) Suggests: testthat (>= 3.0.0), diff --git a/NAMESPACE b/NAMESPACE index f903ffc..55c6501 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -23,6 +23,7 @@ export(toolOrderandCheck) export(toolPrepareScenInputData) export(toolTraverseDecisionTree) export(toolUpdateEndogenousCosts) +import(GDPuc) import(data.table) import(mrtransport) importFrom(data.table,fread) diff --git a/R/imports.R b/R/imports.R index 622a886..bc9536a 100644 --- a/R/imports.R +++ b/R/imports.R @@ -1,4 +1,4 @@ # Generated by lucode2: do not edit by hand -#' @import data.table mrtransport +#' @import data.table mrtransport GDPuc NULL diff --git a/README.md b/README.md index f574dbb..870f065 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **2.7.2** +R package **edgeTransport**, version **2.7.3** [![CRAN status](https://www.r-pkg.org/badges/version/edgeTransport)](https://cran.r-project.org/package=edgeTransport) [![R build status](https://github.com/pik-piam/edgeTransport/workflows/check/badge.svg)](https://github.com/pik-piam/edgeTransport/actions) [![codecov](https://codecov.io/gh/pik-piam/edgeTransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/edgeTransport) [![r-universe](https://pik-piam.r-universe.dev/badges/edgeTransport)](https://pik-piam.r-universe.dev/builds) @@ -46,7 +46,7 @@ In case of questions / problems please contact Johanna Hoppe . +Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.7.3, . A BibTeX entry for LaTeX users is @@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is title = {edgeTransport: Prepare EDGE Transport Data for the REMIND model}, author = {Johanna Hoppe and Alois Dirnaichner and Marianna Rottoli and Jarusch Muessel}, year = {2024}, - note = {R package version 2.7.2}, + note = {R package version 2.7.3}, url = {https://github.com/pik-piam/edgeTransport}, } ```