From 91a1923d6770972f9706743eeb3325481138dc92 Mon Sep 17 00:00:00 2001 From: D3X132 Date: Fri, 22 Sep 2017 15:38:45 -0400 Subject: [PATCH 01/22] Change level 2 liquids with CCS capture rates to 0.9 This affects both types of bioliquids and coal-to-liquids. --- .../assumptions/A22.globaltech_co2capture.csv | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_co2capture.csv b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_co2capture.csv index b61ab72922..d48c2099bf 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_co2capture.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_co2capture.csv @@ -1 +1,8 @@ -# Primary energy transformation technology capture fractions,,,, supplysector,subsector,technology,1971,2100 refining,coal to liquids,coal to liquids CCS level 1,0.818,0.818 refining,coal to liquids,coal to liquids CCS level 2,0.981,0.981 refining,biomass liquids,cellulosic ethanol CCS level 1,0.26,0.26 refining,biomass liquids,cellulosic ethanol CCS level 2,0.992,0.992 refining,biomass liquids,FT biofuels CCS level 1,0.818,0.818 refining,biomass liquids,FT biofuels CCS level 2,0.98,0.98 \ No newline at end of file +# Primary energy transformation technology capture fractions,,,, +supplysector,subsector,technology,1971,2100 +refining,coal to liquids,coal to liquids CCS level 1,0.818,0.818 +refining,coal to liquids,coal to liquids CCS level 2,0.9,0.9 +refining,biomass liquids,cellulosic ethanol CCS level 1,0.26,0.26 +refining,biomass liquids,cellulosic ethanol CCS level 2,0.9,0.9 +refining,biomass liquids,FT biofuels CCS level 1,0.818,0.818 +refining,biomass liquids,FT biofuels CCS level 2,0.9,0.9 \ No newline at end of file From a6148af25d0b7aa4b56887562132918a09cc03b3 Mon Sep 17 00:00:00 2001 From: D3X132 Date: Tue, 26 Sep 2017 08:36:42 -0400 Subject: [PATCH 02/22] Change interpolation rules for NG freight and EVs. Interpolate to 1 in 2050 instead of 2100. --- .../assumptions/A54.globaltranTech_interp.csv | 122 +++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_interp.csv b/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_interp.csv index 1a205b619a..95d32b8634 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_interp.csv @@ -1 +1,121 @@ -# Transportation technology default shareweights. Not including single-technology subsectors,,,,,, supplysector,tranSubsector,tranTechnology,apply.to,from.year,to.year,interpolation.function trn_freight,Freight Rail,Adv-Electric,share-weight,final-calibration-year,end-year,fixed trn_freight,Freight Rail,Adv-Liquid,share-weight,final-calibration-year,end-year,fixed trn_freight,Freight Rail,Coal,share-weight,final-calibration-year,2015,linear trn_freight,Freight Rail,Electric,share-weight,final-calibration-year,end-year,fixed trn_freight,Freight Rail,Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,3W Rural,Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,3W Rural,NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck,Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck,NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (>12t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (>12t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (>14t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (>14t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (>15t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (>15t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (>32t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (>32t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (0-1t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (0-1t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (0-2.7t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (0-2.7t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (0-2t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (0-2t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (0-3.5t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (0-3.5t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (0-4.5t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (0-4.5t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (0-6t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (0-6t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (1-6t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (1-6t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (16-32t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (16-32t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (2-5t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (2-5t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (2.7-4.5t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (2.7-4.5t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (3.5-16t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (3.5-16t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (4.5-12t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (4.5-12t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (4.5-15t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (4.5-15t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (5-9t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (5-9t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (6-14t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (6-14t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (6-15t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (6-15t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (6-30t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (6-30t),NG,share-weight,final-calibration-year,end-year,linear trn_freight_road,Truck (9-16t),Liquids,share-weight,final-calibration-year,end-year,fixed trn_freight_road,Truck (9-16t),NG,share-weight,final-calibration-year,end-year,linear trn_pass,Passenger Rail,Electric,share-weight,final-calibration-year,end-year,fixed trn_pass,Passenger Rail,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass,Passenger Rail,Tech-Adv-Electric,share-weight,final-calibration-year,end-year,fixed trn_pass,Passenger Rail,Tech-Adv-Liquid,share-weight,final-calibration-year,end-year,fixed trn_pass_road,Bus,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road,Bus,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_bus,Heavy Bus,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_bus,Heavy Bus,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_bus,Light Bus,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_bus,Light Bus,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV,Three-Wheeler,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV,Three-Wheeler,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_2W,Moped,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_2W,Moped,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_2W,Motorcycle (>250cc),BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_2W,Motorcycle (>250cc),Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_2W,Motorcycle (50-250cc),BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_2W,Motorcycle (50-250cc),LA-BEV,share-weight,final-calibration-year,2050,linear trn_pass_road_LDV_2W,Motorcycle (50-250cc),Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_2W,Scooter,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_2W,Scooter,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Compact Car,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Compact Car,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Compact Car,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Compact Car,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Large Car,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Large Car,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Large Car,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Large Car,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Large Car and SUV,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Large Car and SUV,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Large Car and SUV,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Large Car and SUV,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Light Truck and SUV,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Light Truck and SUV,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Midsize Car,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Midsize Car,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Midsize Car,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Midsize Car,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Mini Car,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Mini Car,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Mini Car,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Mini Car,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Subcompact Car,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Subcompact Car,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Subcompact Car,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Subcompact Car,NG,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Van,BEV,share-weight,final-calibration-year,end-year,linear trn_pass_road_LDV_4W,Van,FCEV,share-weight,2015,end-year,linear trn_pass_road_LDV_4W,Van,Hybrid Liquids,share-weight,final-calibration-year,2020,linear trn_pass_road_LDV_4W,Van,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Van,NG,share-weight,final-calibration-year,end-year,linear \ No newline at end of file +# Transportation technology default shareweights. Not including single-technology subsectors,,,,,, +supplysector,tranSubsector,tranTechnology,apply.to,from.year,to.year,interpolation.function +trn_freight,Freight Rail,Adv-Electric,share-weight,final-calibration-year,end-year,fixed +trn_freight,Freight Rail,Adv-Liquid,share-weight,final-calibration-year,end-year,fixed +trn_freight,Freight Rail,Coal,share-weight,final-calibration-year,2015,linear +trn_freight,Freight Rail,Electric,share-weight,final-calibration-year,end-year,fixed +trn_freight,Freight Rail,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,3W Rural,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,3W Rural,NG,share-weight,final-calibration-year,end-year,linear +trn_freight_road,Truck,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck,NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (>12t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (>12t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (>14t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (>14t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (>15t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (>15t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (>32t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (>32t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-1t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-1t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-2.7t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-2.7t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-2t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-2t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-3.5t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-3.5t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-4.5t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-4.5t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-6t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-6t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (1-6t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (1-6t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (16-32t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (16-32t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (2-5t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (2-5t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (2.7-4.5t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (2.7-4.5t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (3.5-16t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (3.5-16t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (4.5-12t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (4.5-12t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (4.5-15t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (4.5-15t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (5-9t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (5-9t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (6-14t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (6-14t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (6-15t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (6-15t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (6-30t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (6-30t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (9-16t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (9-16t),NG,share-weight,final-calibration-year,2050,linear +trn_pass,Passenger Rail,Electric,share-weight,final-calibration-year,end-year,fixed +trn_pass,Passenger Rail,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass,Passenger Rail,Tech-Adv-Electric,share-weight,final-calibration-year,end-year,fixed +trn_pass,Passenger Rail,Tech-Adv-Liquid,share-weight,final-calibration-year,end-year,fixed +trn_pass_road,Bus,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road,Bus,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_bus,Heavy Bus,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_bus,Heavy Bus,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_bus,Light Bus,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_bus,Light Bus,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV,Three-Wheeler,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV,Three-Wheeler,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_2W,Moped,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Moped,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_2W,Motorcycle (>250cc),BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Motorcycle (>250cc),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_2W,Motorcycle (50-250cc),BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Motorcycle (50-250cc),LA-BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Motorcycle (50-250cc),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_2W,Scooter,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Scooter,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Compact Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Compact Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Compact Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Compact Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Large Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Large Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Large Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Large Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Large Car and SUV,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Large Car and SUV,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Large Car and SUV,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Large Car and SUV,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Light Truck and SUV,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Light Truck and SUV,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Midsize Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Midsize Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Midsize Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Midsize Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Mini Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Mini Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Mini Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Mini Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Subcompact Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Subcompact Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Subcompact Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Subcompact Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Van,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Van,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Van,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Van,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Van,NG,share-weight,final-calibration-year,end-year,linear \ No newline at end of file From 5989c375b789c289bf43a0ad12a1f91866aad947 Mon Sep 17 00:00:00 2001 From: D3X132 Date: Tue, 26 Sep 2017 08:38:00 -0400 Subject: [PATCH 03/22] Switch transportation to absolute cost logit --- .../assumptions/A54.tranSubsector_logit.csv | 61 ++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_logit.csv index 07b59c6f19..86cf868333 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_logit.csv @@ -1 +1,60 @@ -# Transportation default subsector logit exponents,,,, supplysector,tranSubsector,logit.exponent,logit.factor,logit.type trn_aviation_intl,International Aviation,-6,, trn_freight,Domestic Ship,-6,, trn_freight,Freight Rail,-1,Fuel types and efficiency levels, trn_freight_road,3W Rural,-8,Fuel types, trn_freight_road,Truck,-8,Fuel types, trn_freight_road,Truck (>12t),-8,Fuel types, trn_freight_road,Truck (>14t),-8,Fuel types, trn_freight_road,Truck (>15t),-8,Fuel types, trn_freight_road,Truck (>32t),-8,Fuel types, trn_freight_road,Truck (0-1t),-8,Fuel types, trn_freight_road,Truck (0-2.7t),-8,Fuel types, trn_freight_road,Truck (0-2t),-8,Fuel types, trn_freight_road,Truck (0-3.5t),-8,Fuel types, trn_freight_road,Truck (0-4.5t),-8,Fuel types, trn_freight_road,Truck (0-6t),-8,Fuel types, trn_freight_road,Truck (1-6t),-8,Fuel types, trn_freight_road,Truck (16-32t),-8,Fuel types, trn_freight_road,Truck (2-5t),-8,Fuel types, trn_freight_road,Truck (2.7-4.5t),-8,Fuel types, trn_freight_road,Truck (3.5-16t),-8,Fuel types, trn_freight_road,Truck (4.5-12t),-8,Fuel types, trn_freight_road,Truck (4.5-15t),-8,Fuel types, trn_freight_road,Truck (5-9t),-8,Fuel types, trn_freight_road,Truck (6-14t),-8,Fuel types, trn_freight_road,Truck (6-15t),-8,Fuel types, trn_freight_road,Truck (6-30t),-8,Fuel types, trn_freight_road,Truck (9-16t),-8,Fuel types, trn_pass,Cycle,-6,, trn_pass,Domestic Aviation,-6,, trn_pass,HSR,-6,, trn_pass,Passenger Rail,-1,Fuel types and efficiency levels, trn_pass,Walk,-6,, trn_pass_road,Bus,-3,Fuel types, trn_pass_road_bus,Heavy Bus,-3,Fuel types, trn_pass_road_bus,Light Bus,-3,Fuel types, trn_pass_road_LDV,Three-Wheeler,-8,Fuel types, trn_pass_road_LDV_2W,Moped,-8,Fuel types, trn_pass_road_LDV_2W,Motorcycle (>250cc),-8,Fuel types, trn_pass_road_LDV_2W,Motorcycle (50-250cc),-8,Fuel types, trn_pass_road_LDV_2W,Motorcycle (50-250cc),-8,Fuel types, trn_pass_road_LDV_2W,Scooter,-8,Fuel types, trn_pass_road_LDV_4W,Compact Car,-8,Fuel types and ICE efficiency levels, trn_pass_road_LDV_4W,Large Car,-8,Fuel types and ICE efficiency levels, trn_pass_road_LDV_4W,Large Car and SUV,-8,Fuel types and ICE efficiency levels, trn_pass_road_LDV_4W,Light Truck and SUV,-8,Fuel types and ICE efficiency levels, trn_pass_road_LDV_4W,Midsize Car,-8,Fuel types and ICE efficiency levels, trn_pass_road_LDV_4W,Mini Car,-8,Fuel types and ICE efficiency levels, trn_pass_road_LDV_4W,Multipurpose Vehicle,-8,Fuel types and ICE efficiency levels, trn_pass_road_LDV_4W,Subcompact Car,-8,Fuel types and ICE efficiency levels, trn_pass_road_LDV_4W,Van,-8,Fuel types and ICE efficiency levels, trn_shipping_intl,International Ship,-6,, # Passthrough tranSubsectors are listed below,,,, trn_pass,road,-6,, trn_pass_road,LDV,-6,, trn_pass_road,bus,-6,, trn_pass_road_LDV,4W,-6,, trn_pass_road_LDV,2W,-6,, trn_freight,road,-6,, \ No newline at end of file +# Transportation default subsector logit exponents,,,, +supplysector,tranSubsector,logit.exponent,logit.factor,logit.type +trn_aviation_intl,International Aviation,-6,,absolute-cost-logit +trn_freight,Domestic Ship,-6,,absolute-cost-logit +trn_freight,Freight Rail,-1,Fuel types and efficiency levels,absolute-cost-logit +trn_freight_road,3W Rural,-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck,-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (>12t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (>14t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (>15t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (>32t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-1t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-2.7t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-2t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-3.5t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-4.5t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-6t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (1-6t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (16-32t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (2-5t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (2.7-4.5t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (3.5-16t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (4.5-12t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (4.5-15t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (5-9t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (6-14t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (6-15t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (6-30t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (9-16t),-8,Fuel types,absolute-cost-logit +trn_pass,Cycle,-6,,absolute-cost-logit +trn_pass,Domestic Aviation,-6,,absolute-cost-logit +trn_pass,HSR,-6,,absolute-cost-logit +trn_pass,Passenger Rail,-1,Fuel types and efficiency levels,absolute-cost-logit +trn_pass,Walk,-6,,absolute-cost-logit +trn_pass_road,Bus,-3,Fuel types,absolute-cost-logit +trn_pass_road_bus,Heavy Bus,-3,Fuel types,absolute-cost-logit +trn_pass_road_bus,Light Bus,-3,Fuel types,absolute-cost-logit +trn_pass_road_LDV,Three-Wheeler,-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Moped,-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Motorcycle (>250cc),-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Motorcycle (50-250cc),-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Motorcycle (50-250cc),-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Scooter,-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_4W,Compact Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Large Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Large Car and SUV,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Light Truck and SUV,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Midsize Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Mini Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Multipurpose Vehicle,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Subcompact Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Van,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_shipping_intl,International Ship,-6,,absolute-cost-logit +# Passthrough tranSubsectors are listed below,,,,absolute-cost-logit +trn_pass,road,-6,,absolute-cost-logit +trn_pass_road,LDV,-6,,absolute-cost-logit +trn_pass_road,bus,-6,,absolute-cost-logit +trn_pass_road_LDV,4W,-6,,absolute-cost-logit +trn_pass_road_LDV,2W,-6,,absolute-cost-logit +trn_freight,road,-6,,absolute-cost-logit \ No newline at end of file From 97645ee4c6006125ff30acb7ec97795233475dd9 Mon Sep 17 00:00:00 2001 From: D3X132 Date: Tue, 26 Sep 2017 12:12:42 -0400 Subject: [PATCH 04/22] Add RES policy to limit non-oil use for oil electricity --- .../headers/ModelInterface_headers.txt | 7 ++ .../energy-data/assumptions/A_energy_data.R | 6 +- .../level2/L270.limits.R | 71 +++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 input/gcam-data-system/energy-processing-code/level2/L270.limits.R diff --git a/input/gcam-data-system/_common/headers/ModelInterface_headers.txt b/input/gcam-data-system/_common/headers/ModelInterface_headers.txt index 01469ed9f8..045e63f611 100755 --- a/input/gcam-data-system/_common/headers/ModelInterface_headers.txt +++ b/input/gcam-data-system/_common/headers/ModelInterface_headers.txt @@ -253,6 +253,8 @@ GlobalTechProfitShutdown, global-technology-database/+{sector-name}location-info GlobalTechSecOut, global-technology-database/+{sector-name}location-info, global-technology-database/+{subsector-name}location-info, location-info/+{name}technology, technology/+{year}period, period/+{name}secondary-output, secondary-output/+output-ratio, scenario, scenario/world, world/global-technology-database +GlobalTechRESSecOut, global-technology-database/+{sector-name}location-info, global-technology-database/+{subsector-name}location-info, location-info/+{name}technology, technology/+{year}period, period/+{name}res-secondary-output, res-secondary-output/+output-ratio, scenario, scenario/world, world/global-technology-database + GlobalTechIntGainOutputRatio, global-technology-database/+{sector-name}location-info, global-technology-database/+{subsector-name}location-info, location-info/+{name}technology, technology/+{year}period, internal-gains/+output-ratio, internal-gains/+internal-gains-market-name, scenario, scenario/world, world/global-technology-database, period/internal-gains GlobalTechCapture, global-technology-database/+{sector-name}location-info, global-technology-database/+{subsector-name}location-info, location-info/+{name}technology, technology/+{year}period, standard-capture-component/+remove-fraction, standard-capture-component/+storage-market, scenario, scenario/world, world/global-technology-database, period/standard-capture-component @@ -463,6 +465,11 @@ AgProdChange, world/+{name}region, region/+{name}AgSupplySector, AgSupplySector/ AgCost, world/+{name}region, region/+{name}AgSupplySector, AgSupplySector/+{name}AgSupplySubsector, AgSupplySubsector/+{name}AgProductionTechnology, AgProductionTechnology/+{year}period, period/+nonLandVariableCost, scenario, scenario/world, period/{name=CO2}CO2 +#####, POLICY + +PortfolioStd,world/+{name}region,region/+{name}policy-portfolio-standard, policy-portfolio-standard/+market, policy-portfolio-standard/+policyType, policy-portfolio-standard/+{year}constraint, scenario,scenario/world + + #####, LAND ALLOCATOR diff --git a/input/gcam-data-system/energy-data/assumptions/A_energy_data.R b/input/gcam-data-system/energy-data/assumptions/A_energy_data.R index 86f49eb885..76a857623d 100644 --- a/input/gcam-data-system/energy-data/assumptions/A_energy_data.R +++ b/input/gcam-data-system/energy-data/assumptions/A_energy_data.R @@ -21,4 +21,8 @@ digits_efficiency <- 3 digits_shrwt <- 4 #Range of PMultipliers to use for secondary output feedcrops from biodiesel and corn ethanol -max_bioliquid_Pmult <- 0.80 \ No newline at end of file +max_bioliquid_Pmult <- 0.80 + +#Fraction of liquids for feedstocks and oil electricity that must come from oil +oilFract_Elec <- 1 +oilFract_Feedstocks <- 1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-processing-code/level2/L270.limits.R b/input/gcam-data-system/energy-processing-code/level2/L270.limits.R new file mode 100644 index 0000000000..50a1bd23ef --- /dev/null +++ b/input/gcam-data-system/energy-processing-code/level2/L270.limits.R @@ -0,0 +1,71 @@ +# Before we can load headers we need some paths defined. They +# may be provided by a system environment variable or just +# having already been set in the workspace +if( !exists( "ENERGYPROC_DIR" ) ){ + if( Sys.getenv( "ENERGYPROC" ) != "" ){ + ENERGYPROC_DIR <- Sys.getenv( "ENERGYPROC" ) + } else { + stop("Could not determine location of energy data system. Please set the R var ENERGYPROC_DIR to the appropriate location") + } +} + +# Universal header file - provides logging, file support, etc. +source(paste(ENERGYPROC_DIR,"/../_common/headers/GCAM_header.R",sep="")) +source(paste(ENERGYPROC_DIR,"/../_common/headers/ENERGY_header.R",sep="")) +logstart( "L270.limits.R" ) +adddep(paste(ENERGYPROC_DIR,"/../_common/headers/GCAM_header.R",sep="")) +adddep(paste(ENERGYPROC_DIR,"/../_common/headers/ENERGY_header.R",sep="")) +printlog( "Constraints on bioliquids and bioenergy" ) + +# ----------------------------------------------------------------------------- +# 1. Read files + +sourcedata( "COMMON_ASSUMPTIONS", "A_common_data", extension = ".R" ) +sourcedata( "COMMON_ASSUMPTIONS", "level2_data_names", extension = ".R" ) +sourcedata( "MODELTIME_ASSUMPTIONS", "A_modeltime_data", extension = ".R" ) +sourcedata( "ENERGY_ASSUMPTIONS", "A_energy_data", extension = ".R" ) +GCAM_region_names <- readdata( "COMMON_MAPPINGS", "GCAM_region_names") +A23.globaltech_eff <- readdata( "ENERGY_ASSUMPTIONS", "A23.globaltech_eff" ) + +# ----------------------------------------------------------------------------- +# 2. Build tables for CSVs +#Limit bioliquids for feedstocks and electricity +#Note: we do this by requiring a certain fraction of inputs to those technologies to come from oil +printlog( "L270.CreditOutput: Secondary output of oil credits" ) +L270.CreditOutput <- data.frame(sector.name = "refining", + subsector.name = "oil refining", + technology = "oil refining") +L270.CreditOutput <- repeat_and_add_vector(L270.CreditOutput, "year", model_years) +L270.CreditOutput$res.secondary.output <- "oil-credits" +L270.CreditOutput$output.ratio <- 1 + +printlog( "L270.CreditInput_elec: minicam-energy-input of oil credits for electricity techs" ) +L270.globaltech_eff.melt <- interpolate_and_melt( A23.globaltech_eff, c( model_base_years, model_future_years ), value.name="efficiency", digits = digits_efficiency, rule=3 ) + +L270.CreditInput_elec <- data.frame(sector.name = c("electricity", "electricity", "electricity"), + subsector.name = c("refined liquids", "refined liquids", "refined liquids"), + technology = c("refined liquids (steam/CT)", "refined liquids (CC)", "refined liquids (CC CCS)")) +L270.CreditInput_elec <- repeat_and_add_vector(L270.CreditInput_elec, "year", model_years) +L270.CreditInput_elec$minicam.energy.input <- "oil-credits" +L270.CreditInput_elec$efficiency <- L270.globaltech_eff.melt$efficiency[ match( vecpaste(L270.CreditInput_elec[c("subsector.name", "technology", "year")]), + vecpaste(L270.globaltech_eff.melt[c("subsector", "technology", "year")]))] +L270.CreditInput_elec$coefficient <- oilFract_Elec / L270.CreditInput_elec$efficiency +L270.CreditInput_elec$efficiency <- NULL + +printlog( "L270.CreditMkt: Market for oil credits" ) +L270.CreditMkt <- GCAM_region_names[c("region")] +L270.CreditMkt$policy.portfolio.standard <- "oil-credits" +L270.CreditMkt$market <- "global" +L270.CreditMkt$policyType <- "RES" +L270.CreditMkt <- repeat_and_add_vector(L270.CreditMkt, "year", model_future_years) +L270.CreditMkt$constraint <- 1 + +# ----------------------------------------------------------------------------- +# 3. Write all csvs as tables, and paste csv filenames into a single batch XML file +write_mi_data( L270.CreditOutput, "GlobalTechRESSecOut", "ENERGY_LEVEL2_DATA", "L270.CreditOutput", "ENERGY_XML_BATCH", "batch_liquids_limits.xml" ) +write_mi_data( L270.CreditInput_elec, "GlobalTechCoef", "ENERGY_LEVEL2_DATA", "L270.CreditInput_elec", "ENERGY_XML_BATCH", "batch_liquids_limits.xml" ) +write_mi_data( L270.CreditMkt, "PortfolioStd", "ENERGY_LEVEL2_DATA", "L270.CreditMkt", "ENERGY_XML_BATCH", "batch_liquids_limits.xml" ) + +insert_file_into_batchxml( "ENERGY_XML_BATCH", "batch_liquids_limits.xml", "ENERGY_XML_FINAL", "liquids_limits.xml", "", xml_tag="outFile" ) + +logstop() From 87a21f39214ed39802692be07984057f520d2671 Mon Sep 17 00:00:00 2001 From: Pralit Patel Date: Tue, 26 Sep 2017 12:53:45 -0400 Subject: [PATCH 05/22] Code for first cut at limiting negative emissions with budget constraints by food expenditures or total negative emissions. --- .../source/market_dependency_finder.cpp | 6 +- .../containers/source/region_minicam.cpp | 4 + .../functions/include/good_value_input.h | 93 ++++++ .../functions/source/good_value_input.cpp | 98 ++++++ .../include/negative_emissions_final_demand.h | 121 +++++++ .../negative_emissions_final_demand.cpp | 218 +++++++++++++ .../technologies/include/good_value_output.h | 195 ++++++++++++ .../include/standard_capture_component.h | 4 + cvs/objects/technologies/source/Makefile | 1 + .../technologies/source/good_value_output.cpp | 296 ++++++++++++++++++ .../technologies/source/input_factory.cpp | 7 + .../technologies/source/output_factory.cpp | 7 +- .../source/standard_capture_component.cpp | 22 +- 13 files changed, 1067 insertions(+), 5 deletions(-) create mode 100644 cvs/objects/functions/include/good_value_input.h create mode 100644 cvs/objects/functions/source/good_value_input.cpp create mode 100644 cvs/objects/sectors/include/negative_emissions_final_demand.h create mode 100644 cvs/objects/sectors/source/negative_emissions_final_demand.cpp create mode 100644 cvs/objects/technologies/include/good_value_output.h create mode 100644 cvs/objects/technologies/source/good_value_output.cpp diff --git a/cvs/objects/containers/source/market_dependency_finder.cpp b/cvs/objects/containers/source/market_dependency_finder.cpp index e9fdbd14eb..d4593107ac 100644 --- a/cvs/objects/containers/source/market_dependency_finder.cpp +++ b/cvs/objects/containers/source/market_dependency_finder.cpp @@ -539,8 +539,10 @@ void MarketDependencyFinder::createOrdering() { ++numDependencies[ (*dependIt)->getFirstPriceVertex() ]; } } - (*dependIt)->getLastDemandVertex()->mOutEdges.push_back( (*it)->getFirstDemandVertex() ); - ++numDependencies[ (*it)->getFirstDemandVertex() ]; + if( !(*dependIt)->mDemandVertices.empty()) { + (*dependIt)->getLastDemandVertex()->mOutEdges.push_back( (*it)->getFirstDemandVertex() ); + ++numDependencies[ (*it)->getFirstDemandVertex() ]; + } } } } diff --git a/cvs/objects/containers/source/region_minicam.cpp b/cvs/objects/containers/source/region_minicam.cpp index 3455c4dfca..1171035db6 100644 --- a/cvs/objects/containers/source/region_minicam.cpp +++ b/cvs/objects/containers/source/region_minicam.cpp @@ -64,6 +64,7 @@ #include "sectors/include/production_sector.h" #include "sectors/include/ag_supply_sector.h" #include "sectors/include/energy_final_demand.h" +#include "sectors/include/negative_emissions_final_demand.h" #include "sectors/include/export_sector.h" #include "sectors/include/pass_through_sector.h" @@ -175,6 +176,9 @@ bool RegionMiniCAM::XMLDerivedClassParse( const std::string& nodeName, const xer else if( nodeName == EnergyFinalDemand::getXMLNameStatic() ){ parseContainerNode( curr, mFinalDemands, new EnergyFinalDemand ); } + else if( nodeName == NegativeEmissionsFinalDemand::getXMLNameStatic() ){ + parseContainerNode( curr, mFinalDemands, new NegativeEmissionsFinalDemand ); + } else if( nodeName == GCAMConsumer::getXMLNameStatic() ) { parseContainerNode( curr, mConsumers, new GCAMConsumer ); } diff --git a/cvs/objects/functions/include/good_value_input.h b/cvs/objects/functions/include/good_value_input.h new file mode 100644 index 0000000000..7ba7500ea7 --- /dev/null +++ b/cvs/objects/functions/include/good_value_input.h @@ -0,0 +1,93 @@ +/* +* LEGAL NOTICE +* This computer software was prepared by Battelle Memorial Institute, +* hereinafter the Contractor, under Contract No. DE-AC05-76RL0 1830 +* with the Department of Energy (DOE). NEITHER THE GOVERNMENT NOR THE +* CONTRACTOR MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY +* LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this +* sentence must appear on any copies of this computer software. +* +* EXPORT CONTROL +* User agrees that the Software will not be shipped, transferred or +* exported into any country or used in any manner prohibited by the +* United States Export Administration Act or any other applicable +* export laws, restrictions or regulations (collectively the "Export Laws"). +* Export of the Software may require some form of license or other +* authority from the U.S. Government, and failure to obtain such +* export control license may result in criminal liability under +* U.S. laws. In addition, if the Software is identified as export controlled +* items under the Export Laws, User represents and warrants that User +* is not a citizen, or otherwise located within, an embargoed nation +* (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) +* and that User is not otherwise prohibited +* under the Export Laws from receiving the Software. +* +* Copyright 2011 Battelle Memorial Institute. All Rights Reserved. +* Distributed as open-source under the terms of the Educational Community +* License version 2.0 (ECL 2.0). http://www.opensource.org/licenses/ecl2.php +* +* For further details, see: http://www.globalchange.umd.edu/models/gcam/ +* +*/ + + +#ifndef _GOOD_VALUE_INPUT_H_ +#define _GOOD_VALUE_INPUT_H_ +#if defined(_MSC_VER) +#pragma once +#endif + +/*! + * \file good_value_input.h + * \ingroup Objects + * \brief GoodValueInput class header file. + * \author Pralit Patel + */ + +#include +#include +#include "functions/include/energy_input.h" + +class Tabs; + +/*! + * \ingroup Objects + * \brief An input which adds the value of it's good to a market. + * \details TODO + * + * XML specification for GoodValueInput + * - XML name: \c renewable-input + * - Contained by: Technology + * - Parsing inherited from class: EnergyInput + * - Attributes: + * - \c name MiniCAMInput::mName + * - Elements: None. + * + * \author Pralit Patel + */ +class GoodValueInput: public EnergyInput +{ + friend class InputFactory; + friend class UnmanagedLandTechnology; +public: + static const std::string& getXMLNameStatic(); + + const std::string& getXMLReportingName() const; + + virtual GoodValueInput* clone() const; + + virtual bool isSameType( const std::string& aType ) const; + + + virtual void setPhysicalDemand( const double aPhysicalDemand, + const std::string& aRegionName, + const int aPeriod ); +protected: + GoodValueInput(); + + // Constuctor to allow internal creation of this object + GoodValueInput( const std::string& aName ); + +}; + +#endif // _GOOD_VALUE_INPUT_H_ diff --git a/cvs/objects/functions/source/good_value_input.cpp b/cvs/objects/functions/source/good_value_input.cpp new file mode 100644 index 0000000000..cb319b195c --- /dev/null +++ b/cvs/objects/functions/source/good_value_input.cpp @@ -0,0 +1,98 @@ +/* +* LEGAL NOTICE +* This computer software was prepared by Battelle Memorial Institute, +* hereinafter the Contractor, under Contract No. DE-AC05-76RL0 1830 +* with the Department of Energy (DOE). NEITHER THE GOVERNMENT NOR THE +* CONTRACTOR MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY +* LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this +* sentence must appear on any copies of this computer software. +* +* EXPORT CONTROL +* User agrees that the Software will not be shipped, transferred or +* exported into any country or used in any manner prohibited by the +* United States Export Administration Act or any other applicable +* export laws, restrictions or regulations (collectively the "Export Laws"). +* Export of the Software may require some form of license or other +* authority from the U.S. Government, and failure to obtain such +* export control license may result in criminal liability under +* U.S. laws. In addition, if the Software is identified as export controlled +* items under the Export Laws, User represents and warrants that User +* is not a citizen, or otherwise located within, an embargoed nation +* (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) +* and that User is not otherwise prohibited +* under the Export Laws from receiving the Software. +* +* Copyright 2011 Battelle Memorial Institute. All Rights Reserved. +* Distributed as open-source under the terms of the Educational Community +* License version 2.0 (ECL 2.0). http://www.opensource.org/licenses/ecl2.php +* +* For further details, see: http://www.globalchange.umd.edu/models/gcam/ +* +*/ + + +/*! + * \file good_value_input.cpp + * \ingroup Objects + * \brief The GoodValueInput class source file. + * \author Pralit Patel + */ + +#include "util/base/include/definitions.h" +#include +#include +#include "functions/include/good_value_input.h" +#include "util/base/include/xml_helper.h" + +using namespace std; +using namespace xercesc; + +/*! \brief Get the XML node name in static form for comparison when parsing XML. +* +* This public function accesses the private constant string, XML_NAME. This way +* the tag is always consistent for both read-in and output and can be easily +* changed. The "==" operator that is used when parsing, required this second +* function to return static. +* \note A function cannot be static and virtual. +* \author Josh Lurz, James Blackwood +* \return The constant XML_NAME as a static. +*/ +const string& GoodValueInput::getXMLNameStatic() { + const static string XML_NAME = "good-value-input"; + return XML_NAME; +} + +/*! \brief Get the XML name for reporting to XML file. +* +* This public function accesses the private constant string, XML_NAME. This way +* the tag is always consistent for reporting outputs and can be easily +* changed. +* \author Sonny Kim +* \return The constant XML_NAME. +*/ +const string& GoodValueInput::getXMLReportingName() const{ + return getXMLNameStatic(); +} + +//! Constructor +GoodValueInput::GoodValueInput() +{ +} + +//! Clone the input. +GoodValueInput* GoodValueInput::clone() const { + return new GoodValueInput( *this ); +} + +bool GoodValueInput::isSameType( const string& aType ) const { + return aType == getXMLNameStatic(); +} + +void GoodValueInput::setPhysicalDemand( double aPhysicalDemand, + const string& aRegionName, + const int aPeriod ) +{ + double goodValue = aPhysicalDemand * getPrice( aRegionName, aPeriod ) * -1.0; + EnergyInput::setPhysicalDemand( goodValue, aRegionName, aPeriod ); +} + diff --git a/cvs/objects/sectors/include/negative_emissions_final_demand.h b/cvs/objects/sectors/include/negative_emissions_final_demand.h new file mode 100644 index 0000000000..70294755b2 --- /dev/null +++ b/cvs/objects/sectors/include/negative_emissions_final_demand.h @@ -0,0 +1,121 @@ +/* +* LEGAL NOTICE +* This computer software was prepared by Battelle Memorial Institute, +* hereinafter the Contractor, under Contract No. DE-AC05-76RL0 1830 +* with the Department of Energy (DOE). NEITHER THE GOVERNMENT NOR THE +* CONTRACTOR MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY +* LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this +* sentence must appear on any copies of this computer software. +* +* EXPORT CONTROL +* User agrees that the Software will not be shipped, transferred or +* exported into any country or used in any manner prohibited by the +* United States Export Administration Act or any other applicable +* export laws, restrictions or regulations (collectively the "Export Laws"). +* Export of the Software may require some form of license or other +* authority from the U.S. Government, and failure to obtain such +* export control license may result in criminal liability under +* U.S. laws. In addition, if the Software is identified as export controlled +* items under the Export Laws, User represents and warrants that User +* is not a citizen, or otherwise located within, an embargoed nation +* (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) +* and that User is not otherwise prohibited +* under the Export Laws from receiving the Software. +* +* Copyright 2011 Battelle Memorial Institute. All Rights Reserved. +* Distributed as open-source under the terms of the Educational Community +* License version 2.0 (ECL 2.0). http://www.opensource.org/licenses/ecl2.php +* +* For further details, see: http://www.globalchange.umd.edu/models/gcam/ +* +*/ + + +#ifndef _NEGATIVE_EMISSIONS_FINAL_DEMAND_H_ +#define _NEGATIVE_EMISSIONS_FINAL_DEMAND_H_ +#if defined(_MSC_VER) +#pragma once +#endif + +/*! + * \file negative_emissions_final_demand.h + * \ingroup Objects + * \brief The NegativeEmissionsFinalDemand class header file. + * \author Pralit Patel + */ + +#include +#include +#include "sectors/include/afinal_demand.h" +#include "util/base/include/value.h" +#include "util/base/include/time_vector.h" + +// Forward declarations +class GDP; +class Demographic; + +/*! + * \ingroup Objects + * \brief A class which calculates the total negative emissions for a gas and + * adds the value to the demand of a configured policy market. + * \details TODO + */ + +class NegativeEmissionsFinalDemand: public AFinalDemand +{ + +public: + static const std::string& getXMLNameStatic(); + + NegativeEmissionsFinalDemand(); + + virtual ~NegativeEmissionsFinalDemand(); + + virtual bool XMLParse( const xercesc::DOMNode* aNode ); + + virtual void toInputXML( std::ostream& aOut, + Tabs* aTabs ) const; + + virtual void toDebugXML( const int aPeriod, + std::ostream& aOut, + Tabs* aTabs ) const; + + virtual const std::string& getName() const; + + virtual void completeInit( const std::string& aRegionName, + const IInfo* aRegionInfo ); + + virtual void initCalc( const std::string& aRegionName, + const GDP* aGDP, + const Demographic* aDemographics, + const int aPeriod ); + + virtual void setFinalDemand( const std::string& aRegionName, + const Demographic* aDemographics, + const GDP* aGDP, + const int aPeriod ); + + virtual double getWeightedEnergyPrice( const std::string& aRegionName, + const int aPeriod ) const; + + virtual void csvOutputFile( const std::string& aRegionName ) const; + + virtual void dbOutput( const std::string& aRegionName ) const; + + virtual void accept( IVisitor* aVisitor, const int aPeriod ) const; +protected: + + //! Name of the gas to track + std::string mName; + + //! Name of the policy market to add negative emissions value to. + std::string mPolicyName; + + //! State value necessary to use Marketplace::addToDemand + double mLastCalcValue; + + virtual const std::string& getXMLName() const; +}; + +#endif // _NEGATIVE_EMISSIONS_FINAL_DEMAND_H_ + diff --git a/cvs/objects/sectors/source/negative_emissions_final_demand.cpp b/cvs/objects/sectors/source/negative_emissions_final_demand.cpp new file mode 100644 index 0000000000..d8dd5c5043 --- /dev/null +++ b/cvs/objects/sectors/source/negative_emissions_final_demand.cpp @@ -0,0 +1,218 @@ +/* +* LEGAL NOTICE +* This computer software was prepared by Battelle Memorial Institute, +* hereinafter the Contractor, under Contract No. DE-AC05-76RL0 1830 +* with the Department of Energy (DOE). NEITHER THE GOVERNMENT NOR THE +* CONTRACTOR MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY +* LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this +* sentence must appear on any copies of this computer software. +* +* EXPORT CONTROL +* User agrees that the Software will not be shipped, transferred or +* exported into any country or used in any manner prohibited by the +* United States Export Administration Act or any other applicable +* export laws, restrictions or regulations (collectively the "Export Laws"). +* Export of the Software may require some form of license or other +* authority from the U.S. Government, and failure to obtain such +* export control license may result in criminal liability under +* U.S. laws. In addition, if the Software is identified as export controlled +* items under the Export Laws, User represents and warrants that User +* is not a citizen, or otherwise located within, an embargoed nation +* (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) +* and that User is not otherwise prohibited +* under the Export Laws from receiving the Software. +* +* Copyright 2011 Battelle Memorial Institute. All Rights Reserved. +* Distributed as open-source under the terms of the Educational Community +* License version 2.0 (ECL 2.0). http://www.opensource.org/licenses/ecl2.php +* +* For further details, see: http://www.globalchange.umd.edu/models/gcam/ +* +*/ + + +/*! + * \file negative_emissions_final_demand.cpp + * \ingroup Objects + * \brief NegativeEmissionsFinalDemand class source file. + * \author Pralit Patel + */ + +#include +#include + +#include +#include + +#include "util/base/include/definitions.h" +#include "util/base/include/xml_helper.h" +#include "util/base/include/configuration.h" +#include "util/base/include/model_time.h" +#include "util/base/include/ivisitor.h" +#include "containers/include/scenario.h" +#include "marketplace/include/marketplace.h" +#include "containers/include/market_dependency_finder.h" +#include "sectors/include/negative_emissions_final_demand.h" + +using namespace std; +using namespace xercesc; + +extern Scenario* scenario; + +/*! \brief Constructor. +*/ +NegativeEmissionsFinalDemand::NegativeEmissionsFinalDemand() +{ +} + +/*! \brief Destructor. +*/ +NegativeEmissionsFinalDemand::~NegativeEmissionsFinalDemand(){ +} + +const string& NegativeEmissionsFinalDemand::getXMLName() const { + return getXMLNameStatic(); +} + +/*! \brief Get the XML node name in static form for comparison when parsing XML. +* +* This public function accesses the private constant string, XML_NAME. This way +* the tag is always consistent for both read-in and output and can be easily +* changed. The "==" operator that is used when parsing, required this second +* function to return static. +* \note A function cannot be static and virtual. +* \author Josh Lurz, James Blackwood +* \return The constant XML_NAME as a static. +*/ +const string& NegativeEmissionsFinalDemand::getXMLNameStatic() { + const static string XML_NAME = "negative-emissions-final-demand"; + return XML_NAME; +} + +const string& NegativeEmissionsFinalDemand::getName() const { + return mName; +} + +bool NegativeEmissionsFinalDemand::XMLParse( const DOMNode* aNode ) { + + assert( aNode ); + + // get the name attribute. + mName = XMLHelper::getAttr( aNode, "name" ); + + // get all child nodes. + DOMNodeList* nodeList = aNode->getChildNodes(); + const Modeltime* modeltime = scenario->getModeltime(); + + // loop through the child nodes. + for( unsigned int i = 0; i < nodeList->getLength(); ++i ){ + DOMNode* curr = nodeList->item( i ); + const string nodeName = XMLHelper::safeTranscode( curr->getNodeName() ); + + if( nodeName == "#text" ) { + continue; + } + if( nodeName == "policy-name" ){ + mPolicyName = XMLHelper::getValue( curr ); + } + else { + ILogger& mainLog = ILogger::getLogger( "main_log" ); + mainLog.setLevel( ILogger::WARNING ); + mainLog << "Unknown element " << nodeName + << " encountered while parsing " << getXMLName() << endl; + } + } + return true; +} + +void NegativeEmissionsFinalDemand::toInputXML( ostream& aOut, Tabs* aTabs ) const { + XMLWriteOpeningTag( getXMLName(), aOut, aTabs, mName ); + const Modeltime* modeltime = scenario->getModeltime(); + + // write the xml for the class members. + XMLWriteElement( mPolicyName, "policy-name", aOut, aTabs ); + + XMLWriteClosingTag( getXMLName(), aOut, aTabs ); +} + +void NegativeEmissionsFinalDemand::toDebugXML( const int aPeriod, + ostream& aOut, + Tabs* aTabs ) const +{ + toInputXML( aOut, aTabs ); +} + +void NegativeEmissionsFinalDemand::completeInit( const string& aRegionName, + const IInfo* aRegionInfo ) +{ + if( mPolicyName.empty() ) { + ILogger& mainLog = ILogger::getLogger( "main_log" ); + mainLog.setLevel( ILogger::SEVERE ); + mainLog << "No policy-name set for " << getXMLName() << ": " << mName + << " in region " << aRegionName << endl; + abort(); + } + + MarketDependencyFinder* depFinder = scenario->getMarketplace()->getDependencyFinder(); + depFinder->addDependency( mPolicyName, aRegionName, mName, aRegionName ); +} + +void NegativeEmissionsFinalDemand::initCalc( const string& aRegionName, + const GDP* aGDP, + const Demographic* aDemographics, + const int aPeriod ) +{ +} + +/*! \brief Set the final demand for service into the marketplace after +* calling the aggregate demand function. +* +* \detail Adding the demand for final services into the marketplace +* is separted from the actual calculation of final service so that services can +* be calculated and used without being adding to marketplace. +* \author Sonny Kim, Josh Lurz +* \param string& aRegionName region name. +* \param GDP* aGDP object. +* \param Demographic* aDemographicss. +* \param aPeriod Model aPeriod +*/ +void NegativeEmissionsFinalDemand::setFinalDemand( const string& aRegionName, + const Demographic* aDemographics, + const GDP* aGDP, + const int aPeriod ) +{ + Marketplace* marketplace = scenario->getMarketplace(); + double co2Price = marketplace->getPrice( mName, aRegionName, aPeriod, false ); + if( co2Price == Marketplace::NO_MARKET_PRICE ) { + // no CO2 policy so the negative emissions policy is inactive too + // TODO: warn? + return; + } + double regionalCO2Emiss = marketplace->getDemand( mName, aRegionName, aPeriod ); + regionalCO2Emiss = std::max( -1.0 * regionalCO2Emiss, 0.0 ); + double negativeEmissValue = regionalCO2Emiss * co2Price; + mLastCalcValue = marketplace->addToDemand( mPolicyName, aRegionName, negativeEmissValue, mLastCalcValue, aPeriod ); +} + +double NegativeEmissionsFinalDemand::getWeightedEnergyPrice( const string& aRegionName, + const int aPeriod ) const +{ + return 0; +} + +// Documentation is inherited. +void NegativeEmissionsFinalDemand::accept( IVisitor* aVisitor, + const int aPeriod ) const +{ + aVisitor->startVisitFinalDemand( this, aPeriod ); + aVisitor->endVisitFinalDemand( this, aPeriod ); +} + +//! Write sector output to database. +void NegativeEmissionsFinalDemand::csvOutputFile( const string& aRegionName ) const { +} + +//! Write MiniCAM style demand sector output to database. +void NegativeEmissionsFinalDemand::dbOutput( const string& aRegionName ) const { +} + diff --git a/cvs/objects/technologies/include/good_value_output.h b/cvs/objects/technologies/include/good_value_output.h new file mode 100644 index 0000000000..c5fb138b36 --- /dev/null +++ b/cvs/objects/technologies/include/good_value_output.h @@ -0,0 +1,195 @@ +#ifndef _GOOD_VALUE_OUTPUT_H_ +#define _GOOD_VALUE_OUTPUT_H_ +#if defined(_MSC_VER) +#pragma once +#endif + +/* +* LEGAL NOTICE +* This computer software was prepared by Battelle Memorial Institute, +* hereinafter the Contractor, under Contract No. DE-AC05-76RL0 1830 +* with the Department of Energy (DOE). NEITHER THE GOVERNMENT NOR THE +* CONTRACTOR MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY +* LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this +* sentence must appear on any copies of this computer software. +* +* EXPORT CONTROL +* User agrees that the Software will not be shipped, transferred or +* exported into any country or used in any manner prohibited by the +* United States Export Administration Act or any other applicable +* export laws, restrictions or regulations (collectively the "Export Laws"). +* Export of the Software may require some form of license or other +* authority from the U.S. Government, and failure to obtain such +* export control license may result in criminal liability under +* U.S. laws. In addition, if the Software is identified as export controlled +* items under the Export Laws, User represents and warrants that User +* is not a citizen, or otherwise located within, an embargoed nation +* (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) +* and that User is not otherwise prohibited +* under the Export Laws from receiving the Software. +* +* Copyright 2011 Battelle Memorial Institute. All Rights Reserved. +* Distributed as open-source under the terms of the Educational Community +* License version 2.0 (ECL 2.0). http://www.opensource.org/licenses/ecl2.php +* +* For further details, see: http://www.globalchange.umd.edu/models/gcam/ +* +*/ + + +/*! + * \file good_value_output.h + * \ingroup Objects + * \brief GoodValueOutput class header file. + * \author Pralit Patel + */ + +#include +#include + +class Tabs; + +#include "technologies/include/ioutput.h" +#include "util/base/include/value.h" + +/*! + * \ingroup Objects + * \brief An output that adds the value of a the good to a market. + * \details TODO + * + * XML specification for GoodValueOutput + * - XML name: \c secondary-output + * - Contained by: Technology + * - Parsing inherited from class: None. + * - Attributes: + * - \c name GoodValueOutput::mName + * - Elements: + * - \c output-ratio GoodValueOutput::mOutputRatio + * + * \author Pralit Patel + */ +class GoodValueOutput: public IOutput +{ + friend class OutputFactory; +public: + /*! + * \brief Get the XML name for the class. + * \return The XML name for the class. + */ + static const std::string& getXMLNameStatic(); + + virtual GoodValueOutput* clone() const; + + virtual bool isSameType( const std::string& aType ) const; + + virtual const std::string& getName() const; + + virtual void setName( const std::string& aName ); + + virtual const std::string& getXMLReportingName() const; + + virtual bool XMLParse( const xercesc::DOMNode* aNode ); + + virtual void toInputXML( std::ostream& aOut, + Tabs* aTabs ) const; + + virtual void toDebugXML( const int aPeriod, + std::ostream& aOut, + Tabs* aTabs ) const; + + virtual void completeInit( const std::string& aSectorName, + const std::string& aRegionName, + const IInfo* aTechInfo, + const bool aIsTechOperating ); + + virtual void initCalc( const std::string& aRegionName, + const std::string& aSectorName, + const int aPeriod ); + + virtual void postCalc( const std::string& aRegionName, + const int aPeriod ); + + virtual void scaleCoefficient( const double aScaler ); + + virtual OutputList calcPhysicalOutput( const double aPrimaryOutput, + const std::string& aRegionName, + const ICaptureComponent* aCaptureComponent, + const int aPeriod ) const; + + virtual void setPhysicalOutput( const double aPrimaryOutput, + const std::string& aRegionName, + ICaptureComponent* aCaptureComponent, + const int aPeriod ); + + virtual double getPhysicalOutput( const int aPeriod ) const; + + virtual void setCurrencyOutput( const std::string& aRegionName, + const double aOutput, + const int aPeriod ) + { + // TODO: This could work by converting from physical to currency with + // the market price. + } + + virtual double getCurrencyOutput( const int aPeriod ) const + { + // TODO: This could work by converting from physical to currency with + // the market price. + return 0; + } + + virtual double getValue( const std::string& aRegionName, + const ICaptureComponent* aCaptureComponent, + const int aPeriod ) const; + + virtual std::string getOutputUnits( const std::string& aRegionName ) const; + + virtual double getEmissionsPerOutput( const std::string& aGHGName, + const int aPeriod ) const; + + virtual void accept( IVisitor* aVisitor, const int aPeriod ) const; + + // Documentation is inherited. + virtual void sendLandAllocator( const ILandAllocator* aLandAllocator, + const std::string& aName ) {} + + virtual void doInterpolations( const int aYear, const int aPreviousYear, + const int aNextYear, const IOutput* aPreviousInput, + const IOutput* aNextInput ); + +protected: + /*! + * \brief Protected constructor so the class can only be created by the + * OutputFactory. + */ + GoodValueOutput(); + + double calcPhysicalOutputInternal( const double aPrimaryOutput, const std::string& aRegionName, const int aPeriod ) const; + + //! Physical output by period. + std::vector mPhysicalOutputs; + + //! Name of the secondary output. Corresponds to a market for this good and + //! a supply sector which supplies this good as its primary output. + std::string mName; + + //! The name of the good (sector name) which will be used to look up the price. + std::string mGoodName; + + //! Ratio of the secondary output to primary output production such that + //! primary output multiplied by the ratio is equal to secondary output. + Value mOutputRatio; + + //! Multiplier to price of secondary good to allow unit changes. + double mPriceMult; + + //! State value necessary to use Marketplace::addToDemand + double mLastCalcValue; + + //! The market name in which this output is adjusting the value. If empty + //! the current region is assumed. + std::string mMarketName; + +}; + +#endif // _GOOD_VALUE_OUTPUT_H_ diff --git a/cvs/objects/technologies/include/standard_capture_component.h b/cvs/objects/technologies/include/standard_capture_component.h index a4b8964b6a..fd57233c1d 100644 --- a/cvs/objects/technologies/include/standard_capture_component.h +++ b/cvs/objects/technologies/include/standard_capture_component.h @@ -175,6 +175,10 @@ class StandardCaptureComponent: public ICaptureComponent { //! State value necessary to use Marketplace::addToDemand double mLastCalcValue; + + bool mApplyNegPenalty; + double mLastCalcValueNeg; + double mTargetGasValue; }; #endif // _STANDARD_CAPTURE_COMPONENT_H_ diff --git a/cvs/objects/technologies/source/Makefile b/cvs/objects/technologies/source/Makefile index 3b91c8ea71..4d3d780b4a 100644 --- a/cvs/objects/technologies/source/Makefile +++ b/cvs/objects/technologies/source/Makefile @@ -51,6 +51,7 @@ OBJS = base_technology.o \ empty_technology.o \ generic_output.o \ pass_through_technology.o \ + good_value_output.o \ input_factory.o technologies_dir: ${OBJS} diff --git a/cvs/objects/technologies/source/good_value_output.cpp b/cvs/objects/technologies/source/good_value_output.cpp new file mode 100644 index 0000000000..c4734845d0 --- /dev/null +++ b/cvs/objects/technologies/source/good_value_output.cpp @@ -0,0 +1,296 @@ +/* +* LEGAL NOTICE +* This computer software was prepared by Battelle Memorial Institute, +* hereinafter the Contractor, under Contract No. DE-AC05-76RL0 1830 +* with the Department of Energy (DOE). NEITHER THE GOVERNMENT NOR THE +* CONTRACTOR MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY +* LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this +* sentence must appear on any copies of this computer software. +* +* EXPORT CONTROL +* User agrees that the Software will not be shipped, transferred or +* exported into any country or used in any manner prohibited by the +* United States Export Administration Act or any other applicable +* export laws, restrictions or regulations (collectively the "Export Laws"). +* Export of the Software may require some form of license or other +* authority from the U.S. Government, and failure to obtain such +* export control license may result in criminal liability under +* U.S. laws. In addition, if the Software is identified as export controlled +* items under the Export Laws, User represents and warrants that User +* is not a citizen, or otherwise located within, an embargoed nation +* (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) +* and that User is not otherwise prohibited +* under the Export Laws from receiving the Software. +* +* Copyright 2011 Battelle Memorial Institute. All Rights Reserved. +* Distributed as open-source under the terms of the Educational Community +* License version 2.0 (ECL 2.0). http://www.opensource.org/licenses/ecl2.php +* +* For further details, see: http://www.globalchange.umd.edu/models/gcam/ +* +*/ + + +/*! +* \file good_value_output.cpp +* \ingroup Objects +* \brief GoodValueOutput class source file. +* \author Pralit Patel +*/ +#include "util/base/include/definitions.h" +#include +#include +#include "util/base/include/xml_helper.h" +#include "technologies/include/good_value_output.h" +#include "containers/include/scenario.h" +#include "util/base/include/model_time.h" +#include "containers/include/iinfo.h" +#include "marketplace/include/marketplace.h" +#include "util/base/include/ivisitor.h" +#include "containers/include/market_dependency_finder.h" +#include "functions/include/function_utils.h" + +using namespace std; +using namespace xercesc; + +extern Scenario* scenario; + +/*! \brief Get the XML name for reporting to XML file. +* +* This public function accesses the private constant string, XML_NAME. This way +* the tag is always consistent for reporting outputs and can be easily +* changed. +* \author Sonny Kim +* \return The constant XML_NAME. +*/ +const string& GoodValueOutput::getXMLReportingName() const{ + return getXMLNameStatic(); +} + +const string& GoodValueOutput::getXMLNameStatic() +{ + const static string XML_NAME = "good-value-output"; + return XML_NAME; +} + +GoodValueOutput::GoodValueOutput() + : mPhysicalOutputs( scenario->getModeltime()->getmaxper() ), + mPriceMult( 0.0 ) +{ +} + +GoodValueOutput* GoodValueOutput::clone() const +{ + return new GoodValueOutput( *this ); +} + +bool GoodValueOutput::isSameType( const string& aType ) const +{ + return aType == getXMLNameStatic(); +} + +const string& GoodValueOutput::getName() const +{ + // Make sure the name is initialized. + assert( !mName.empty() ); + + return mName; +} + +void GoodValueOutput::setName( const string& aName ) +{ + // Make sure the name is initialized. + assert( !aName.empty() ); + + mName = aName; +} + +bool GoodValueOutput::XMLParse( const DOMNode* aNode ) +{ + // assume we are passed a valid node. + assert( aNode ); + + // get all the children. + DOMNodeList* nodeList = aNode->getChildNodes(); + + // get the name attribute. + mName = XMLHelper::getAttr( aNode, "name" ); + + for( unsigned int i = 0; i < nodeList->getLength(); ++i ) { + const DOMNode* curr = nodeList->item( i ); + const string nodeName = XMLHelper::safeTranscode( curr->getNodeName() ); + + if( nodeName == "#text" ) { + continue; + } + else if( nodeName == "output-ratio" ) { + mOutputRatio.set( XMLHelper::getValue( curr ) ); + } + else if( nodeName == "pMultiplier" ) { + mPriceMult = XMLHelper::getValue( curr ); + } + else if( nodeName == "market-name" ) { + mMarketName = XMLHelper::getValue( curr ); + } + else { + ILogger& mainLog = ILogger::getLogger( "main_log" ); + mainLog.setLevel( ILogger::WARNING ); + mainLog << "Unrecognized text string: " << nodeName << " found while parsing " << getXMLNameStatic() << "." << endl; + } + } + + // TODO: Improve error handling. + return true; +} + +void GoodValueOutput::toInputXML( ostream& aOut, + Tabs* aTabs ) const +{ + XMLWriteOpeningTag( getXMLNameStatic(), aOut, aTabs, mName ); + XMLWriteElement( mOutputRatio, "output-ratio", aOut, aTabs ); + XMLWriteElementCheckDefault( mPriceMult, "pMultiplier", aOut, aTabs, 1.0 ); + XMLWriteElementCheckDefault( mMarketName, "market-name", aOut, aTabs, string() ); + XMLWriteClosingTag( getXMLNameStatic(), aOut, aTabs ); +} + +void GoodValueOutput::toDebugXML( const int aPeriod, + ostream& aOut, + Tabs* aTabs ) const +{ + XMLWriteOpeningTag( getXMLNameStatic(), aOut, aTabs, mName ); + XMLWriteElement( mOutputRatio, "output-ratio", aOut, aTabs ); + XMLWriteElement( mPriceMult, "pMultiplier", aOut, aTabs ); + XMLWriteElement( mPhysicalOutputs[ aPeriod ], "output", aOut, aTabs ); + XMLWriteElement( mMarketName, "market-name", aOut, aTabs ); + XMLWriteClosingTag( getXMLNameStatic(), aOut, aTabs ); +} + +void GoodValueOutput::completeInit( const string& aSectorName, + const string& aRegionName, + const IInfo* aTechInfo, + const bool aIsTechOperating ) +{ + // GoodValue output is removed from demand, so add a dependency. + if( aIsTechOperating ) { + scenario->getMarketplace()->getDependencyFinder()->addDependency( aSectorName, + aRegionName, + getName(), + mMarketName.empty() ? aRegionName : mMarketName ); + } + mGoodName = aSectorName; +} + +void GoodValueOutput::initCalc( const string& aRegionName, + const string& aSectorName, + const int aPeriod ) +{ +} + + +void GoodValueOutput::postCalc( const string& aRegionName, + const int aPeriod ) +{ +} + +void GoodValueOutput::scaleCoefficient( const double aScaler ){ +} + +IOutput::OutputList GoodValueOutput::calcPhysicalOutput( const double aPrimaryOutput, + const string& aRegionName, + const ICaptureComponent* aCaptureComponent, + const int aPeriod ) const +{ + OutputList outputList; + outputList.push_back( make_pair( mName, calcPhysicalOutputInternal( aPrimaryOutput, aRegionName, aPeriod ) ) ); + return outputList; +} + +void GoodValueOutput::setPhysicalOutput( const double aPrimaryOutput, + const string& aRegionName, + ICaptureComponent* aCaptureComponent, + const int aPeriod ) +{ + // GoodValue output is the primary output multiplied by the output ratio. + mPhysicalOutputs[ aPeriod ] = calcPhysicalOutputInternal( aPrimaryOutput, aRegionName, aPeriod ); + + Marketplace* marketplace = scenario->getMarketplace(); + mLastCalcValue = marketplace->addToDemand( mName, mMarketName.empty() ? aRegionName : mMarketName, mPhysicalOutputs[ aPeriod ], mLastCalcValue, aPeriod, true ); +} + +double GoodValueOutput::getPhysicalOutput( const int aPeriod ) const +{ + assert( mPhysicalOutputs[ aPeriod ].isInited() ); + return mPhysicalOutputs[ aPeriod ]; +} + +double GoodValueOutput::getValue( const string& aRegionName, + const ICaptureComponent* aCaptureComponent, + const int aPeriod ) const +{ + /* + double price = scenario->getMarketplace()->getPrice( mName, mMarketName.empty() ? aRegionName : mMarketName, aPeriod, true ); + + // Market price should exist or there is not a sector with this good as the + // primary output. This can be caused by incorrect input files. + assert( price != Marketplace::NO_MARKET_PRICE ); + if( price == Marketplace::NO_MARKET_PRICE ) { + return 0; + } + + // The value of the secondary output is the market price multiplied by the + // output ratio. + return price * mOutputRatio * mPriceMult; + */ + return 0.0; +} + +string GoodValueOutput::getOutputUnits( const string& aRegionName ) const { + return scenario->getMarketplace()->getMarketInfo( getName(), mMarketName.empty() ? aRegionName : mMarketName, 0, true ) + ->getString( "output-unit", false ); +} + +double GoodValueOutput::getEmissionsPerOutput( const string& aGHGName, + const int aPeriod ) const +{ + return 0.0; +} + +void GoodValueOutput::accept( IVisitor* aVisitor, const int aPeriod ) const +{ + aVisitor->startVisitOutput( this, aPeriod ); + aVisitor->endVisitOutput( this, aPeriod ); +} + +/*! + * \brief Calculate physical output. + * \details Physical output of the secondary good is equal to the primary output + * multiplied by the coefficient. + * \return Physical output. + */ +double GoodValueOutput::calcPhysicalOutputInternal( const double aPrimaryOutput, const string& aRegionName, const int aPeriod ) const { + return aPrimaryOutput * mOutputRatio * scenario->getMarketplace()->getPrice( mGoodName, aRegionName, aPeriod ); +} + +void GoodValueOutput::doInterpolations( const int aYear, const int aPreviousYear, + const int aNextYear, const IOutput* aPreviousOutput, + const IOutput* aNextOutput ) +{ + // TODO: do we really want to do this? + const GoodValueOutput* prevSecOutput = static_cast( aPreviousOutput ); + const GoodValueOutput* nextSecOutput = static_cast( aNextOutput ); + + /*! + * \pre We are given a valid GoodValueOutput for the previous output. + */ + assert( prevSecOutput ); + + /*! + * \pre We are given a valid GoodValueOutput for the next output. + */ + assert( nextSecOutput ); + + // interpolate the output ratio + mOutputRatio.set( util::linearInterpolateY( aYear, aPreviousYear, aNextYear, + prevSecOutput->mOutputRatio, + nextSecOutput->mOutputRatio ) ); +} diff --git a/cvs/objects/technologies/source/input_factory.cpp b/cvs/objects/technologies/source/input_factory.cpp index 880b87c7da..cb4191f64f 100644 --- a/cvs/objects/technologies/source/input_factory.cpp +++ b/cvs/objects/technologies/source/input_factory.cpp @@ -53,6 +53,7 @@ #include "functions/include/renewable_input.h" #include "functions/include/input_subsidy.h" #include "functions/include/input_tax.h" +#include "functions/include/good_value_input.h" using namespace std; @@ -87,6 +88,9 @@ bool InputFactory::isOfType( const std::string& aType ) { if( aType == InputTax::getXMLNameStatic() ) { return true; } + if( aType == GoodValueInput::getXMLNameStatic() ) { + return true; + } return false; } @@ -121,6 +125,9 @@ auto_ptr InputFactory::create( const std::string& aType ) { if( aType == InputTax::getXMLNameStatic() ){ return auto_ptr( new InputTax ); } + if( aType == GoodValueInput::getXMLNameStatic() ){ + return auto_ptr( new GoodValueInput ); + } // Check for consistency. assert( !isOfType( aType ) ); diff --git a/cvs/objects/technologies/source/output_factory.cpp b/cvs/objects/technologies/source/output_factory.cpp index 8ea84b5f4a..9214c399f7 100644 --- a/cvs/objects/technologies/source/output_factory.cpp +++ b/cvs/objects/technologies/source/output_factory.cpp @@ -51,6 +51,7 @@ // #include "emissions/include/by_product.h" #include "technologies/include/internal_gains.h" #include "technologies/include/fractional_secondary_output.h" +#include "technologies/include/good_value_output.h" using namespace std; @@ -66,7 +67,8 @@ bool OutputFactory::isOfType( const string& aType ) { || ( aType == RESSecondaryOutput::getXMLNameStatic() ) || ( aType == InternalGains::getXMLNameStatic() ) || ( aType == ResidueBiomassOutput::getXMLNameStatic() ) - || ( aType == FractionalSecondaryOutput::getXMLNameStatic() ); + || ( aType == FractionalSecondaryOutput::getXMLNameStatic() ) + || ( aType == GoodValueOutput::getXMLNameStatic() ); // TODO: Enable byproducts code when nuclear is committed. // || ( aType == ByProduct::getXMLNameStatic() ); } @@ -97,6 +99,9 @@ auto_ptr OutputFactory::create( const string& aType ) { if( aType == FractionalSecondaryOutput::getXMLNameStatic() ) { return auto_ptr( new FractionalSecondaryOutput ); } + if( aType == GoodValueOutput::getXMLNameStatic() ) { + return auto_ptr( new GoodValueOutput ); + } // Check for consistency. assert( !isOfType( aType ) ); diff --git a/cvs/objects/technologies/source/standard_capture_component.cpp b/cvs/objects/technologies/source/standard_capture_component.cpp index 007a5ed0fa..6d0c28f59f 100644 --- a/cvs/objects/technologies/source/standard_capture_component.cpp +++ b/cvs/objects/technologies/source/standard_capture_component.cpp @@ -61,7 +61,8 @@ mSequesteredAmount( scenario->getModeltime()->getmaxper() ), mRemoveFraction( 0 ), mStorageCost( 0 ), mIntensityPenalty( 0 ), -mNonEnergyCostPenalty( 0 ) +mNonEnergyCostPenalty( 0 ), +mApplyNegPenalty( false ) { } @@ -125,6 +126,9 @@ bool StandardCaptureComponent::XMLParse( const xercesc::DOMNode* node ){ else if( nodeName == "target-gas" ){ mTargetGas = XMLHelper::getValue( curr ); } + else if( nodeName == "apply-neg-penalty" ){ + mApplyNegPenalty = XMLHelper::getValue( curr ); + } else { ILogger& mainLog = ILogger::getLogger( "main_log" ); mainLog.setLevel( ILogger::ERROR ); @@ -167,6 +171,12 @@ void StandardCaptureComponent::completeInit( const string& aRegionName, aRegionName, mStorageMarket, aRegionName ); + if( mApplyNegPenalty ) { + scenario->getMarketplace()->getDependencyFinder()->addDependency( aSectorName, + aRegionName, + "CO2_negative_emiss", + aRegionName ); + } // Default the target gas to CO2. if( mTargetGas.empty() ){ @@ -198,6 +208,10 @@ double StandardCaptureComponent::getStorageCost( const string& aRegionName, return 0; } + double negEmissPenalty = mApplyNegPenalty ? scenario->getMarketplace()->getPrice( "CO2_negative_emiss", + aRegionName, + aPeriod ) : 0.0; + // Check if there is a market for storage. double storageMarketPrice = scenario->getMarketplace()->getPrice( mStorageMarket, aRegionName, @@ -211,9 +225,13 @@ double StandardCaptureComponent::getStorageCost( const string& aRegionName, // If there is no carbon market, return a large number to disable the // capture technology. if( carbonMarketPrice == Marketplace::NO_MARKET_PRICE || carbonMarketPrice == 0.0 ){ + const_cast(this)->mTargetGasValue = 0; return util::getLargeNumber(); + } else { + const_cast(this)->mTargetGasValue = carbonMarketPrice; } + double storageCost; if( storageMarketPrice == Marketplace::NO_MARKET_PRICE ){ // There is no carbon market. Use the read-in cost. @@ -223,7 +241,7 @@ double StandardCaptureComponent::getStorageCost( const string& aRegionName, // Use the market cost. storageCost = storageMarketPrice; } - return storageCost; + return storageCost + negEmissPenalty; } /** From 27f702090532f40c09980b48d366cd6058027196 Mon Sep 17 00:00:00 2001 From: Pralit Patel Date: Tue, 26 Sep 2017 12:55:17 -0400 Subject: [PATCH 06/22] Use the constraint value for solved TAX markets as the forcast demand which hopefully helps solve when policies switch from mostly non-binding to binding. --- .../marketplace/source/marketplace.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cvs/objects/marketplace/source/marketplace.cpp b/cvs/objects/marketplace/source/marketplace.cpp index 5635ca51f0..56e0f4c1ac 100644 --- a/cvs/objects/marketplace/source/marketplace.cpp +++ b/cvs/objects/marketplace/source/marketplace.cpp @@ -1199,13 +1199,18 @@ double Marketplace::forecastPrice( const std::vector& aMarketHistory, c */ double Marketplace::forecastDemand( const std::vector& aMarketHistory, const int aPeriod ) { - double forecastedDemand = extrapolate( aMarketHistory, aPeriod, &Market::getSolverDemand ); - // set some reasonable limits on what kinds of forecast you get - // this is going to use as a scale factor, so lose the sign - forecastedDemand = abs( forecastedDemand ); - if( forecastedDemand < 1.0 ) { - // don't scale up small values - forecastedDemand = 1.0; + double forecastedDemand = 0.0; + if( aMarketHistory[ aPeriod ]->getType() == IMarketType::TAX && aMarketHistory[ aPeriod ]->isSolvable() ) { + forecastedDemand = abs( aMarketHistory[ aPeriod ]->getSupply() ); + } else { + forecastedDemand = extrapolate( aMarketHistory, aPeriod, &Market::getSolverDemand ); + // set some reasonable limits on what kinds of forecast you get + // this is going to use as a scale factor, so lose the sign + forecastedDemand = abs( forecastedDemand ); + if( forecastedDemand < 1.0 ) { + // don't scale up small values + forecastedDemand = 1.0; + } } aMarketHistory[ aPeriod ]->setForecastDemand( forecastedDemand ); From 24dc9ff466313926b01f9d6b1327e241df7788bd Mon Sep 17 00:00:00 2001 From: D3X132 Date: Tue, 26 Sep 2017 14:35:23 -0400 Subject: [PATCH 07/22] Add constraints on oil in industrial feedstocks. --- cvs/objects/policy/source/policy_portfolio_standard.cpp | 2 +- .../energy-data/assumptions/A_energy_data.R | 2 +- .../energy-processing-code/level2/L270.limits.R | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cvs/objects/policy/source/policy_portfolio_standard.cpp b/cvs/objects/policy/source/policy_portfolio_standard.cpp index 84cf2d2ed5..ac9df9e11d 100644 --- a/cvs/objects/policy/source/policy_portfolio_standard.cpp +++ b/cvs/objects/policy/source/policy_portfolio_standard.cpp @@ -70,7 +70,7 @@ PolicyPortfolioStandard::PolicyPortfolioStandard(): mConstraint( scenario->getModeltime()->getmaxper(), -1.0 ), mFixedTax( scenario->getModeltime()->getmaxper(), -1 ), mShareOfSectorOutput( scenario->getModeltime()->getmaxper(), -1.0 ), - mMinPrice( scenario->getModeltime()->getmaxper(), 0.0 ) + mMinPrice( scenario->getModeltime()->getmaxper(), 0.0000001 ) { } diff --git a/input/gcam-data-system/energy-data/assumptions/A_energy_data.R b/input/gcam-data-system/energy-data/assumptions/A_energy_data.R index 76a857623d..6964def43a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A_energy_data.R +++ b/input/gcam-data-system/energy-data/assumptions/A_energy_data.R @@ -25,4 +25,4 @@ max_bioliquid_Pmult <- 0.80 #Fraction of liquids for feedstocks and oil electricity that must come from oil oilFract_Elec <- 1 -oilFract_Feedstocks <- 1 \ No newline at end of file +oilFract_Feedstocks <- 0.8 \ No newline at end of file diff --git a/input/gcam-data-system/energy-processing-code/level2/L270.limits.R b/input/gcam-data-system/energy-processing-code/level2/L270.limits.R index 50a1bd23ef..d78668943a 100644 --- a/input/gcam-data-system/energy-processing-code/level2/L270.limits.R +++ b/input/gcam-data-system/energy-processing-code/level2/L270.limits.R @@ -52,6 +52,14 @@ L270.CreditInput_elec$efficiency <- L270.globaltech_eff.melt$efficiency[ match( L270.CreditInput_elec$coefficient <- oilFract_Elec / L270.CreditInput_elec$efficiency L270.CreditInput_elec$efficiency <- NULL +printlog( "L270.CreditInput_feedstocks: minicam-energy-input of oil credits for feedstock techs" ) +L270.CreditInput_feedstocks <- data.frame(sector.name = "industrial feedstocks", + subsector.name = "refined liquids", + technology = "refined liquids") +L270.CreditInput_feedstocks <- repeat_and_add_vector(L270.CreditInput_feedstocks, "year", model_years) +L270.CreditInput_feedstocks$minicam.energy.input <- "oil-credits" +L270.CreditInput_feedstocks$coefficient <- oilFract_Feedstocks + printlog( "L270.CreditMkt: Market for oil credits" ) L270.CreditMkt <- GCAM_region_names[c("region")] L270.CreditMkt$policy.portfolio.standard <- "oil-credits" @@ -64,6 +72,7 @@ L270.CreditMkt$constraint <- 1 # 3. Write all csvs as tables, and paste csv filenames into a single batch XML file write_mi_data( L270.CreditOutput, "GlobalTechRESSecOut", "ENERGY_LEVEL2_DATA", "L270.CreditOutput", "ENERGY_XML_BATCH", "batch_liquids_limits.xml" ) write_mi_data( L270.CreditInput_elec, "GlobalTechCoef", "ENERGY_LEVEL2_DATA", "L270.CreditInput_elec", "ENERGY_XML_BATCH", "batch_liquids_limits.xml" ) +write_mi_data( L270.CreditInput_feedstocks, "GlobalTechCoef", "ENERGY_LEVEL2_DATA", "L270.CreditInput_feedstocks", "ENERGY_XML_BATCH", "batch_liquids_limits.xml" ) write_mi_data( L270.CreditMkt, "PortfolioStd", "ENERGY_LEVEL2_DATA", "L270.CreditMkt", "ENERGY_XML_BATCH", "batch_liquids_limits.xml" ) insert_file_into_batchxml( "ENERGY_XML_BATCH", "batch_liquids_limits.xml", "ENERGY_XML_FINAL", "liquids_limits.xml", "", xml_tag="outFile" ) From d1c3fdb403b952049a102c8ca9241a19582fca0d Mon Sep 17 00:00:00 2001 From: D3X132 Date: Wed, 27 Sep 2017 07:55:38 -0400 Subject: [PATCH 08/22] Switch logit to absolute for LDV_4W --- .../energy-data/assumptions/A54.sector.csv | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/input/gcam-data-system/energy-data/assumptions/A54.sector.csv b/input/gcam-data-system/energy-data/assumptions/A54.sector.csv index c25c6afc8d..722589d0aa 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.sector.csv @@ -1 +1,12 @@ -# Transportation sector default supplysector information (units and logit exponents),,,,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.factor,energy.final.demand,logit.type trn_aviation_intl,million pass-km,EJ,1990$/pass-km,-3,transportation,,trn_aviation_intl, trn_freight,million ton-km,EJ,1990$/ton-km,-2,transportation,road / rail / air / ship,trn_freight, trn_freight_road,million ton-km,EJ,1990$/ton-km,-1,transportation,truck size classes,trn_freight, trn_pass,million pass-km,EJ,1990$/pass-km,-2,transportation,ldv / bus,trn_pass, trn_pass_road,million pass-km,EJ,1990$/pass-km,-4,transportation,light bus / heavy bus,trn_pass, trn_pass_road_bus,million pass-km,EJ,1990$/pass-km,-4,transportation,2W / 3W / 4W,trn_pass, trn_pass_road_LDV,million pass-km,EJ,1990$/pass-km,-4,transportation,moped / motorcycle size classes,trn_pass, trn_pass_road_LDV_2W,million pass-km,EJ,1990$/pass-km,-6,transportation,car / light truck size classes,trn_pass, trn_pass_road_LDV_4W,million pass-km,EJ,1990$/pass-km,-6,transportation,rail / air / road / hsr,trn_pass, trn_shipping_intl,million ton-km,EJ,1990$/ton-km,-3,transportation,,trn_shipping_intl, \ No newline at end of file +# Transportation sector default supplysector information (units and logit exponents),,,,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.factor,energy.final.demand,logit.type +trn_aviation_intl,million pass-km,EJ,1990$/pass-km,-3,transportation,,trn_aviation_intl, +trn_freight,million ton-km,EJ,1990$/ton-km,-2,transportation,road / rail / air / ship,trn_freight, +trn_freight_road,million ton-km,EJ,1990$/ton-km,-1,transportation,truck size classes,trn_freight, +trn_pass,million pass-km,EJ,1990$/pass-km,-2,transportation,ldv / bus,trn_pass, +trn_pass_road,million pass-km,EJ,1990$/pass-km,-4,transportation,light bus / heavy bus,trn_pass, +trn_pass_road_bus,million pass-km,EJ,1990$/pass-km,-4,transportation,2W / 3W / 4W,trn_pass, +trn_pass_road_LDV,million pass-km,EJ,1990$/pass-km,-4,transportation,moped / motorcycle size classes,trn_pass, +trn_pass_road_LDV_2W,million pass-km,EJ,1990$/pass-km,-6,transportation,car / light truck size classes,trn_pass, +trn_pass_road_LDV_4W,million pass-km,EJ,1990$/pass-km,-6,transportation,rail / air / road / hsr,trn_pass,absolute-cost-logit +trn_shipping_intl,million ton-km,EJ,1990$/ton-km,-3,transportation,,trn_shipping_intl, \ No newline at end of file From 614e7a465725d2cdaeb2250fddd34820530452e3 Mon Sep 17 00:00:00 2001 From: D3X132 Date: Wed, 4 Oct 2017 18:21:44 -0400 Subject: [PATCH 09/22] Adjust input_tax for negative emissions constraints --- cvs/objects/functions/include/input_tax.h | 4 ++ cvs/objects/functions/source/input_tax.cpp | 49 +++++++++++++--------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/cvs/objects/functions/include/input_tax.h b/cvs/objects/functions/include/input_tax.h index 8d512d360d..1b25e3b7bc 100644 --- a/cvs/objects/functions/include/input_tax.h +++ b/cvs/objects/functions/include/input_tax.h @@ -168,6 +168,10 @@ class InputTax: public MiniCAMInput //! State value necessary to use Marketpalce::addToDemand double mLastCalcValue; + + //! Boolean indicating whether we should add to demand. + bool mAddToDemand; + private: const static std::string XML_REPORTING_NAME; //!< tag name for reporting xml db diff --git a/cvs/objects/functions/source/input_tax.cpp b/cvs/objects/functions/source/input_tax.cpp index 3957c1e1b3..4bc381c31b 100644 --- a/cvs/objects/functions/source/input_tax.cpp +++ b/cvs/objects/functions/source/input_tax.cpp @@ -95,7 +95,8 @@ const string& InputTax::getXMLReportingName() const{ //! Constructor InputTax::InputTax() : mPhysicalDemand( scenario->getModeltime()->getmaxper() ), - mAdjustedCoefficients( scenario->getModeltime()->getmaxper(), 1.0 ) + mAdjustedCoefficients( scenario->getModeltime()->getmaxper(), 1.0 ), + mAddToDemand(true) { } @@ -166,6 +167,9 @@ void InputTax::XMLParse( const xercesc::DOMNode* node ) { XMLHelper::safeTranscode( attrTemp->getNodeValue() ); } } + else if( nodeName == "add-to-demand" ){ + mAddToDemand = XMLHelper::getValue( curr ); + } else { ILogger& mainLog = ILogger::getLogger( "main_log" ); mainLog.setLevel( ILogger::WARNING ); @@ -255,25 +259,24 @@ void InputTax::setPhysicalDemand( double aPhysicalDemand, const string& aRegionName, const int aPeriod ) { - - Marketplace* marketplace = scenario->getMarketplace(); - IInfo* marketInfo = marketplace->getMarketInfo( mName, aRegionName, 0, true ); - - // If tax is shared based, then divide by sector output. - // Check if marketInfo exists and has the "isShareBased" boolean. - if( marketInfo && marketInfo->hasValue( "isShareBased" ) ){ - if( marketInfo->getBoolean( "isShareBased", true ) ){ - // Each share is additive - aPhysicalDemand/= marketplace->getDemand( mSectorName, aRegionName, aPeriod ); + if ( mAddToDemand ) { + Marketplace* marketplace = scenario->getMarketplace(); + IInfo* marketInfo = marketplace->getMarketInfo( mName, aRegionName, 0, true ); + + // If tax is shared based, then divide by sector output. + // Check if marketInfo exists and has the "isShareBased" boolean. + if( marketInfo && marketInfo->hasValue( "isShareBased" ) ){ + if( marketInfo->getBoolean( "isShareBased", true ) ){ + // Each share is additive + aPhysicalDemand/= marketplace->getDemand( mSectorName, aRegionName, aPeriod ); + } } - } - // mPhysicalDemand can be a share if tax is share based. - mPhysicalDemand[ aPeriod ].set( aPhysicalDemand ); - // Each technology share is additive. - mLastCalcValue = marketplace->addToDemand( mName, aRegionName, mPhysicalDemand[ aPeriod ], + // mPhysicalDemand can be a share if tax is share based. + mPhysicalDemand[ aPeriod ].set( aPhysicalDemand ); + // Each technology share is additive. + mLastCalcValue = marketplace->addToDemand( mName, aRegionName, mPhysicalDemand[ aPeriod ], mLastCalcValue, aPeriod, true ); - ILogger& mainLog = ILogger::getLogger( "main_log" ); - mainLog.setLevel( ILogger::NOTICE ); + } } double InputTax::getCoefficient( const int aPeriod ) const { @@ -293,7 +296,15 @@ double InputTax::getPrice( const string& aRegionName, const int aPeriod ) const { // A high tax decreases demand. - return scenario->getMarketplace()->getPrice( mName, aRegionName, aPeriod, true ); + double tax = scenario->getMarketplace()->getPrice( mName, aRegionName, aPeriod, true ) / 1000.0; + + // For negative emissions constraints, we want to multiply by carbon price + // so that the constraint price is in a reasonable range + if( !mAddToDemand ) { +// tax *= scenario->getMarketplace()->getPrice( "CO2", aRegionName, aPeriod, true ); + } + + return tax; } void InputTax::setPrice( const string& aRegionName, From 5a413cc8f30f42ff14108bbe29e998fa41b19f92 Mon Sep 17 00:00:00 2001 From: Robert Link Date: Thu, 5 Oct 2017 13:49:12 -0700 Subject: [PATCH 10/22] Fix line endings on all csv files in energy-data/assumptions. --- .../assumptions/A10.TechChange.csv | 8 +- .../assumptions/A10.TechChange_SSPs.csv | 23 +- .../energy-data/assumptions/A10.rsrc_info.csv | 16 +- .../assumptions/A10.subrsrc_info.csv | 13 +- .../assumptions/A11.fos_curves.csv | 367 +++++++++++- .../energy-data/assumptions/A12.U_curves.csv | 11 +- .../assumptions/A13.MSW_curves.csv | 17 +- .../assumptions/A14.wind_curves.csv | 30 +- .../assumptions/A15.roofPV_TechChange.csv | 4 +- .../assumptions/A15.roofPV_curves.csv | 32 +- .../assumptions/A16.EGS_curves.csv | 31 +- .../assumptions/A16.geo_curves.csv | 31 +- .../assumptions/A17.tradbio_curves.csv | 6 +- .../assumptions/A18.hydro_output.csv | 17 +- .../assumptions/A21.globaltech_coef.csv | 15 +- .../assumptions/A21.globaltech_cost.csv | 14 +- .../assumptions/A21.globaltech_keyword.csv | 8 +- .../assumptions/A21.globaltech_secout.csv | 5 +- .../assumptions/A21.globaltech_shrwt.csv | 14 +- .../energy-data/assumptions/A21.rsrc_info.csv | 4 +- .../energy-data/assumptions/A21.sector.csv | 12 +- .../assumptions/A21.subsector_interp.csv | 13 +- .../assumptions/A21.subsector_logit.csv | 13 +- .../assumptions/A21.subsector_shrwt.csv | 13 +- .../assumptions/A21.tradedtech_coef.csv | 4 +- .../assumptions/A21.tradedtech_cost.csv | 4 +- .../assumptions/A21.tradedtech_shrwt.csv | 4 +- .../assumptions/A21.unoil_demandshares.csv | 18 +- .../assumptions/A22.globaltech_co2capture.csv | 14 +- .../assumptions/A22.globaltech_coef.csv | 27 +- .../assumptions/A22.globaltech_cost.csv | 40 +- .../assumptions/A22.globaltech_interp.csv | 8 +- .../assumptions/A22.globaltech_retirement.csv | 31 +- .../assumptions/A22.globaltech_shrwt.csv | 42 +- .../energy-data/assumptions/A22.sector.csv | 7 +- .../assumptions/A22.subsector_interp.csv | 22 +- .../assumptions/A22.subsector_logit.csv | 12 +- .../assumptions/A22.subsector_shrwt.csv | 26 +- .../assumptions/A23.chp_elecratio.csv | 8 +- .../assumptions/A23.globalinttech.csv | 14 +- .../assumptions/A23.globaltech_OMfixed.csv | 54 +- .../assumptions/A23.globaltech_OMvar.csv | 42 +- .../assumptions/A23.globaltech_capital.csv | 54 +- .../A23.globaltech_capital_adv.csv | 56 +- .../A23.globaltech_capital_low.csv | 56 +- .../assumptions/A23.globaltech_co2capture.csv | 16 +- .../assumptions/A23.globaltech_eff.csv | 60 +- .../assumptions/A23.globaltech_interp.csv | 6 +- .../assumptions/A23.globaltech_keyword.csv | 54 +- .../assumptions/A23.globaltech_retirement.csv | 70 +-- .../energy-data/assumptions/A23.sector.csv | 6 +- .../assumptions/A23.subsector_interp.csv | 28 +- .../assumptions/A23.subsector_interp_R.csv | 70 +-- .../assumptions/A23.subsector_logit.csv | 13 +- .../assumptions/A23.subsector_shrwt.csv | 24 +- .../assumptions/A23.subsector_shrwt_nuc_R.csv | 120 ++-- .../A23.subsector_shrwt_renew_R.csv | 114 ++-- .../assumptions/A24.globaltech_coef.csv | 7 +- .../assumptions/A24.globaltech_cost.csv | 7 +- .../assumptions/A24.globaltech_shrwt.csv | 7 +- .../energy-data/assumptions/A24.sector.csv | 4 +- .../assumptions/A24.subsector_interp.csv | 7 +- .../assumptions/A24.subsector_logit.csv | 7 +- .../assumptions/A24.subsector_shrwt.csv | 7 +- .../assumptions/A25.globaltech_co2capture.csv | 6 +- .../assumptions/A25.globaltech_cost.csv | 18 +- .../assumptions/A25.globaltech_eff.csv | 18 +- .../assumptions/A25.globaltech_keyword.csv | 12 +- .../assumptions/A25.globaltech_shrwt.csv | 18 +- .../energy-data/assumptions/A25.sector.csv | 7 +- .../assumptions/A25.subsector_logit.csv | 15 +- .../assumptions/A25.subsector_shrwt.csv | 27 +- .../assumptions/A26.globaltech_cost.csv | 16 +- .../assumptions/A26.globaltech_eff.csv | 16 +- .../assumptions/A26.globaltech_shrwt.csv | 16 +- .../energy-data/assumptions/A26.sector.csv | 28 +- .../assumptions/A26.subsector_interp.csv | 14 +- .../assumptions/A26.subsector_logit.csv | 16 +- .../assumptions/A26.subsector_shrwt.csv | 16 +- .../energy-data/assumptions/A32.demand.csv | 4 +- .../assumptions/A32.fuelprefElasticity.csv | 6 +- .../assumptions/A32.globaltech_coef.csv | 5 +- .../assumptions/A32.globaltech_cost.csv | 19 +- .../assumptions/A32.globaltech_eff.csv | 18 +- .../assumptions/A32.globaltech_interp.csv | 11 +- .../assumptions/A32.globaltech_shrwt.csv | 19 +- .../assumptions/A32.nonenergy_Cseq.csv | 6 +- .../energy-data/assumptions/A32.sector.csv | 6 +- .../assumptions/A32.subsector_interp.csv | 13 +- .../assumptions/A32.subsector_logit.csv | 14 +- .../assumptions/A32.subsector_shrwt.csv | 15 +- .../energy-data/assumptions/A321.demand.csv | 4 +- .../A321.globaltech_co2capture.csv | 4 +- .../assumptions/A321.globaltech_coef.csv | 13 +- .../assumptions/A321.globaltech_cost.csv | 9 +- .../assumptions/A321.globaltech_shrwt.csv | 9 +- .../energy-data/assumptions/A321.sector.csv | 5 +- .../assumptions/A321.subsector_interp.csv | 8 +- .../assumptions/A321.subsector_logit.csv | 8 +- .../assumptions/A321.subsector_shrwt.csv | 8 +- .../A322.globaltech_co2capture.csv | 5 +- .../assumptions/A322.globaltech_coef.csv | 9 +- .../assumptions/A322.globaltech_renew.csv | 4 +- .../A322.globaltech_retirement.csv | 22 +- .../assumptions/A322.globaltech_shrwt.csv | 10 +- .../energy-data/assumptions/A322.sector.csv | 5 +- .../assumptions/A322.subsector_interp.csv | 8 +- .../assumptions/A322.subsector_logit.csv | 8 +- .../assumptions/A322.subsector_shrwt.csv | 9 +- .../energy-data/assumptions/A42.demand.csv | 4 +- .../assumptions/A42.fuelprefElasticity.csv | 8 +- .../assumptions/A42.globaltech_cost.csv | 10 +- .../assumptions/A42.globaltech_eff.csv | 10 +- .../assumptions/A42.globaltech_interp.csv | 4 +- .../assumptions/A42.globaltech_shrwt.csv | 10 +- .../energy-data/assumptions/A42.sector.csv | 4 +- .../assumptions/A42.subsector_interp.csv | 10 +- .../assumptions/A42.subsector_logit.csv | 10 +- .../assumptions/A42.subsector_shrwt.csv | 10 +- .../assumptions/A44.HouseholdSize.csv | 4 +- .../assumptions/A44.USA_TechChange.csv | 35 +- .../assumptions/A44.cost_efficiency.csv | 33 +- .../assumptions/A44.demandFn_flsp.csv | 5 +- .../assumptions/A44.demandFn_serv.csv | 5 +- .../assumptions/A44.demand_satiation_mult.csv | 9 +- .../A44.demand_satiation_mult_SSPs.csv | 13 +- .../assumptions/A44.flsp_bm2_state_comm.csv | 58 +- .../assumptions/A44.flsp_bm2_state_res.csv | 58 +- .../assumptions/A44.fuelprefElasticity.csv | 33 +- .../assumptions/A44.gcam_consumer.csv | 5 +- .../assumptions/A44.globaltech_shrwt.csv | 33 +- .../assumptions/A44.internal_gains.csv | 16 +- .../assumptions/A44.pcflsp_default.csv | 33 +- .../assumptions/A44.satiation_flsp.csv | 8 +- .../assumptions/A44.satiation_flsp_SSPs.csv | 28 +- .../energy-data/assumptions/A44.sector.csv | 9 +- .../assumptions/A44.share_serv_fuel.csv | 549 +++++++++++++++++- .../assumptions/A44.shell_eff_mult_RG3.csv | 17 +- .../assumptions/A44.subsector_interp.csv | 33 +- .../assumptions/A44.subsector_logit.csv | 33 +- .../assumptions/A44.subsector_shrwt.csv | 33 +- .../assumptions/A44.tech_eff_mult_RG3.csv | 17 +- .../energy-data/assumptions/A52.demand.csv | 4 +- .../assumptions/A52.globaltech_cost.csv | 8 +- .../assumptions/A52.globaltech_eff.csv | 8 +- .../assumptions/A52.globaltech_shrwt.csv | 8 +- .../energy-data/assumptions/A52.sector.csv | 4 +- .../assumptions/A52.subsector_interp.csv | 8 +- .../assumptions/A52.subsector_logit.csv | 8 +- .../assumptions/A52.subsector_shrwt.csv | 9 +- .../energy-data/assumptions/A54.demand.csv | 7 +- .../assumptions/A54.globaltech_nonmotor.csv | 5 +- .../assumptions/A54.globaltech_passthru.csv | 9 +- .../assumptions/A54.globaltranTech_interp.csv | 240 ++++---- .../assumptions/A54.globaltranTech_retire.csv | 185 +++++- .../assumptions/A54.globaltranTech_shrwt.csv | 129 +++- .../energy-data/assumptions/A54.incelas_R.csv | 19 +- .../energy-data/assumptions/A54.sector.csv | 22 +- .../assumptions/A54.tranSubsector_VOTT.csv | 33 +- .../assumptions/A54.tranSubsector_interp.csv | 60 +- .../assumptions/A54.tranSubsector_logit.csv | 118 ++-- .../assumptions/A54.tranSubsector_shrwt.csv | 62 +- .../assumptions/A61.Cstorage_curves.csv | 9 +- .../assumptions/A61.globaltech_coef.csv | 5 +- .../assumptions/A61.globaltech_cost.csv | 5 +- .../assumptions/A61.globaltech_shrwt.csv | 5 +- .../energy-data/assumptions/A61.rsrc_info.csv | 5 +- .../energy-data/assumptions/A61.sector.csv | 4 +- .../assumptions/A61.subsector_logit.csv | 5 +- .../assumptions/A61.subsector_shrwt.csv | 5 +- .../energy-data/assumptions/A_regions.csv | 35 +- .../assumptions/A_regions_14reg.csv | 17 +- .../assumptions/A_regions_32reg.csv | 35 +- 173 files changed, 3752 insertions(+), 885 deletions(-) diff --git a/input/gcam-data-system/energy-data/assumptions/A10.TechChange.csv b/input/gcam-data-system/energy-data/assumptions/A10.TechChange.csv index 5064b8f621..e9687b82df 100644 --- a/input/gcam-data-system/energy-data/assumptions/A10.TechChange.csv +++ b/input/gcam-data-system/energy-data/assumptions/A10.TechChange.csv @@ -1 +1,7 @@ -# This table has techChange only for resources whose techchange not specified elsewhere,,, resource,subresource,1975,2005 coal,coal,0.005,0.0075 crude oil,crude oil,0.005,0.0075 natural gas,natural gas,0.005,0.0075 unconventional oil,unconventional oil,0,0 biomass,generic waste biomass,0,0 \ No newline at end of file +# This table has techChange only for resources whose techchange not specified elsewhere,,, +resource,subresource,1975,2005 +coal,coal,0.005,0.0075 +crude oil,crude oil,0.005,0.0075 +natural gas,natural gas,0.005,0.0075 +unconventional oil,unconventional oil,0,0 +biomass,generic waste biomass,0,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A10.TechChange_SSPs.csv b/input/gcam-data-system/energy-data/assumptions/A10.TechChange_SSPs.csv index c5dbcf7550..b5de7a4bfc 100644 --- a/input/gcam-data-system/energy-data/assumptions/A10.TechChange_SSPs.csv +++ b/input/gcam-data-system/energy-data/assumptions/A10.TechChange_SSPs.csv @@ -1 +1,22 @@ -# This table has techChange only for fossil resources as specified in the SSPs,,,,,,,,,,,,,,,,,,,, SSP,resource,subresource,2015,2020,2025,2030,2035,2040,2045,2050,2055,2060,2065,2070,2075,2080,2085,2090,2095,2100 SSP1,coal,coal,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 SSP1,crude oil,crude oil,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 SSP1,natural gas,natural gas,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 SSP1,unconventional oil,unconventional oil,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 SSP2,coal,coal,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 SSP2,crude oil,crude oil,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 SSP2,natural gas,natural gas,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 SSP2,unconventional oil,unconventional oil,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 SSP3,coal,coal,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 SSP3,crude oil,crude oil,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 SSP3,natural gas,natural gas,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 SSP3,unconventional oil,unconventional oil,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 SSP4,coal,coal,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025 SSP4,crude oil,crude oil,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025 SSP4,natural gas,natural gas,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025 SSP4,unconventional oil,unconventional oil,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025 SSP5,coal,coal,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 SSP5,crude oil,crude oil,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 SSP5,natural gas,natural gas,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 SSP5,unconventional oil,unconventional oil,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 \ No newline at end of file +# This table has techChange only for fossil resources as specified in the SSPs,,,,,,,,,,,,,,,,,,,, +SSP,resource,subresource,2015,2020,2025,2030,2035,2040,2045,2050,2055,2060,2065,2070,2075,2080,2085,2090,2095,2100 +SSP1,coal,coal,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +SSP1,crude oil,crude oil,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +SSP1,natural gas,natural gas,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +SSP1,unconventional oil,unconventional oil,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +SSP2,coal,coal,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 +SSP2,crude oil,crude oil,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 +SSP2,natural gas,natural gas,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 +SSP2,unconventional oil,unconventional oil,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 +SSP3,coal,coal,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 +SSP3,crude oil,crude oil,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 +SSP3,natural gas,natural gas,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 +SSP3,unconventional oil,unconventional oil,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075,0.0075 +SSP4,coal,coal,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025 +SSP4,crude oil,crude oil,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025 +SSP4,natural gas,natural gas,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025 +SSP4,unconventional oil,unconventional oil,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025,0.0025 +SSP5,coal,coal,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 +SSP5,crude oil,crude oil,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 +SSP5,natural gas,natural gas,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 +SSP5,unconventional oil,unconventional oil,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02,0.02 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A10.rsrc_info.csv b/input/gcam-data-system/energy-data/assumptions/A10.rsrc_info.csv index ba8bb773e2..a0df6c6034 100644 --- a/input/gcam-data-system/energy-data/assumptions/A10.rsrc_info.csv +++ b/input/gcam-data-system/energy-data/assumptions/A10.rsrc_info.csv @@ -1 +1,15 @@ -# Information about resources in each region,,,,,,,,,, # Prices from GCAM 3.1 model input. 2010 estimated.,,,,,,,,,, resource,resource_type,market,output-unit,price-unit,capacity.factor,1971,1975,1990,2005,2010 coal,depresource,global,EJ,1975$/GJ,,0.4,0.4,0.435,0.438,0.5 crude oil,depresource,global,EJ,1975$/GJ,,1.84,1.84,1.37,1.639,3.278 natural gas,depresource,global,EJ,1975$/GJ,,0.65,0.65,0.812,0.98,1.5 unconventional oil,depresource,regional,EJ,1975$/GJ,,1.81,1.81,1.81,1.81,1.81 uranium,depresource,global,Mt,1975$/kg,,20,20,25,35,35 biomass,renewresource,global,EJ,1975$/GJ,,1,1,1,1.25,1.25 distributed_solar,renewresource,regional,EJ,1975$/GJ,,6,6,6,6,6 geothermal,renewresource,regional,EJ,1975$/GJ,,0.1,0.1,0.1,0.1,0.1 onshore wind resource,renewresource,regional,EJ,1975$/GJ,,0.05,0.05,0.05,0.05,0.05 traditional biomass,renewresource,regional,EJ,1975$/GJ,,0.25,0.25,0.25,0.25,0.25 global solar resource,unlimited-resource,global,EJ,1975$/GJ,0.3,0.001,0.001,0.001,0.001,0.001 limestone,unlimited-resource,global,Mt,1975$/kg,0,0.001,0.001,0.001,0.001,0.001 \ No newline at end of file +# Information about resources in each region,,,,,,,,,, +# Prices from GCAM 3.1 model input. 2010 estimated.,,,,,,,,,, +resource,resource_type,market,output-unit,price-unit,capacity.factor,1971,1975,1990,2005,2010 +coal,depresource,global,EJ,1975$/GJ,,0.4,0.4,0.435,0.438,0.5 +crude oil,depresource,global,EJ,1975$/GJ,,1.84,1.84,1.37,1.639,3.278 +natural gas,depresource,global,EJ,1975$/GJ,,0.65,0.65,0.812,0.98,1.5 +unconventional oil,depresource,regional,EJ,1975$/GJ,,1.81,1.81,1.81,1.81,1.81 +uranium,depresource,global,Mt,1975$/kg,,20,20,25,35,35 +biomass,renewresource,global,EJ,1975$/GJ,,1,1,1,1.25,1.25 +distributed_solar,renewresource,regional,EJ,1975$/GJ,,6,6,6,6,6 +geothermal,renewresource,regional,EJ,1975$/GJ,,0.1,0.1,0.1,0.1,0.1 +onshore wind resource,renewresource,regional,EJ,1975$/GJ,,0.05,0.05,0.05,0.05,0.05 +traditional biomass,renewresource,regional,EJ,1975$/GJ,,0.25,0.25,0.25,0.25,0.25 +global solar resource,unlimited-resource,global,EJ,1975$/GJ,0.3,0.001,0.001,0.001,0.001,0.001 +limestone,unlimited-resource,global,Mt,1975$/kg,0,0.001,0.001,0.001,0.001,0.001 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A10.subrsrc_info.csv b/input/gcam-data-system/energy-data/assumptions/A10.subrsrc_info.csv index 51d8ec04b8..57b261eb45 100644 --- a/input/gcam-data-system/energy-data/assumptions/A10.subrsrc_info.csv +++ b/input/gcam-data-system/energy-data/assumptions/A10.subrsrc_info.csv @@ -1 +1,12 @@ -# Information about resources in each region,,, resource,resource_type,subresource,subresource_type coal,depresource,coal,subresource crude oil,depresource,crude oil,subresource natural gas,depresource,natural gas,subresource unconventional oil,depresource,unconventional oil,subresource uranium,depresource,uranium,subresource biomass,renewresource,generic waste biomass,smooth-renewable-subresource distributed_solar,renewresource,distributed_solar,smooth-renewable-subresource geothermal,renewresource,hydrothermal,sub-renewable-resource onshore wind resource,renewresource,onshore wind resource,smooth-renewable-subresource traditional biomass,renewresource,traditional biomass,sub-renewable-resource \ No newline at end of file +# Information about resources in each region,,, +resource,resource_type,subresource,subresource_type +coal,depresource,coal,subresource +crude oil,depresource,crude oil,subresource +natural gas,depresource,natural gas,subresource +unconventional oil,depresource,unconventional oil,subresource +uranium,depresource,uranium,subresource +biomass,renewresource,generic waste biomass,smooth-renewable-subresource +distributed_solar,renewresource,distributed_solar,smooth-renewable-subresource +geothermal,renewresource,hydrothermal,sub-renewable-resource +onshore wind resource,renewresource,onshore wind resource,smooth-renewable-subresource +traditional biomass,renewresource,traditional biomass,sub-renewable-resource \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A11.fos_curves.csv b/input/gcam-data-system/energy-data/assumptions/A11.fos_curves.csv index 636c4e1f9a..ed3b9772cd 100644 --- a/input/gcam-data-system/energy-data/assumptions/A11.fos_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A11.fos_curves.csv @@ -1 +1,366 @@ -# GCAM 3.0 fossil resource supply curves,,,,, region_GCAM3,resource,subresource,grade,available,extractioncost Africa,coal,coal,grade 1,56,0.34 Africa,coal,coal,grade 2,1059,0.37 Africa,coal,coal,grade 3,723,1.2 Africa,coal,coal,grade 4,1026,1.7 Africa,coal,coal,grade 5,1406,2 Africa,coal,coal,grade 6,1406,2.3 Africa,coal,coal,grade 7,0,2.6 Australia_NZ,coal,coal,grade 1,57,0.34 Australia_NZ,coal,coal,grade 2,1186,0.37 Australia_NZ,coal,coal,grade 3,1753,1.2 Australia_NZ,coal,coal,grade 4,2491,1.7 Australia_NZ,coal,coal,grade 5,3414,2 Australia_NZ,coal,coal,grade 6,3414,2.3 Australia_NZ,coal,coal,grade 7,0,2.6 Canada,coal,coal,grade 1,20,0.34 Canada,coal,coal,grade 2,293,0.37 Canada,coal,coal,grade 3,293,1.2 Canada,coal,coal,grade 4,415,1.7 Canada,coal,coal,grade 5,569,2 Canada,coal,coal,grade 6,569,2.3 Canada,coal,coal,grade 7,0,2.6 China,coal,coal,grade 1,295,0.34 China,coal,coal,grade 2,7032,0.37 China,coal,coal,grade 3,4820,1.2 China,coal,coal,grade 4,6849,1.7 China,coal,coal,grade 5,9387,2 China,coal,coal,grade 6,9387,2.3 China,coal,coal,grade 7,0,2.6 Eastern Europe,coal,coal,grade 1,86,0.34 Eastern Europe,coal,coal,grade 2,390,0.37 Eastern Europe,coal,coal,grade 3,689,1.2 Eastern Europe,coal,coal,grade 4,979,1.7 Eastern Europe,coal,coal,grade 5,1341,2 Eastern Europe,coal,coal,grade 6,1341,2.3 Eastern Europe,coal,coal,grade 7,0,2.6 Former Soviet Union,coal,coal,grade 1,158,0.34 Former Soviet Union,coal,coal,grade 2,8728,0.37 Former Soviet Union,coal,coal,grade 3,15404,1.2 Former Soviet Union,coal,coal,grade 4,21890,1.7 Former Soviet Union,coal,coal,grade 5,29997,2 Former Soviet Union,coal,coal,grade 6,29997,2.3 Former Soviet Union,coal,coal,grade 7,0,2.6 India,coal,coal,grade 1,55,0.34 India,coal,coal,grade 2,1018,0.37 India,coal,coal,grade 3,434,1.2 India,coal,coal,grade 4,616,1.7 India,coal,coal,grade 5,845,2 India,coal,coal,grade 6,845,2.3 India,coal,coal,grade 7,0,2.6 Japan,coal,coal,grade 1,2,0.34 Japan,coal,coal,grade 2,336,0.37 Japan,coal,coal,grade 3,496,1.2 Japan,coal,coal,grade 4,704,1.7 Japan,coal,coal,grade 5,965,2 Japan,coal,coal,grade 6,965,2.3 Japan,coal,coal,grade 7,0,2.6 Korea,coal,coal,grade 1,4,0.34 Korea,coal,coal,grade 2,17,0.37 Korea,coal,coal,grade 3,0,1.2 Korea,coal,coal,grade 4,0,1.7 Korea,coal,coal,grade 5,0,2 Korea,coal,coal,grade 6,0,2.3 Korea,coal,coal,grade 7,0,2.6 Latin America,coal,coal,grade 1,11,0.34 Latin America,coal,coal,grade 2,116,0.37 Latin America,coal,coal,grade 3,144,1.2 Latin America,coal,coal,grade 4,205,1.7 Latin America,coal,coal,grade 5,280,2 Latin America,coal,coal,grade 6,280,2.3 Latin America,coal,coal,grade 7,0,2.6 Middle East,coal,coal,grade 1,0,0.34 Middle East,coal,coal,grade 2,2,0.37 Middle East,coal,coal,grade 3,2,1.2 Middle East,coal,coal,grade 4,3,1.7 Middle East,coal,coal,grade 5,4,2 Middle East,coal,coal,grade 6,4,2.3 Middle East,coal,coal,grade 7,0,2.6 Southeast Asia,coal,coal,grade 1,6,0.34 Southeast Asia,coal,coal,grade 2,1018,0.37 Southeast Asia,coal,coal,grade 3,434,1.2 Southeast Asia,coal,coal,grade 4,616,1.7 Southeast Asia,coal,coal,grade 5,845,2 Southeast Asia,coal,coal,grade 6,845,2.3 Southeast Asia,coal,coal,grade 7,0,2.6 USA,coal,coal,grade 1,284,0.34 USA,coal,coal,grade 2,6851,0.37 USA,coal,coal,grade 3,9469,1.2 USA,coal,coal,grade 4,13456,1.7 USA,coal,coal,grade 5,18440,2 USA,coal,coal,grade 6,18440,2.3 USA,coal,coal,grade 7,0,2.6 Western Europe,coal,coal,grade 1,117,0.34 Western Europe,coal,coal,grade 2,2633,0.37 Western Europe,coal,coal,grade 3,2632,1.2 Western Europe,coal,coal,grade 4,3740,1.7 Western Europe,coal,coal,grade 5,5125,2 Western Europe,coal,coal,grade 6,5125,2.3 Western Europe,coal,coal,grade 7,0,2.6 Africa,crude oil,crude oil,grade 1,188,0.5 Africa,crude oil,crude oil,grade 2,200,0.55 Africa,crude oil,crude oil,grade 3,343,0.92 Africa,crude oil,crude oil,grade 4,394,1.3 Africa,crude oil,crude oil,grade 5,393,2.1 Africa,crude oil,crude oil,grade 6,1298,2.7 Africa,crude oil,crude oil,grade 7,0,3.5 Australia_NZ,crude oil,crude oil,grade 1,18,0.5 Australia_NZ,crude oil,crude oil,grade 2,5,0.55 Australia_NZ,crude oil,crude oil,grade 3,15,0.92 Australia_NZ,crude oil,crude oil,grade 4,16,1.3 Australia_NZ,crude oil,crude oil,grade 5,9,2.1 Australia_NZ,crude oil,crude oil,grade 6,12,2.7 Australia_NZ,crude oil,crude oil,grade 7,0,3.5 Canada,crude oil,crude oil,grade 1,55,0.5 Canada,crude oil,crude oil,grade 2,115,0.55 Canada,crude oil,crude oil,grade 3,226.5,0.92 Canada,crude oil,crude oil,grade 4,235.5,1.3 Canada,crude oil,crude oil,grade 5,216,2.1 Canada,crude oil,crude oil,grade 6,314,2.7 Canada,crude oil,crude oil,grade 7,0,3.5 China,crude oil,crude oil,grade 1,83,0.5 China,crude oil,crude oil,grade 2,102,0.55 China,crude oil,crude oil,grade 3,139.5,0.92 China,crude oil,crude oil,grade 4,178.5,1.3 China,crude oil,crude oil,grade 5,136,2.1 China,crude oil,crude oil,grade 6,187,2.7 China,crude oil,crude oil,grade 7,0,3.5 Eastern Europe,crude oil,crude oil,grade 1,8,0.5 Eastern Europe,crude oil,crude oil,grade 2,7,0.55 Eastern Europe,crude oil,crude oil,grade 3,17,0.92 Eastern Europe,crude oil,crude oil,grade 4,16,1.3 Eastern Europe,crude oil,crude oil,grade 5,13,2.1 Eastern Europe,crude oil,crude oil,grade 6,12,2.7 Eastern Europe,crude oil,crude oil,grade 7,0,3.5 Former Soviet Union,crude oil,crude oil,grade 1,303,0.5 Former Soviet Union,crude oil,crude oil,grade 2,355,0.55 Former Soviet Union,crude oil,crude oil,grade 3,720.5,0.92 Former Soviet Union,crude oil,crude oil,grade 4,702.5,1.3 Former Soviet Union,crude oil,crude oil,grade 5,572,2.1 Former Soviet Union,crude oil,crude oil,grade 6,556,2.7 Former Soviet Union,crude oil,crude oil,grade 7,0,3.5 India,crude oil,crude oil,grade 1,21,0.5 India,crude oil,crude oil,grade 2,48,0.55 India,crude oil,crude oil,grade 3,120.5,0.92 India,crude oil,crude oil,grade 4,73.5,1.3 India,crude oil,crude oil,grade 5,63,2.1 India,crude oil,crude oil,grade 6,314,2.7 India,crude oil,crude oil,grade 7,0,3.5 Japan,crude oil,crude oil,grade 1,0.2,0.5 Japan,crude oil,crude oil,grade 2,0.2,0.55 Japan,crude oil,crude oil,grade 3,0.2,0.92 Japan,crude oil,crude oil,grade 4,0.2,1.3 Japan,crude oil,crude oil,grade 5,0.2,2.1 Japan,crude oil,crude oil,grade 6,0.2,2.7 Japan,crude oil,crude oil,grade 7,0.2,3.5 Korea,crude oil,crude oil,grade 1,0.1,0.5 Korea,crude oil,crude oil,grade 2,0.1,0.55 Korea,crude oil,crude oil,grade 3,0.1,0.92 Korea,crude oil,crude oil,grade 4,0.1,1.3 Korea,crude oil,crude oil,grade 5,0.1,2.1 Korea,crude oil,crude oil,grade 6,0.1,2.7 Korea,crude oil,crude oil,grade 7,0.1,3.5 Latin America,crude oil,crude oil,grade 1,222,0.5 Latin America,crude oil,crude oil,grade 2,281,0.55 Latin America,crude oil,crude oil,grade 3,230,0.92 Latin America,crude oil,crude oil,grade 4,459,1.3 Latin America,crude oil,crude oil,grade 5,346,2.1 Latin America,crude oil,crude oil,grade 6,475,2.7 Latin America,crude oil,crude oil,grade 7,0,3.5 Middle East,crude oil,crude oil,grade 1,601,0.5 Middle East,crude oil,crude oil,grade 2,557,0.55 Middle East,crude oil,crude oil,grade 3,785.5,0.92 Middle East,crude oil,crude oil,grade 4,752.5,1.3 Middle East,crude oil,crude oil,grade 5,1380,2.1 Middle East,crude oil,crude oil,grade 6,1820,2.7 Middle East,crude oil,crude oil,grade 7,0,3.5 Southeast Asia,crude oil,crude oil,grade 1,73,0.5 Southeast Asia,crude oil,crude oil,grade 2,48,0.55 Southeast Asia,crude oil,crude oil,grade 3,146.5,0.92 Southeast Asia,crude oil,crude oil,grade 4,99.5,1.3 Southeast Asia,crude oil,crude oil,grade 5,63,2.1 Southeast Asia,crude oil,crude oil,grade 6,314,2.7 Southeast Asia,crude oil,crude oil,grade 7,0,3.5 USA,crude oil,crude oil,grade 1,297,0.5 USA,crude oil,crude oil,grade 2,262,0.55 USA,crude oil,crude oil,grade 3,504.5,0.92 USA,crude oil,crude oil,grade 4,374.5,1.3 USA,crude oil,crude oil,grade 5,236,2.1 USA,crude oil,crude oil,grade 6,343,2.7 USA,crude oil,crude oil,grade 7,0,3.5 Western Europe,crude oil,crude oil,grade 1,80,0.5 Western Europe,crude oil,crude oil,grade 2,90,0.55 Western Europe,crude oil,crude oil,grade 3,125,0.92 Western Europe,crude oil,crude oil,grade 4,129,1.3 Western Europe,crude oil,crude oil,grade 5,92,2.1 Western Europe,crude oil,crude oil,grade 6,134,2.7 Western Europe,crude oil,crude oil,grade 7,0,3.5 Africa,natural gas,natural gas,grade 1,30,0.62 Africa,natural gas,natural gas,grade 2,194,0.68 Africa,natural gas,natural gas,grade 3,335,1.1 Africa,natural gas,natural gas,grade 4,739,1.7 Africa,natural gas,natural gas,grade 5,716,3.1 Africa,natural gas,natural gas,grade 6,1339,3.7 Africa,natural gas,natural gas,grade 7,4286,6.5 Africa,natural gas,natural gas,grade 8,0,6.6 Australia_NZ,natural gas,natural gas,grade 1,10,0.62 Australia_NZ,natural gas,natural gas,grade 2,67,0.68 Australia_NZ,natural gas,natural gas,grade 3,46,1.1 Australia_NZ,natural gas,natural gas,grade 4,99,1.7 Australia_NZ,natural gas,natural gas,grade 5,478,3.1 Australia_NZ,natural gas,natural gas,grade 6,893,3.7 Australia_NZ,natural gas,natural gas,grade 7,11508,6.5 Australia_NZ,natural gas,natural gas,grade 8,0,6.6 Canada,natural gas,natural gas,grade 1,44,0.62 Canada,natural gas,natural gas,grade 2,279,0.68 Canada,natural gas,natural gas,grade 3,119,1.1 Canada,natural gas,natural gas,grade 4,279,1.7 Canada,natural gas,natural gas,grade 5,478,3.1 Canada,natural gas,natural gas,grade 6,893,3.7 Canada,natural gas,natural gas,grade 7,20005,6.5 Canada,natural gas,natural gas,grade 8,0,6.6 China,natural gas,natural gas,grade 1,6,0.62 China,natural gas,natural gas,grade 2,40,0.68 China,natural gas,natural gas,grade 3,171,1.1 China,natural gas,natural gas,grade 4,379,1.7 China,natural gas,natural gas,grade 5,239,3.1 China,natural gas,natural gas,grade 6,446,3.7 China,natural gas,natural gas,grade 7,3386,6.5 China,natural gas,natural gas,grade 8,0,6.6 Eastern Europe,natural gas,natural gas,grade 1,16,0.62 Eastern Europe,natural gas,natural gas,grade 2,101,0.68 Eastern Europe,natural gas,natural gas,grade 3,25,1.1 Eastern Europe,natural gas,natural gas,grade 4,24,1.7 Eastern Europe,natural gas,natural gas,grade 5,48,3.1 Eastern Europe,natural gas,natural gas,grade 6,89,3.7 Eastern Europe,natural gas,natural gas,grade 7,11,6.5 Eastern Europe,natural gas,natural gas,grade 8,0,6.6 Former Soviet Union,natural gas,natural gas,grade 1,325,0.62 Former Soviet Union,natural gas,natural gas,grade 2,2074,0.68 Former Soviet Union,natural gas,natural gas,grade 3,1409,1.1 Former Soviet Union,natural gas,natural gas,grade 4,1389,1.7 Former Soviet Union,natural gas,natural gas,grade 5,478,3.1 Former Soviet Union,natural gas,natural gas,grade 6,893,3.7 Former Soviet Union,natural gas,natural gas,grade 7,47088,6.5 Former Soviet Union,natural gas,natural gas,grade 8,0,6.6 India,natural gas,natural gas,grade 1,5,0.62 India,natural gas,natural gas,grade 2,32,0.68 India,natural gas,natural gas,grade 3,301,1.1 India,natural gas,natural gas,grade 4,339,1.7 India,natural gas,natural gas,grade 5,382,3.1 India,natural gas,natural gas,grade 6,714,3.7 India,natural gas,natural gas,grade 7,4263,6.5 India,natural gas,natural gas,grade 8,0,6.6 Japan,natural gas,natural gas,grade 1,1,0.62 Japan,natural gas,natural gas,grade 2,6,0.68 Japan,natural gas,natural gas,grade 3,23,1.1 Japan,natural gas,natural gas,grade 4,51,1.7 Japan,natural gas,natural gas,grade 5,239,3.1 Japan,natural gas,natural gas,grade 6,446,3.7 Japan,natural gas,natural gas,grade 7,5534,6.5 Japan,natural gas,natural gas,grade 8,0,6.6 Korea,natural gas,natural gas,grade 1,5,0.62 Korea,natural gas,natural gas,grade 2,0,0.68 Korea,natural gas,natural gas,grade 3,0,1.1 Korea,natural gas,natural gas,grade 4,0,1.7 Korea,natural gas,natural gas,grade 5,191,3.1 Korea,natural gas,natural gas,grade 6,357,3.7 Korea,natural gas,natural gas,grade 7,1448,6.5 Korea,natural gas,natural gas,grade 8,0,6.6 Latin America,natural gas,natural gas,grade 1,37,0.62 Latin America,natural gas,natural gas,grade 2,236,0.68 Latin America,natural gas,natural gas,grade 3,372,1.1 Latin America,natural gas,natural gas,grade 4,783,1.7 Latin America,natural gas,natural gas,grade 5,716,3.1 Latin America,natural gas,natural gas,grade 6,1339,3.7 Latin America,natural gas,natural gas,grade 7,51149,6.5 Latin America,natural gas,natural gas,grade 8,0,6.6 Middle East,natural gas,natural gas,grade 1,41,0.62 Middle East,natural gas,natural gas,grade 2,810,0.68 Middle East,natural gas,natural gas,grade 3,735,1.1 Middle East,natural gas,natural gas,grade 4,2252,1.7 Middle East,natural gas,natural gas,grade 5,239,3.1 Middle East,natural gas,natural gas,grade 6,446,3.7 Middle East,natural gas,natural gas,grade 7,2272,6.5 Middle East,natural gas,natural gas,grade 8,0,6.6 Southeast Asia,natural gas,natural gas,grade 1,45,0.62 Southeast Asia,natural gas,natural gas,grade 2,287,0.68 Southeast Asia,natural gas,natural gas,grade 3,301,1.1 Southeast Asia,natural gas,natural gas,grade 4,339,1.7 Southeast Asia,natural gas,natural gas,grade 5,478,3.1 Southeast Asia,natural gas,natural gas,grade 6,893,3.7 Southeast Asia,natural gas,natural gas,grade 7,2148,6.5 Southeast Asia,natural gas,natural gas,grade 8,0,6.6 USA,natural gas,natural gas,grade 1,207,0.62 USA,natural gas,natural gas,grade 2,778,0.68 USA,natural gas,natural gas,grade 3,575,1.1 USA,natural gas,natural gas,grade 4,1431,1.7 USA,natural gas,natural gas,grade 5,716,3.1 USA,natural gas,natural gas,grade 6,1339,3.7 USA,natural gas,natural gas,grade 7,48254,6.5 USA,natural gas,natural gas,grade 8,0,6.6 Western Europe,natural gas,natural gas,grade 1,78,0.62 Western Europe,natural gas,natural gas,grade 2,496,0.68 Western Europe,natural gas,natural gas,grade 3,278,1.1 Western Europe,natural gas,natural gas,grade 4,647,1.7 Western Europe,natural gas,natural gas,grade 5,382,3.1 Western Europe,natural gas,natural gas,grade 6,714,3.7 Western Europe,natural gas,natural gas,grade 7,8560,6.5 Western Europe,natural gas,natural gas,grade 8,0,6.6 Africa,unconventional oil,unconventional oil,grade 1,503,1.8 Africa,unconventional oil,unconventional oil,grade 2,983,2.1 Africa,unconventional oil,unconventional oil,grade 3,267.48,3.6 Africa,unconventional oil,unconventional oil,grade 4,0,4.7 Australia_NZ,unconventional oil,unconventional oil,grade 1,1320,1.8 Australia_NZ,unconventional oil,unconventional oil,grade 2,2578,2.1 Australia_NZ,unconventional oil,unconventional oil,grade 3,701.64,3.6 Australia_NZ,unconventional oil,unconventional oil,grade 4,0,4.7 Canada,unconventional oil,unconventional oil,grade 1,803,1.8 Canada,unconventional oil,unconventional oil,grade 2,1570,2.1 Canada,unconventional oil,unconventional oil,grade 3,427.14,3.6 Canada,unconventional oil,unconventional oil,grade 4,0,4.7 China,unconventional oil,unconventional oil,grade 1,2012,1.8 China,unconventional oil,unconventional oil,grade 2,3933,2.1 China,unconventional oil,unconventional oil,grade 3,1070.1,3.6 China,unconventional oil,unconventional oil,grade 4,0,4.7 Eastern Europe,unconventional oil,unconventional oil,grade 1,151,1.8 Eastern Europe,unconventional oil,unconventional oil,grade 2,295,2.1 Eastern Europe,unconventional oil,unconventional oil,grade 3,80.28,3.6 Eastern Europe,unconventional oil,unconventional oil,grade 4,0,4.7 Former Soviet Union,unconventional oil,unconventional oil,grade 1,3874,1.8 Former Soviet Union,unconventional oil,unconventional oil,grade 2,7575,2.1 Former Soviet Union,unconventional oil,unconventional oil,grade 3,2060.82,3.6 Former Soviet Union,unconventional oil,unconventional oil,grade 4,0,4.7 India,unconventional oil,unconventional oil,grade 1,1509,1.8 India,unconventional oil,unconventional oil,grade 2,2950,2.1 India,unconventional oil,unconventional oil,grade 3,802.62,3.6 India,unconventional oil,unconventional oil,grade 4,0,4.7 Japan,unconventional oil,unconventional oil,grade 1,146,1.8 Japan,unconventional oil,unconventional oil,grade 2,287,2.1 Japan,unconventional oil,unconventional oil,grade 3,77.94,3.6 Japan,unconventional oil,unconventional oil,grade 4,0,4.7 Korea,unconventional oil,unconventional oil,grade 1,0,1.8 Korea,unconventional oil,unconventional oil,grade 2,0,2.1 Korea,unconventional oil,unconventional oil,grade 3,0,3.6 Korea,unconventional oil,unconventional oil,grade 4,0,4.7 Latin America,unconventional oil,unconventional oil,grade 1,3004,1.8 Latin America,unconventional oil,unconventional oil,grade 2,5873,2.1 Latin America,unconventional oil,unconventional oil,grade 3,1597.86,3.6 Latin America,unconventional oil,unconventional oil,grade 4,0,4.7 Middle East,unconventional oil,unconventional oil,grade 1,6009,1.8 Middle East,unconventional oil,unconventional oil,grade 2,11745,2.1 Middle East,unconventional oil,unconventional oil,grade 3,3195.72,3.6 Middle East,unconventional oil,unconventional oil,grade 4,0,4.7 Southeast Asia,unconventional oil,unconventional oil,grade 1,1509,1.8 Southeast Asia,unconventional oil,unconventional oil,grade 2,2950,2.1 Southeast Asia,unconventional oil,unconventional oil,grade 3,802.62,3.6 Southeast Asia,unconventional oil,unconventional oil,grade 4,0,4.7 USA,unconventional oil,unconventional oil,grade 1,4397,1.8 USA,unconventional oil,unconventional oil,grade 2,8594,2.1 USA,unconventional oil,unconventional oil,grade 3,2338.38,3.6 USA,unconventional oil,unconventional oil,grade 4,0,4.7 Western Europe,unconventional oil,unconventional oil,grade 1,1204,1.8 Western Europe,unconventional oil,unconventional oil,grade 2,2355,2.1 Western Europe,unconventional oil,unconventional oil,grade 3,640.62,3.6 Western Europe,unconventional oil,unconventional oil,grade 4,0,4.7 \ No newline at end of file +# GCAM 3.0 fossil resource supply curves,,,,, +region_GCAM3,resource,subresource,grade,available,extractioncost +Africa,coal,coal,grade 1,56,0.34 +Africa,coal,coal,grade 2,1059,0.37 +Africa,coal,coal,grade 3,723,1.2 +Africa,coal,coal,grade 4,1026,1.7 +Africa,coal,coal,grade 5,1406,2 +Africa,coal,coal,grade 6,1406,2.3 +Africa,coal,coal,grade 7,0,2.6 +Australia_NZ,coal,coal,grade 1,57,0.34 +Australia_NZ,coal,coal,grade 2,1186,0.37 +Australia_NZ,coal,coal,grade 3,1753,1.2 +Australia_NZ,coal,coal,grade 4,2491,1.7 +Australia_NZ,coal,coal,grade 5,3414,2 +Australia_NZ,coal,coal,grade 6,3414,2.3 +Australia_NZ,coal,coal,grade 7,0,2.6 +Canada,coal,coal,grade 1,20,0.34 +Canada,coal,coal,grade 2,293,0.37 +Canada,coal,coal,grade 3,293,1.2 +Canada,coal,coal,grade 4,415,1.7 +Canada,coal,coal,grade 5,569,2 +Canada,coal,coal,grade 6,569,2.3 +Canada,coal,coal,grade 7,0,2.6 +China,coal,coal,grade 1,295,0.34 +China,coal,coal,grade 2,7032,0.37 +China,coal,coal,grade 3,4820,1.2 +China,coal,coal,grade 4,6849,1.7 +China,coal,coal,grade 5,9387,2 +China,coal,coal,grade 6,9387,2.3 +China,coal,coal,grade 7,0,2.6 +Eastern Europe,coal,coal,grade 1,86,0.34 +Eastern Europe,coal,coal,grade 2,390,0.37 +Eastern Europe,coal,coal,grade 3,689,1.2 +Eastern Europe,coal,coal,grade 4,979,1.7 +Eastern Europe,coal,coal,grade 5,1341,2 +Eastern Europe,coal,coal,grade 6,1341,2.3 +Eastern Europe,coal,coal,grade 7,0,2.6 +Former Soviet Union,coal,coal,grade 1,158,0.34 +Former Soviet Union,coal,coal,grade 2,8728,0.37 +Former Soviet Union,coal,coal,grade 3,15404,1.2 +Former Soviet Union,coal,coal,grade 4,21890,1.7 +Former Soviet Union,coal,coal,grade 5,29997,2 +Former Soviet Union,coal,coal,grade 6,29997,2.3 +Former Soviet Union,coal,coal,grade 7,0,2.6 +India,coal,coal,grade 1,55,0.34 +India,coal,coal,grade 2,1018,0.37 +India,coal,coal,grade 3,434,1.2 +India,coal,coal,grade 4,616,1.7 +India,coal,coal,grade 5,845,2 +India,coal,coal,grade 6,845,2.3 +India,coal,coal,grade 7,0,2.6 +Japan,coal,coal,grade 1,2,0.34 +Japan,coal,coal,grade 2,336,0.37 +Japan,coal,coal,grade 3,496,1.2 +Japan,coal,coal,grade 4,704,1.7 +Japan,coal,coal,grade 5,965,2 +Japan,coal,coal,grade 6,965,2.3 +Japan,coal,coal,grade 7,0,2.6 +Korea,coal,coal,grade 1,4,0.34 +Korea,coal,coal,grade 2,17,0.37 +Korea,coal,coal,grade 3,0,1.2 +Korea,coal,coal,grade 4,0,1.7 +Korea,coal,coal,grade 5,0,2 +Korea,coal,coal,grade 6,0,2.3 +Korea,coal,coal,grade 7,0,2.6 +Latin America,coal,coal,grade 1,11,0.34 +Latin America,coal,coal,grade 2,116,0.37 +Latin America,coal,coal,grade 3,144,1.2 +Latin America,coal,coal,grade 4,205,1.7 +Latin America,coal,coal,grade 5,280,2 +Latin America,coal,coal,grade 6,280,2.3 +Latin America,coal,coal,grade 7,0,2.6 +Middle East,coal,coal,grade 1,0,0.34 +Middle East,coal,coal,grade 2,2,0.37 +Middle East,coal,coal,grade 3,2,1.2 +Middle East,coal,coal,grade 4,3,1.7 +Middle East,coal,coal,grade 5,4,2 +Middle East,coal,coal,grade 6,4,2.3 +Middle East,coal,coal,grade 7,0,2.6 +Southeast Asia,coal,coal,grade 1,6,0.34 +Southeast Asia,coal,coal,grade 2,1018,0.37 +Southeast Asia,coal,coal,grade 3,434,1.2 +Southeast Asia,coal,coal,grade 4,616,1.7 +Southeast Asia,coal,coal,grade 5,845,2 +Southeast Asia,coal,coal,grade 6,845,2.3 +Southeast Asia,coal,coal,grade 7,0,2.6 +USA,coal,coal,grade 1,284,0.34 +USA,coal,coal,grade 2,6851,0.37 +USA,coal,coal,grade 3,9469,1.2 +USA,coal,coal,grade 4,13456,1.7 +USA,coal,coal,grade 5,18440,2 +USA,coal,coal,grade 6,18440,2.3 +USA,coal,coal,grade 7,0,2.6 +Western Europe,coal,coal,grade 1,117,0.34 +Western Europe,coal,coal,grade 2,2633,0.37 +Western Europe,coal,coal,grade 3,2632,1.2 +Western Europe,coal,coal,grade 4,3740,1.7 +Western Europe,coal,coal,grade 5,5125,2 +Western Europe,coal,coal,grade 6,5125,2.3 +Western Europe,coal,coal,grade 7,0,2.6 +Africa,crude oil,crude oil,grade 1,188,0.5 +Africa,crude oil,crude oil,grade 2,200,0.55 +Africa,crude oil,crude oil,grade 3,343,0.92 +Africa,crude oil,crude oil,grade 4,394,1.3 +Africa,crude oil,crude oil,grade 5,393,2.1 +Africa,crude oil,crude oil,grade 6,1298,2.7 +Africa,crude oil,crude oil,grade 7,0,3.5 +Australia_NZ,crude oil,crude oil,grade 1,18,0.5 +Australia_NZ,crude oil,crude oil,grade 2,5,0.55 +Australia_NZ,crude oil,crude oil,grade 3,15,0.92 +Australia_NZ,crude oil,crude oil,grade 4,16,1.3 +Australia_NZ,crude oil,crude oil,grade 5,9,2.1 +Australia_NZ,crude oil,crude oil,grade 6,12,2.7 +Australia_NZ,crude oil,crude oil,grade 7,0,3.5 +Canada,crude oil,crude oil,grade 1,55,0.5 +Canada,crude oil,crude oil,grade 2,115,0.55 +Canada,crude oil,crude oil,grade 3,226.5,0.92 +Canada,crude oil,crude oil,grade 4,235.5,1.3 +Canada,crude oil,crude oil,grade 5,216,2.1 +Canada,crude oil,crude oil,grade 6,314,2.7 +Canada,crude oil,crude oil,grade 7,0,3.5 +China,crude oil,crude oil,grade 1,83,0.5 +China,crude oil,crude oil,grade 2,102,0.55 +China,crude oil,crude oil,grade 3,139.5,0.92 +China,crude oil,crude oil,grade 4,178.5,1.3 +China,crude oil,crude oil,grade 5,136,2.1 +China,crude oil,crude oil,grade 6,187,2.7 +China,crude oil,crude oil,grade 7,0,3.5 +Eastern Europe,crude oil,crude oil,grade 1,8,0.5 +Eastern Europe,crude oil,crude oil,grade 2,7,0.55 +Eastern Europe,crude oil,crude oil,grade 3,17,0.92 +Eastern Europe,crude oil,crude oil,grade 4,16,1.3 +Eastern Europe,crude oil,crude oil,grade 5,13,2.1 +Eastern Europe,crude oil,crude oil,grade 6,12,2.7 +Eastern Europe,crude oil,crude oil,grade 7,0,3.5 +Former Soviet Union,crude oil,crude oil,grade 1,303,0.5 +Former Soviet Union,crude oil,crude oil,grade 2,355,0.55 +Former Soviet Union,crude oil,crude oil,grade 3,720.5,0.92 +Former Soviet Union,crude oil,crude oil,grade 4,702.5,1.3 +Former Soviet Union,crude oil,crude oil,grade 5,572,2.1 +Former Soviet Union,crude oil,crude oil,grade 6,556,2.7 +Former Soviet Union,crude oil,crude oil,grade 7,0,3.5 +India,crude oil,crude oil,grade 1,21,0.5 +India,crude oil,crude oil,grade 2,48,0.55 +India,crude oil,crude oil,grade 3,120.5,0.92 +India,crude oil,crude oil,grade 4,73.5,1.3 +India,crude oil,crude oil,grade 5,63,2.1 +India,crude oil,crude oil,grade 6,314,2.7 +India,crude oil,crude oil,grade 7,0,3.5 +Japan,crude oil,crude oil,grade 1,0.2,0.5 +Japan,crude oil,crude oil,grade 2,0.2,0.55 +Japan,crude oil,crude oil,grade 3,0.2,0.92 +Japan,crude oil,crude oil,grade 4,0.2,1.3 +Japan,crude oil,crude oil,grade 5,0.2,2.1 +Japan,crude oil,crude oil,grade 6,0.2,2.7 +Japan,crude oil,crude oil,grade 7,0.2,3.5 +Korea,crude oil,crude oil,grade 1,0.1,0.5 +Korea,crude oil,crude oil,grade 2,0.1,0.55 +Korea,crude oil,crude oil,grade 3,0.1,0.92 +Korea,crude oil,crude oil,grade 4,0.1,1.3 +Korea,crude oil,crude oil,grade 5,0.1,2.1 +Korea,crude oil,crude oil,grade 6,0.1,2.7 +Korea,crude oil,crude oil,grade 7,0.1,3.5 +Latin America,crude oil,crude oil,grade 1,222,0.5 +Latin America,crude oil,crude oil,grade 2,281,0.55 +Latin America,crude oil,crude oil,grade 3,230,0.92 +Latin America,crude oil,crude oil,grade 4,459,1.3 +Latin America,crude oil,crude oil,grade 5,346,2.1 +Latin America,crude oil,crude oil,grade 6,475,2.7 +Latin America,crude oil,crude oil,grade 7,0,3.5 +Middle East,crude oil,crude oil,grade 1,601,0.5 +Middle East,crude oil,crude oil,grade 2,557,0.55 +Middle East,crude oil,crude oil,grade 3,785.5,0.92 +Middle East,crude oil,crude oil,grade 4,752.5,1.3 +Middle East,crude oil,crude oil,grade 5,1380,2.1 +Middle East,crude oil,crude oil,grade 6,1820,2.7 +Middle East,crude oil,crude oil,grade 7,0,3.5 +Southeast Asia,crude oil,crude oil,grade 1,73,0.5 +Southeast Asia,crude oil,crude oil,grade 2,48,0.55 +Southeast Asia,crude oil,crude oil,grade 3,146.5,0.92 +Southeast Asia,crude oil,crude oil,grade 4,99.5,1.3 +Southeast Asia,crude oil,crude oil,grade 5,63,2.1 +Southeast Asia,crude oil,crude oil,grade 6,314,2.7 +Southeast Asia,crude oil,crude oil,grade 7,0,3.5 +USA,crude oil,crude oil,grade 1,297,0.5 +USA,crude oil,crude oil,grade 2,262,0.55 +USA,crude oil,crude oil,grade 3,504.5,0.92 +USA,crude oil,crude oil,grade 4,374.5,1.3 +USA,crude oil,crude oil,grade 5,236,2.1 +USA,crude oil,crude oil,grade 6,343,2.7 +USA,crude oil,crude oil,grade 7,0,3.5 +Western Europe,crude oil,crude oil,grade 1,80,0.5 +Western Europe,crude oil,crude oil,grade 2,90,0.55 +Western Europe,crude oil,crude oil,grade 3,125,0.92 +Western Europe,crude oil,crude oil,grade 4,129,1.3 +Western Europe,crude oil,crude oil,grade 5,92,2.1 +Western Europe,crude oil,crude oil,grade 6,134,2.7 +Western Europe,crude oil,crude oil,grade 7,0,3.5 +Africa,natural gas,natural gas,grade 1,30,0.62 +Africa,natural gas,natural gas,grade 2,194,0.68 +Africa,natural gas,natural gas,grade 3,335,1.1 +Africa,natural gas,natural gas,grade 4,739,1.7 +Africa,natural gas,natural gas,grade 5,716,3.1 +Africa,natural gas,natural gas,grade 6,1339,3.7 +Africa,natural gas,natural gas,grade 7,4286,6.5 +Africa,natural gas,natural gas,grade 8,0,6.6 +Australia_NZ,natural gas,natural gas,grade 1,10,0.62 +Australia_NZ,natural gas,natural gas,grade 2,67,0.68 +Australia_NZ,natural gas,natural gas,grade 3,46,1.1 +Australia_NZ,natural gas,natural gas,grade 4,99,1.7 +Australia_NZ,natural gas,natural gas,grade 5,478,3.1 +Australia_NZ,natural gas,natural gas,grade 6,893,3.7 +Australia_NZ,natural gas,natural gas,grade 7,11508,6.5 +Australia_NZ,natural gas,natural gas,grade 8,0,6.6 +Canada,natural gas,natural gas,grade 1,44,0.62 +Canada,natural gas,natural gas,grade 2,279,0.68 +Canada,natural gas,natural gas,grade 3,119,1.1 +Canada,natural gas,natural gas,grade 4,279,1.7 +Canada,natural gas,natural gas,grade 5,478,3.1 +Canada,natural gas,natural gas,grade 6,893,3.7 +Canada,natural gas,natural gas,grade 7,20005,6.5 +Canada,natural gas,natural gas,grade 8,0,6.6 +China,natural gas,natural gas,grade 1,6,0.62 +China,natural gas,natural gas,grade 2,40,0.68 +China,natural gas,natural gas,grade 3,171,1.1 +China,natural gas,natural gas,grade 4,379,1.7 +China,natural gas,natural gas,grade 5,239,3.1 +China,natural gas,natural gas,grade 6,446,3.7 +China,natural gas,natural gas,grade 7,3386,6.5 +China,natural gas,natural gas,grade 8,0,6.6 +Eastern Europe,natural gas,natural gas,grade 1,16,0.62 +Eastern Europe,natural gas,natural gas,grade 2,101,0.68 +Eastern Europe,natural gas,natural gas,grade 3,25,1.1 +Eastern Europe,natural gas,natural gas,grade 4,24,1.7 +Eastern Europe,natural gas,natural gas,grade 5,48,3.1 +Eastern Europe,natural gas,natural gas,grade 6,89,3.7 +Eastern Europe,natural gas,natural gas,grade 7,11,6.5 +Eastern Europe,natural gas,natural gas,grade 8,0,6.6 +Former Soviet Union,natural gas,natural gas,grade 1,325,0.62 +Former Soviet Union,natural gas,natural gas,grade 2,2074,0.68 +Former Soviet Union,natural gas,natural gas,grade 3,1409,1.1 +Former Soviet Union,natural gas,natural gas,grade 4,1389,1.7 +Former Soviet Union,natural gas,natural gas,grade 5,478,3.1 +Former Soviet Union,natural gas,natural gas,grade 6,893,3.7 +Former Soviet Union,natural gas,natural gas,grade 7,47088,6.5 +Former Soviet Union,natural gas,natural gas,grade 8,0,6.6 +India,natural gas,natural gas,grade 1,5,0.62 +India,natural gas,natural gas,grade 2,32,0.68 +India,natural gas,natural gas,grade 3,301,1.1 +India,natural gas,natural gas,grade 4,339,1.7 +India,natural gas,natural gas,grade 5,382,3.1 +India,natural gas,natural gas,grade 6,714,3.7 +India,natural gas,natural gas,grade 7,4263,6.5 +India,natural gas,natural gas,grade 8,0,6.6 +Japan,natural gas,natural gas,grade 1,1,0.62 +Japan,natural gas,natural gas,grade 2,6,0.68 +Japan,natural gas,natural gas,grade 3,23,1.1 +Japan,natural gas,natural gas,grade 4,51,1.7 +Japan,natural gas,natural gas,grade 5,239,3.1 +Japan,natural gas,natural gas,grade 6,446,3.7 +Japan,natural gas,natural gas,grade 7,5534,6.5 +Japan,natural gas,natural gas,grade 8,0,6.6 +Korea,natural gas,natural gas,grade 1,5,0.62 +Korea,natural gas,natural gas,grade 2,0,0.68 +Korea,natural gas,natural gas,grade 3,0,1.1 +Korea,natural gas,natural gas,grade 4,0,1.7 +Korea,natural gas,natural gas,grade 5,191,3.1 +Korea,natural gas,natural gas,grade 6,357,3.7 +Korea,natural gas,natural gas,grade 7,1448,6.5 +Korea,natural gas,natural gas,grade 8,0,6.6 +Latin America,natural gas,natural gas,grade 1,37,0.62 +Latin America,natural gas,natural gas,grade 2,236,0.68 +Latin America,natural gas,natural gas,grade 3,372,1.1 +Latin America,natural gas,natural gas,grade 4,783,1.7 +Latin America,natural gas,natural gas,grade 5,716,3.1 +Latin America,natural gas,natural gas,grade 6,1339,3.7 +Latin America,natural gas,natural gas,grade 7,51149,6.5 +Latin America,natural gas,natural gas,grade 8,0,6.6 +Middle East,natural gas,natural gas,grade 1,41,0.62 +Middle East,natural gas,natural gas,grade 2,810,0.68 +Middle East,natural gas,natural gas,grade 3,735,1.1 +Middle East,natural gas,natural gas,grade 4,2252,1.7 +Middle East,natural gas,natural gas,grade 5,239,3.1 +Middle East,natural gas,natural gas,grade 6,446,3.7 +Middle East,natural gas,natural gas,grade 7,2272,6.5 +Middle East,natural gas,natural gas,grade 8,0,6.6 +Southeast Asia,natural gas,natural gas,grade 1,45,0.62 +Southeast Asia,natural gas,natural gas,grade 2,287,0.68 +Southeast Asia,natural gas,natural gas,grade 3,301,1.1 +Southeast Asia,natural gas,natural gas,grade 4,339,1.7 +Southeast Asia,natural gas,natural gas,grade 5,478,3.1 +Southeast Asia,natural gas,natural gas,grade 6,893,3.7 +Southeast Asia,natural gas,natural gas,grade 7,2148,6.5 +Southeast Asia,natural gas,natural gas,grade 8,0,6.6 +USA,natural gas,natural gas,grade 1,207,0.62 +USA,natural gas,natural gas,grade 2,778,0.68 +USA,natural gas,natural gas,grade 3,575,1.1 +USA,natural gas,natural gas,grade 4,1431,1.7 +USA,natural gas,natural gas,grade 5,716,3.1 +USA,natural gas,natural gas,grade 6,1339,3.7 +USA,natural gas,natural gas,grade 7,48254,6.5 +USA,natural gas,natural gas,grade 8,0,6.6 +Western Europe,natural gas,natural gas,grade 1,78,0.62 +Western Europe,natural gas,natural gas,grade 2,496,0.68 +Western Europe,natural gas,natural gas,grade 3,278,1.1 +Western Europe,natural gas,natural gas,grade 4,647,1.7 +Western Europe,natural gas,natural gas,grade 5,382,3.1 +Western Europe,natural gas,natural gas,grade 6,714,3.7 +Western Europe,natural gas,natural gas,grade 7,8560,6.5 +Western Europe,natural gas,natural gas,grade 8,0,6.6 +Africa,unconventional oil,unconventional oil,grade 1,503,1.8 +Africa,unconventional oil,unconventional oil,grade 2,983,2.1 +Africa,unconventional oil,unconventional oil,grade 3,267.48,3.6 +Africa,unconventional oil,unconventional oil,grade 4,0,4.7 +Australia_NZ,unconventional oil,unconventional oil,grade 1,1320,1.8 +Australia_NZ,unconventional oil,unconventional oil,grade 2,2578,2.1 +Australia_NZ,unconventional oil,unconventional oil,grade 3,701.64,3.6 +Australia_NZ,unconventional oil,unconventional oil,grade 4,0,4.7 +Canada,unconventional oil,unconventional oil,grade 1,803,1.8 +Canada,unconventional oil,unconventional oil,grade 2,1570,2.1 +Canada,unconventional oil,unconventional oil,grade 3,427.14,3.6 +Canada,unconventional oil,unconventional oil,grade 4,0,4.7 +China,unconventional oil,unconventional oil,grade 1,2012,1.8 +China,unconventional oil,unconventional oil,grade 2,3933,2.1 +China,unconventional oil,unconventional oil,grade 3,1070.1,3.6 +China,unconventional oil,unconventional oil,grade 4,0,4.7 +Eastern Europe,unconventional oil,unconventional oil,grade 1,151,1.8 +Eastern Europe,unconventional oil,unconventional oil,grade 2,295,2.1 +Eastern Europe,unconventional oil,unconventional oil,grade 3,80.28,3.6 +Eastern Europe,unconventional oil,unconventional oil,grade 4,0,4.7 +Former Soviet Union,unconventional oil,unconventional oil,grade 1,3874,1.8 +Former Soviet Union,unconventional oil,unconventional oil,grade 2,7575,2.1 +Former Soviet Union,unconventional oil,unconventional oil,grade 3,2060.82,3.6 +Former Soviet Union,unconventional oil,unconventional oil,grade 4,0,4.7 +India,unconventional oil,unconventional oil,grade 1,1509,1.8 +India,unconventional oil,unconventional oil,grade 2,2950,2.1 +India,unconventional oil,unconventional oil,grade 3,802.62,3.6 +India,unconventional oil,unconventional oil,grade 4,0,4.7 +Japan,unconventional oil,unconventional oil,grade 1,146,1.8 +Japan,unconventional oil,unconventional oil,grade 2,287,2.1 +Japan,unconventional oil,unconventional oil,grade 3,77.94,3.6 +Japan,unconventional oil,unconventional oil,grade 4,0,4.7 +Korea,unconventional oil,unconventional oil,grade 1,0,1.8 +Korea,unconventional oil,unconventional oil,grade 2,0,2.1 +Korea,unconventional oil,unconventional oil,grade 3,0,3.6 +Korea,unconventional oil,unconventional oil,grade 4,0,4.7 +Latin America,unconventional oil,unconventional oil,grade 1,3004,1.8 +Latin America,unconventional oil,unconventional oil,grade 2,5873,2.1 +Latin America,unconventional oil,unconventional oil,grade 3,1597.86,3.6 +Latin America,unconventional oil,unconventional oil,grade 4,0,4.7 +Middle East,unconventional oil,unconventional oil,grade 1,6009,1.8 +Middle East,unconventional oil,unconventional oil,grade 2,11745,2.1 +Middle East,unconventional oil,unconventional oil,grade 3,3195.72,3.6 +Middle East,unconventional oil,unconventional oil,grade 4,0,4.7 +Southeast Asia,unconventional oil,unconventional oil,grade 1,1509,1.8 +Southeast Asia,unconventional oil,unconventional oil,grade 2,2950,2.1 +Southeast Asia,unconventional oil,unconventional oil,grade 3,802.62,3.6 +Southeast Asia,unconventional oil,unconventional oil,grade 4,0,4.7 +USA,unconventional oil,unconventional oil,grade 1,4397,1.8 +USA,unconventional oil,unconventional oil,grade 2,8594,2.1 +USA,unconventional oil,unconventional oil,grade 3,2338.38,3.6 +USA,unconventional oil,unconventional oil,grade 4,0,4.7 +Western Europe,unconventional oil,unconventional oil,grade 1,1204,1.8 +Western Europe,unconventional oil,unconventional oil,grade 2,2355,2.1 +Western Europe,unconventional oil,unconventional oil,grade 3,640.62,3.6 +Western Europe,unconventional oil,unconventional oil,grade 4,0,4.7 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A12.U_curves.csv b/input/gcam-data-system/energy-data/assumptions/A12.U_curves.csv index 213aafc26d..237ce0aaee 100644 --- a/input/gcam-data-system/energy-data/assumptions/A12.U_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A12.U_curves.csv @@ -1 +1,10 @@ -# GCAM 3.0 uranium supply curve,,,,, region_GCAM3,resource,subresource,grade,available,extractioncost USA,uranium,uranium,grade 0,3,15 USA,uranium,uranium,grade 1,6,50 USA,uranium,uranium,grade 2,10,100 USA,uranium,uranium,grade 3,16,150 USA,uranium,uranium,grade 4,20,200 USA,uranium,uranium,grade 5,25,250 USA,uranium,uranium,grade 6,4000,300 USA,uranium,uranium,grade 7,0,28800 \ No newline at end of file +# GCAM 3.0 uranium supply curve,,,,, +region_GCAM3,resource,subresource,grade,available,extractioncost +USA,uranium,uranium,grade 0,3,15 +USA,uranium,uranium,grade 1,6,50 +USA,uranium,uranium,grade 2,10,100 +USA,uranium,uranium,grade 3,16,150 +USA,uranium,uranium,grade 4,20,200 +USA,uranium,uranium,grade 5,25,250 +USA,uranium,uranium,grade 6,4000,300 +USA,uranium,uranium,grade 7,0,28800 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A13.MSW_curves.csv b/input/gcam-data-system/energy-data/assumptions/A13.MSW_curves.csv index 74caa27b47..1c3b5beed6 100644 --- a/input/gcam-data-system/energy-data/assumptions/A13.MSW_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A13.MSW_curves.csv @@ -1 +1,16 @@ -# GCAM 3.0 MSW curves,,,,,, region_GCAM3,resource,subresource,maxSubResource,mid-price,curve-exponent,gdpSupplyElast Africa,biomass,generic waste biomass,0.12288,0.9,15,0.588 Australia_NZ,biomass,generic waste biomass,0.0248025,0.9,15,0.588 Canada,biomass,generic waste biomass,0.01827,0.9,15,0.588 China,biomass,generic waste biomass,0.1015725,0.9,15,0.588 Eastern Europe,biomass,generic waste biomass,0.06504,0.9,15,0.588 Former Soviet Union,biomass,generic waste biomass,0.2273775,0.9,15,0.588 India,biomass,generic waste biomass,0.0393225,0.9,15,0.588 Japan,biomass,generic waste biomass,0.078375,0.9,15,0.588 Korea,biomass,generic waste biomass,0.015165,0.9,15,0.588 Latin America,biomass,generic waste biomass,0.149925,0.9,15,0.588 Middle East,biomass,generic waste biomass,0.0529425,0.9,15,0.588 Southeast Asia,biomass,generic waste biomass,0.0783825,0.9,15,0.588 USA,biomass,generic waste biomass,0.367965,0.9,15,0.588 Western Europe,biomass,generic waste biomass,0.25902,0.9,15,0.588 \ No newline at end of file +# GCAM 3.0 MSW curves,,,,,, +region_GCAM3,resource,subresource,maxSubResource,mid-price,curve-exponent,gdpSupplyElast +Africa,biomass,generic waste biomass,0.12288,0.9,15,0.588 +Australia_NZ,biomass,generic waste biomass,0.0248025,0.9,15,0.588 +Canada,biomass,generic waste biomass,0.01827,0.9,15,0.588 +China,biomass,generic waste biomass,0.1015725,0.9,15,0.588 +Eastern Europe,biomass,generic waste biomass,0.06504,0.9,15,0.588 +Former Soviet Union,biomass,generic waste biomass,0.2273775,0.9,15,0.588 +India,biomass,generic waste biomass,0.0393225,0.9,15,0.588 +Japan,biomass,generic waste biomass,0.078375,0.9,15,0.588 +Korea,biomass,generic waste biomass,0.015165,0.9,15,0.588 +Latin America,biomass,generic waste biomass,0.149925,0.9,15,0.588 +Middle East,biomass,generic waste biomass,0.0529425,0.9,15,0.588 +Southeast Asia,biomass,generic waste biomass,0.0783825,0.9,15,0.588 +USA,biomass,generic waste biomass,0.367965,0.9,15,0.588 +Western Europe,biomass,generic waste biomass,0.25902,0.9,15,0.588 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A14.wind_curves.csv b/input/gcam-data-system/energy-data/assumptions/A14.wind_curves.csv index 2082527185..44d83d8a92 100644 --- a/input/gcam-data-system/energy-data/assumptions/A14.wind_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A14.wind_curves.csv @@ -1,16 +1,16 @@ -# GCAM 3.0 wind resource supply curves NOT USED,,,,,, -region_GCAM3,resource,subresource,maxSubResource,mid-price,curve-exponent,base-price -Africa,onshore wind resource,onshore wind resource,680.241577,6.473844444,4.136444,4.975138889 -Australia_NZ,onshore wind resource,onshore wind resource,190.272919,3.924900278,3.557898,4.99275 -Canada,onshore wind resource,onshore wind resource,158.976273,4.804223056,3.038668,4.975138889 -China,onshore wind resource,onshore wind resource,180.451874,5.238865278,3.347413,5.019166667 -Eastern Europe,onshore wind resource,onshore wind resource,24.024664,4.563655278,3.439183,5.168861111 -Former Soviet Union,onshore wind resource,onshore wind resource,414.576385,4.371165833,3.865475,5.098416667 -India,onshore wind resource,onshore wind resource,44.653652,8.456151111,3.938476,5.283333333 -Japan,onshore wind resource,onshore wind resource,2.385547,4.202451389,2.450271,4.99275 -Korea,onshore wind resource,onshore wind resource,0.84307,6.071430556,3.60107,6.384027778 -Latin America,onshore wind resource,onshore wind resource,221.132233,4.724708889,2.952085,4.983944444 -Middle East,onshore wind resource,onshore wind resource,124.069275,5.943045556,4.718652,5.30975 -Southeast Asia,onshore wind resource,onshore wind resource,40.51096,5.492553333,2.826844,5.256916667 -USA,onshore wind resource,onshore wind resource,194.771622,3.738398611,3.746311,5.080805556 +# GCAM 3.0 wind resource supply curves NOT USED,,,,,, +region_GCAM3,resource,subresource,maxSubResource,mid-price,curve-exponent,base-price +Africa,onshore wind resource,onshore wind resource,680.241577,6.473844444,4.136444,4.975138889 +Australia_NZ,onshore wind resource,onshore wind resource,190.272919,3.924900278,3.557898,4.99275 +Canada,onshore wind resource,onshore wind resource,158.976273,4.804223056,3.038668,4.975138889 +China,onshore wind resource,onshore wind resource,180.451874,5.238865278,3.347413,5.019166667 +Eastern Europe,onshore wind resource,onshore wind resource,24.024664,4.563655278,3.439183,5.168861111 +Former Soviet Union,onshore wind resource,onshore wind resource,414.576385,4.371165833,3.865475,5.098416667 +India,onshore wind resource,onshore wind resource,44.653652,8.456151111,3.938476,5.283333333 +Japan,onshore wind resource,onshore wind resource,2.385547,4.202451389,2.450271,4.99275 +Korea,onshore wind resource,onshore wind resource,0.84307,6.071430556,3.60107,6.384027778 +Latin America,onshore wind resource,onshore wind resource,221.132233,4.724708889,2.952085,4.983944444 +Middle East,onshore wind resource,onshore wind resource,124.069275,5.943045556,4.718652,5.30975 +Southeast Asia,onshore wind resource,onshore wind resource,40.51096,5.492553333,2.826844,5.256916667 +USA,onshore wind resource,onshore wind resource,194.771622,3.738398611,3.746311,5.080805556 Western Europe,onshore wind resource,onshore wind resource,85.908813,3.054118889,2.851166,5.001555556 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A15.roofPV_TechChange.csv b/input/gcam-data-system/energy-data/assumptions/A15.roofPV_TechChange.csv index 7966a19a12..2fc784886f 100644 --- a/input/gcam-data-system/energy-data/assumptions/A15.roofPV_TechChange.csv +++ b/input/gcam-data-system/energy-data/assumptions/A15.roofPV_TechChange.csv @@ -1 +1,3 @@ -# GCAM 3.0 rooftop PV techChange,,,,,,, resource,subresource,2010,2025,2040,2055,2070,2085 distributed_solar,distributed_solar,0.0308,0.0234,0.0183,0.0149,0.0056,0.004 \ No newline at end of file +# GCAM 3.0 rooftop PV techChange,,,,,,, +resource,subresource,2010,2025,2040,2055,2070,2085 +distributed_solar,distributed_solar,0.0308,0.0234,0.0183,0.0149,0.0056,0.004 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A15.roofPV_curves.csv b/input/gcam-data-system/energy-data/assumptions/A15.roofPV_curves.csv index 4861211572..584d6e7462 100644 --- a/input/gcam-data-system/energy-data/assumptions/A15.roofPV_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A15.roofPV_curves.csv @@ -1,16 +1,16 @@ -# GCAM 3.0 rooftop PV supply curves,,,,,,, -region_GCAM3,resource,subresource,maxSubResource,mid-price,curve-exponent,gdpSupplyElast,subResourceCapacityFactor -USA,distributed_solar,distributed_solar,4.718453352,13.40917456,4.240486051,0.1,0.2 -Canada,distributed_solar,distributed_solar,0.374144475,16.52819307,4.240486051,0.1,0.2 -Western Europe,distributed_solar,distributed_solar,5.302743618,16.06949292,4.240486051,0.1,0.2 -Japan,distributed_solar,distributed_solar,1.126882043,14.43122184,4.240486051,0.1,0.2 -Australia_NZ,distributed_solar,distributed_solar,0.3841428,11.52252602,4.240486051,0.1,0.2 -Former Soviet Union,distributed_solar,distributed_solar,2.889066662,16.75512477,4.240486051,0.1,0.2 -China,distributed_solar,distributed_solar,16.06862022,13.62132187,4.240486051,0.1,0.2 -Middle East,distributed_solar,distributed_solar,1.912899244,10.11638903,4.240486051,0.1,0.2 -Africa,distributed_solar,distributed_solar,9.101716856,10.02533587,4.240486051,0.1,0.2 -Latin America,distributed_solar,distributed_solar,5.862118428,10.99167946,4.240486051,0.1,0.2 -Southeast Asia,distributed_solar,distributed_solar,7.952781714,11.01447492,4.240486051,0.1,0.2 -Eastern Europe,distributed_solar,distributed_solar,1.616168252,16.58376593,4.240486051,0.1,0.2 -Korea,distributed_solar,distributed_solar,0.570043404,13.47928694,4.240486051,0.1,0.2 -India,distributed_solar,distributed_solar,10.49707023,11.16173708,4.240486051,0.1,0.2 +# GCAM 3.0 rooftop PV supply curves,,,,,,, +region_GCAM3,resource,subresource,maxSubResource,mid-price,curve-exponent,gdpSupplyElast,subResourceCapacityFactor +USA,distributed_solar,distributed_solar,4.718453352,13.40917456,4.240486051,0.1,0.2 +Canada,distributed_solar,distributed_solar,0.374144475,16.52819307,4.240486051,0.1,0.2 +Western Europe,distributed_solar,distributed_solar,5.302743618,16.06949292,4.240486051,0.1,0.2 +Japan,distributed_solar,distributed_solar,1.126882043,14.43122184,4.240486051,0.1,0.2 +Australia_NZ,distributed_solar,distributed_solar,0.3841428,11.52252602,4.240486051,0.1,0.2 +Former Soviet Union,distributed_solar,distributed_solar,2.889066662,16.75512477,4.240486051,0.1,0.2 +China,distributed_solar,distributed_solar,16.06862022,13.62132187,4.240486051,0.1,0.2 +Middle East,distributed_solar,distributed_solar,1.912899244,10.11638903,4.240486051,0.1,0.2 +Africa,distributed_solar,distributed_solar,9.101716856,10.02533587,4.240486051,0.1,0.2 +Latin America,distributed_solar,distributed_solar,5.862118428,10.99167946,4.240486051,0.1,0.2 +Southeast Asia,distributed_solar,distributed_solar,7.952781714,11.01447492,4.240486051,0.1,0.2 +Eastern Europe,distributed_solar,distributed_solar,1.616168252,16.58376593,4.240486051,0.1,0.2 +Korea,distributed_solar,distributed_solar,0.570043404,13.47928694,4.240486051,0.1,0.2 +India,distributed_solar,distributed_solar,10.49707023,11.16173708,4.240486051,0.1,0.2 diff --git a/input/gcam-data-system/energy-data/assumptions/A16.EGS_curves.csv b/input/gcam-data-system/energy-data/assumptions/A16.EGS_curves.csv index 1efb66227b..51d3aed22d 100644 --- a/input/gcam-data-system/energy-data/assumptions/A16.EGS_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A16.EGS_curves.csv @@ -1 +1,30 @@ -# GCAM 3.0 enhanced geothermal supply curves,,,,, region_GCAM3,resource,subresource,grade,available,extractioncost USA,geothermal,EGS,grade 1,0,0.569 Canada,geothermal,EGS,grade 1,0,0.569 Western Europe,geothermal,EGS,grade 1,0,0.569 Japan,geothermal,EGS,grade 1,0,0.569 Australia_NZ,geothermal,EGS,grade 1,0,0.569 Former Soviet Union,geothermal,EGS,grade 1,0,0.569 China,geothermal,EGS,grade 1,0,0.569 Middle East,geothermal,EGS,grade 1,0,0.569 Africa,geothermal,EGS,grade 1,0,0.569 Latin America,geothermal,EGS,grade 1,0,0.569 Southeast Asia,geothermal,EGS,grade 1,0,0.569 Eastern Europe,geothermal,EGS,grade 1,0,0.569 Korea,geothermal,EGS,grade 1,0,0.569 India,geothermal,EGS,grade 1,0,0.569 USA,geothermal,EGS,grade 2,78.46082,1.352 Canada,geothermal,EGS,grade 2,3.01769,1.352 Western Europe,geothermal,EGS,grade 2,43.75382,1.352 Japan,geothermal,EGS,grade 2,5.74418,1.352 Australia_NZ,geothermal,EGS,grade 2,7.03603,1.352 Former Soviet Union,geothermal,EGS,grade 2,25.83517,1.352 China,geothermal,EGS,grade 2,14.35591,1.352 Middle East,geothermal,EGS,grade 2,5.74418,1.352 Africa,geothermal,EGS,grade 2,5.68938,1.352 Latin America,geothermal,EGS,grade 2,37.06546,1.352 Southeast Asia,geothermal,EGS,grade 2,57.41452,1.352 Eastern Europe,geothermal,EGS,grade 2,8.75076,1.352 Korea,geothermal,EGS,grade 2,0.001,1.352 India,geothermal,EGS,grade 2,5.74418,1.352 \ No newline at end of file +# GCAM 3.0 enhanced geothermal supply curves,,,,, +region_GCAM3,resource,subresource,grade,available,extractioncost +USA,geothermal,EGS,grade 1,0,0.569 +Canada,geothermal,EGS,grade 1,0,0.569 +Western Europe,geothermal,EGS,grade 1,0,0.569 +Japan,geothermal,EGS,grade 1,0,0.569 +Australia_NZ,geothermal,EGS,grade 1,0,0.569 +Former Soviet Union,geothermal,EGS,grade 1,0,0.569 +China,geothermal,EGS,grade 1,0,0.569 +Middle East,geothermal,EGS,grade 1,0,0.569 +Africa,geothermal,EGS,grade 1,0,0.569 +Latin America,geothermal,EGS,grade 1,0,0.569 +Southeast Asia,geothermal,EGS,grade 1,0,0.569 +Eastern Europe,geothermal,EGS,grade 1,0,0.569 +Korea,geothermal,EGS,grade 1,0,0.569 +India,geothermal,EGS,grade 1,0,0.569 +USA,geothermal,EGS,grade 2,78.46082,1.352 +Canada,geothermal,EGS,grade 2,3.01769,1.352 +Western Europe,geothermal,EGS,grade 2,43.75382,1.352 +Japan,geothermal,EGS,grade 2,5.74418,1.352 +Australia_NZ,geothermal,EGS,grade 2,7.03603,1.352 +Former Soviet Union,geothermal,EGS,grade 2,25.83517,1.352 +China,geothermal,EGS,grade 2,14.35591,1.352 +Middle East,geothermal,EGS,grade 2,5.74418,1.352 +Africa,geothermal,EGS,grade 2,5.68938,1.352 +Latin America,geothermal,EGS,grade 2,37.06546,1.352 +Southeast Asia,geothermal,EGS,grade 2,57.41452,1.352 +Eastern Europe,geothermal,EGS,grade 2,8.75076,1.352 +Korea,geothermal,EGS,grade 2,0.001,1.352 +India,geothermal,EGS,grade 2,5.74418,1.352 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A16.geo_curves.csv b/input/gcam-data-system/energy-data/assumptions/A16.geo_curves.csv index 06dc55e5b0..4d9bdd32d7 100644 --- a/input/gcam-data-system/energy-data/assumptions/A16.geo_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A16.geo_curves.csv @@ -1 +1,30 @@ -# GCAM 3.0 hydrothermal geothermal supply curves,,,,, region_GCAM3,resource,subresource,grade,available,extractioncost USA,geothermal,hydrothermal,grade 1,0,0.064 Canada,geothermal,hydrothermal,grade 1,0,0.064 Western Europe,geothermal,hydrothermal,grade 1,0,0.064 Japan,geothermal,hydrothermal,grade 1,0,0.064 Australia_NZ,geothermal,hydrothermal,grade 1,0,0.064 Former Soviet Union,geothermal,hydrothermal,grade 1,0,0.064 China,geothermal,hydrothermal,grade 1,0,0.064 Middle East,geothermal,hydrothermal,grade 1,0,0.064 Africa,geothermal,hydrothermal,grade 1,0,0.064 Latin America,geothermal,hydrothermal,grade 1,0,0.064 Southeast Asia,geothermal,hydrothermal,grade 1,0,0.064 Eastern Europe,geothermal,hydrothermal,grade 1,0,0.064 Korea,geothermal,hydrothermal,grade 1,0,0.064 India,geothermal,hydrothermal,grade 1,0,0.064 USA,geothermal,hydrothermal,grade 2,7.94759,0.569 Canada,geothermal,hydrothermal,grade 2,0.13231,0.569 Western Europe,geothermal,hydrothermal,grade 2,3.54618,0.569 Japan,geothermal,hydrothermal,grade 2,0.56582,0.569 Australia_NZ,geothermal,hydrothermal,grade 2,2.42397,0.569 Former Soviet Union,geothermal,hydrothermal,grade 2,2.54483,0.569 China,geothermal,hydrothermal,grade 2,1.41409,0.569 Middle East,geothermal,hydrothermal,grade 2,0.56582,0.569 Africa,geothermal,hydrothermal,grade 2,3.77062,0.569 Latin America,geothermal,hydrothermal,grade 2,10.23454,0.569 Southeast Asia,geothermal,hydrothermal,grade 2,5.65548,0.569 Eastern Europe,geothermal,hydrothermal,grade 2,0.70924,0.569 Korea,geothermal,hydrothermal,grade 2,0.001,0.569 India,geothermal,hydrothermal,grade 2,0.56582,0.569 \ No newline at end of file +# GCAM 3.0 hydrothermal geothermal supply curves,,,,, +region_GCAM3,resource,subresource,grade,available,extractioncost +USA,geothermal,hydrothermal,grade 1,0,0.064 +Canada,geothermal,hydrothermal,grade 1,0,0.064 +Western Europe,geothermal,hydrothermal,grade 1,0,0.064 +Japan,geothermal,hydrothermal,grade 1,0,0.064 +Australia_NZ,geothermal,hydrothermal,grade 1,0,0.064 +Former Soviet Union,geothermal,hydrothermal,grade 1,0,0.064 +China,geothermal,hydrothermal,grade 1,0,0.064 +Middle East,geothermal,hydrothermal,grade 1,0,0.064 +Africa,geothermal,hydrothermal,grade 1,0,0.064 +Latin America,geothermal,hydrothermal,grade 1,0,0.064 +Southeast Asia,geothermal,hydrothermal,grade 1,0,0.064 +Eastern Europe,geothermal,hydrothermal,grade 1,0,0.064 +Korea,geothermal,hydrothermal,grade 1,0,0.064 +India,geothermal,hydrothermal,grade 1,0,0.064 +USA,geothermal,hydrothermal,grade 2,7.94759,0.569 +Canada,geothermal,hydrothermal,grade 2,0.13231,0.569 +Western Europe,geothermal,hydrothermal,grade 2,3.54618,0.569 +Japan,geothermal,hydrothermal,grade 2,0.56582,0.569 +Australia_NZ,geothermal,hydrothermal,grade 2,2.42397,0.569 +Former Soviet Union,geothermal,hydrothermal,grade 2,2.54483,0.569 +China,geothermal,hydrothermal,grade 2,1.41409,0.569 +Middle East,geothermal,hydrothermal,grade 2,0.56582,0.569 +Africa,geothermal,hydrothermal,grade 2,3.77062,0.569 +Latin America,geothermal,hydrothermal,grade 2,10.23454,0.569 +Southeast Asia,geothermal,hydrothermal,grade 2,5.65548,0.569 +Eastern Europe,geothermal,hydrothermal,grade 2,0.70924,0.569 +Korea,geothermal,hydrothermal,grade 2,0.001,0.569 +India,geothermal,hydrothermal,grade 2,0.56582,0.569 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A17.tradbio_curves.csv b/input/gcam-data-system/energy-data/assumptions/A17.tradbio_curves.csv index 01b07a7c1b..0b29dd05ea 100644 --- a/input/gcam-data-system/energy-data/assumptions/A17.tradbio_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A17.tradbio_curves.csv @@ -1 +1,5 @@ -#GCAM 3.0 traditional biomass curves,,,, resource,subresource,grade,available,extractioncost traditional biomass,traditional biomass,grade 1,0,0.2 traditional biomass,traditional biomass,grade 2,1,0.25 traditional biomass,traditional biomass,grade 3,5,1.5 \ No newline at end of file +#GCAM 3.0 traditional biomass curves,,,, +resource,subresource,grade,available,extractioncost +traditional biomass,traditional biomass,grade 1,0,0.2 +traditional biomass,traditional biomass,grade 2,1,0.25 +traditional biomass,traditional biomass,grade 3,5,1.5 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A18.hydro_output.csv b/input/gcam-data-system/energy-data/assumptions/A18.hydro_output.csv index 1f32ed47ea..676de0efcc 100644 --- a/input/gcam-data-system/energy-data/assumptions/A18.hydro_output.csv +++ b/input/gcam-data-system/energy-data/assumptions/A18.hydro_output.csv @@ -1 +1,16 @@ -# hydropower by region in GCAM 3.0,,,,,, region_GCAM3,2020,2035,2050,2065,2080,2095 Africa,0.3267648,0.65408832,0.98141184,1.30873536,1.63605888,1.9633824 Australia_NZ,0.1409616,0.162445752,0.183929904,0.205414056,0.226898208,0.24838236 Canada,1.394725886,1.473358094,1.551990302,1.63062251,1.709254718,1.787886926 China,2.661752057,2.974997244,3.288242432,3.601487619,3.914732806,4.227977993 Eastern Europe,0.2451996,0.288167904,0.331136208,0.374104512,0.417072816,0.46004112 Former Soviet Union,0.974310686,1.164156254,1.354001822,1.54384739,1.733692958,1.923538526 India,0.401715257,0.591560825,0.781406393,0.971251961,1.161097529,1.350943097 Japan,0.2815596,0.291051878,0.300544157,0.310036435,0.319528714,0.329020992 Korea,0.0132228,0.022715078,0.032207357,0.041699635,0.051191914,0.060684192 Latin America,2.610419143,2.992850887,3.375282631,3.757714375,4.140146119,4.522577863 Middle East,0.076302,0.171224784,0.266147568,0.361070352,0.455993136,0.55091592 Southeast Asia,0.3074832,0.449867376,0.592251552,0.734635728,0.877019904,1.01940408 USA,0.9808092,0.993914568,1.007019936,1.020125304,1.033230672,1.04633604 Western Europe,1.7148312,1.757799504,1.800767808,1.843736112,1.886704416,1.92967272 \ No newline at end of file +# hydropower by region in GCAM 3.0,,,,,, +region_GCAM3,2020,2035,2050,2065,2080,2095 +Africa,0.3267648,0.65408832,0.98141184,1.30873536,1.63605888,1.9633824 +Australia_NZ,0.1409616,0.162445752,0.183929904,0.205414056,0.226898208,0.24838236 +Canada,1.394725886,1.473358094,1.551990302,1.63062251,1.709254718,1.787886926 +China,2.661752057,2.974997244,3.288242432,3.601487619,3.914732806,4.227977993 +Eastern Europe,0.2451996,0.288167904,0.331136208,0.374104512,0.417072816,0.46004112 +Former Soviet Union,0.974310686,1.164156254,1.354001822,1.54384739,1.733692958,1.923538526 +India,0.401715257,0.591560825,0.781406393,0.971251961,1.161097529,1.350943097 +Japan,0.2815596,0.291051878,0.300544157,0.310036435,0.319528714,0.329020992 +Korea,0.0132228,0.022715078,0.032207357,0.041699635,0.051191914,0.060684192 +Latin America,2.610419143,2.992850887,3.375282631,3.757714375,4.140146119,4.522577863 +Middle East,0.076302,0.171224784,0.266147568,0.361070352,0.455993136,0.55091592 +Southeast Asia,0.3074832,0.449867376,0.592251552,0.734635728,0.877019904,1.01940408 +USA,0.9808092,0.993914568,1.007019936,1.020125304,1.033230672,1.04633604 +Western Europe,1.7148312,1.757799504,1.800767808,1.843736112,1.886704416,1.92967272 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_coef.csv b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_coef.csv index fc95796864..8c484c0255 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_coef.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_coef.csv @@ -1 +1,14 @@ -# Primary energy handling default coefficients,,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2010,2100 regional biomass,regional biomass,regional biomass,biomass,1,1,1 regional coal,regional coal,regional coal,coal,1,1,1 regional natural gas,regional natural gas,regional natural gas,natural gas,1,1,1 unconventional oil production,unconventional oil production,unconventional oil production,unconventional oil,1,1,1 unconventional oil production,unconventional oil production,unconventional oil production,regional natural gas,0.124,0.124,0.102 regional oil,crude oil,crude oil,crude oil,1,1,1 regional oil,unconventional oil,unconventional oil,traded unconventional oil,1,1,1 regional corn for ethanol,regional corn for ethanol,regional corn for ethanol,Corn,111.79,111.79,111.79 regional sugar for ethanol,regional sugar for ethanol,regional sugar for ethanol,SugarCrop,582.48,582.48,582.48 regional biomassOil,regional biomassOil,biomassOil,biomassOil,1,1,1 regional biomassOil,regional biomassOil,OilCrop,OilCrop,142.57,142.57,142.57 regional biomassOil,regional biomassOil,PalmFruit,PalmFruit,128,128,128 \ No newline at end of file +# Primary energy handling default coefficients,,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2010,2100 +regional biomass,regional biomass,regional biomass,biomass,1,1,1 +regional coal,regional coal,regional coal,coal,1,1,1 +regional natural gas,regional natural gas,regional natural gas,natural gas,1,1,1 +unconventional oil production,unconventional oil production,unconventional oil production,unconventional oil,1,1,1 +unconventional oil production,unconventional oil production,unconventional oil production,regional natural gas,0.124,0.124,0.102 +regional oil,crude oil,crude oil,crude oil,1,1,1 +regional oil,unconventional oil,unconventional oil,traded unconventional oil,1,1,1 +regional corn for ethanol,regional corn for ethanol,regional corn for ethanol,Corn,111.79,111.79,111.79 +regional sugar for ethanol,regional sugar for ethanol,regional sugar for ethanol,SugarCrop,582.48,582.48,582.48 +regional biomassOil,regional biomassOil,biomassOil,biomassOil,1,1,1 +regional biomassOil,regional biomassOil,OilCrop,OilCrop,142.57,142.57,142.57 +regional biomassOil,regional biomassOil,PalmFruit,PalmFruit,128,128,128 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_cost.csv index 54f78bf0a7..cfc8a58d22 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_cost.csv @@ -1 +1,13 @@ -# Primary energy handling default costs,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2100 regional biomass,regional biomass,regional biomass,non-energy,0.737,0.737 regional coal,regional coal,regional coal,non-energy,0.15,0.15 regional natural gas,regional natural gas,regional natural gas,non-energy,0.25,0.25 unconventional oil production,unconventional oil production,unconventional oil production,non-energy,0.15,0.15 regional oil,crude oil,crude oil,non-energy,0.15,0.15 regional oil,unconventional oil,unconventional oil,non-energy,0.15,0.15 regional corn for ethanol,regional corn for ethanol,regional corn for ethanol,non-energy,0,0 regional sugar for ethanol,regional sugar for ethanol,regional sugar for ethanol,non-energy,0,0 regional biomassOil,regional biomassOil,biomassOil,non-energy,0,0 regional biomassOil,regional biomassOil,OilCrop,non-energy,0,0 regional biomassOil,regional biomassOil,PalmFruit,non-energy,0,0 \ No newline at end of file +# Primary energy handling default costs,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2100 +regional biomass,regional biomass,regional biomass,non-energy,0.737,0.737 +regional coal,regional coal,regional coal,non-energy,0.15,0.15 +regional natural gas,regional natural gas,regional natural gas,non-energy,0.25,0.25 +unconventional oil production,unconventional oil production,unconventional oil production,non-energy,0.15,0.15 +regional oil,crude oil,crude oil,non-energy,0.15,0.15 +regional oil,unconventional oil,unconventional oil,non-energy,0.15,0.15 +regional corn for ethanol,regional corn for ethanol,regional corn for ethanol,non-energy,0,0 +regional sugar for ethanol,regional sugar for ethanol,regional sugar for ethanol,non-energy,0,0 +regional biomassOil,regional biomassOil,biomassOil,non-energy,0,0 +regional biomassOil,regional biomassOil,OilCrop,non-energy,0,0 +regional biomassOil,regional biomassOil,PalmFruit,non-energy,0,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_keyword.csv b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_keyword.csv index 96e5ded855..491c199138 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_keyword.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_keyword.csv @@ -1 +1,7 @@ -# Primary energy handling keywords,,, supplysector,subsector,technology,primary.consumption regional biomass,regional biomass,regional biomass,biomass regional coal,regional coal,regional coal,coal regional natural gas,regional natural gas,regional natural gas,natural gas regional oil,crude oil,crude oil,oil regional oil,unconventional oil,unconventional oil,oil \ No newline at end of file +# Primary energy handling keywords,,, +supplysector,subsector,technology,primary.consumption +regional biomass,regional biomass,regional biomass,biomass +regional coal,regional coal,regional coal,coal +regional natural gas,regional natural gas,regional natural gas,natural gas +regional oil,crude oil,crude oil,oil +regional oil,unconventional oil,unconventional oil,oil \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_secout.csv b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_secout.csv index b0e88440dd..bdaeb42408 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_secout.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_secout.csv @@ -1 +1,4 @@ -# Feed crop secondary output of biomass liquids feedstock processing technologies (considered upstream of refining),,,,, supplysector,subsector,technology,fractional.secondary.output,2015,2100 regional corn for ethanol,regional corn for ethanol,regional corn for ethanol,DDGS and feedcakes,30,30 regional biomassOil,regional biomassOil,OilCrop,DDGS and feedcakes,90,90 \ No newline at end of file +# Feed crop secondary output of biomass liquids feedstock processing technologies (considered upstream of refining),,,,, +supplysector,subsector,technology,fractional.secondary.output,2015,2100 +regional corn for ethanol,regional corn for ethanol,regional corn for ethanol,DDGS and feedcakes,30,30 +regional biomassOil,regional biomassOil,OilCrop,DDGS and feedcakes,90,90 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_shrwt.csv index baccd7e56c..42ec14d433 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.globaltech_shrwt.csv @@ -1 +1,13 @@ -# Primary energy handling default shareweights,,,, supplysector,subsector,technology,1971,2100 regional biomass,regional biomass,regional biomass,1,1 regional coal,regional coal,regional coal,1,1 regional natural gas,regional natural gas,regional natural gas,1,1 unconventional oil production,unconventional oil production,unconventional oil production,1,1 regional oil,crude oil,crude oil,1,1 regional oil,unconventional oil,unconventional oil,1,1 regional corn for ethanol,regional corn for ethanol,regional corn for ethanol,1,1 regional sugar for ethanol,regional sugar for ethanol,regional sugar for ethanol,1,1 regional biomassOil,regional biomassOil,biomassOil,0,0 regional biomassOil,regional biomassOil,OilCrop,0,0 regional biomassOil,regional biomassOil,PalmFruit,0,0 \ No newline at end of file +# Primary energy handling default shareweights,,,, +supplysector,subsector,technology,1971,2100 +regional biomass,regional biomass,regional biomass,1,1 +regional coal,regional coal,regional coal,1,1 +regional natural gas,regional natural gas,regional natural gas,1,1 +unconventional oil production,unconventional oil production,unconventional oil production,1,1 +regional oil,crude oil,crude oil,1,1 +regional oil,unconventional oil,unconventional oil,1,1 +regional corn for ethanol,regional corn for ethanol,regional corn for ethanol,1,1 +regional sugar for ethanol,regional sugar for ethanol,regional sugar for ethanol,1,1 +regional biomassOil,regional biomassOil,biomassOil,0,0 +regional biomassOil,regional biomassOil,OilCrop,0,0 +regional biomassOil,regional biomassOil,PalmFruit,0,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.rsrc_info.csv b/input/gcam-data-system/energy-data/assumptions/A21.rsrc_info.csv index 4981570f38..2e4b1d922d 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.rsrc_info.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.rsrc_info.csv @@ -1 +1,3 @@ -# Name and characteristics of resource for secondary outputs from refining,,,,, depresource,market,output-unit,price-unit,1971,2010 DDGS and feedcakes,regional,Mt,1975$/kg,0.05,0.05 \ No newline at end of file +# Name and characteristics of resource for secondary outputs from refining,,,,, +depresource,market,output-unit,price-unit,1971,2010 +DDGS and feedcakes,regional,Mt,1975$/kg,0.05,0.05 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.sector.csv b/input/gcam-data-system/energy-data/assumptions/A21.sector.csv index 17644acc3c..0afb932f87 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.sector.csv @@ -1 +1,11 @@ -# Primary energy handling default supplysector information (units and logit exponents),,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,traded,logit.type regional biomass,EJ,EJ,1975$/GJ,-3,0, regional coal,EJ,EJ,1975$/GJ,-3,0, regional natural gas,EJ,EJ,1975$/GJ,-3,0, unconventional oil production,EJ,EJ,1975$/GJ,-3,0, regional oil,EJ,EJ,1975$/GJ,-6,0, traded unconventional oil,EJ,EJ,1975$/GJ,-3,1, regional corn for ethanol,EJ,EJ,1975$/GJ,-3,0, regional sugar for ethanol,EJ,EJ,1975$/GJ,-3,0, regional biomassOil,EJ,EJ,1975$/GJ,-3,0, \ No newline at end of file +# Primary energy handling default supplysector information (units and logit exponents),,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,traded,logit.type +regional biomass,EJ,EJ,1975$/GJ,-3,0, +regional coal,EJ,EJ,1975$/GJ,-3,0, +regional natural gas,EJ,EJ,1975$/GJ,-3,0, +unconventional oil production,EJ,EJ,1975$/GJ,-3,0, +regional oil,EJ,EJ,1975$/GJ,-6,0, +traded unconventional oil,EJ,EJ,1975$/GJ,-3,1, +regional corn for ethanol,EJ,EJ,1975$/GJ,-3,0, +regional sugar for ethanol,EJ,EJ,1975$/GJ,-3,0, +regional biomassOil,EJ,EJ,1975$/GJ,-3,0, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A21.subsector_interp.csv index c8aaef67b8..d6efe81b09 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.subsector_interp.csv @@ -1 +1,12 @@ -# Primary energy handling default subsector shareweight interpolation,,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function,traded regional biomass,regional biomass,share-weight,final-calibration-year,end-year,,linear,0 regional coal,regional coal,share-weight,final-calibration-year,end-year,,linear,0 regional natural gas,regional natural gas,share-weight,final-calibration-year,end-year,,linear,0 unconventional oil production,unconventional oil production,share-weight,final-calibration-year,end-year,,fixed,0 regional oil,crude oil,share-weight,final-calibration-year,2050,,linear,0 regional oil,unconventional oil,share-weight,final-calibration-year,2185,2,s-curve,0 traded unconventional oil,unconventional oil,share-weight,final-calibration-year,2050,,linear,1 regional corn for ethanol,regional corn for ethanol,share-weight,final-calibration-year,end-year,,fixed,0 regional sugar for ethanol,regional sugar for ethanol,share-weight,final-calibration-year,end-year,,fixed,0 regional biomassOil,regional biomassOil,share-weight,final-calibration-year,end-year,,fixed,0 \ No newline at end of file +# Primary energy handling default subsector shareweight interpolation,,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function,traded +regional biomass,regional biomass,share-weight,final-calibration-year,end-year,,linear,0 +regional coal,regional coal,share-weight,final-calibration-year,end-year,,linear,0 +regional natural gas,regional natural gas,share-weight,final-calibration-year,end-year,,linear,0 +unconventional oil production,unconventional oil production,share-weight,final-calibration-year,end-year,,fixed,0 +regional oil,crude oil,share-weight,final-calibration-year,2050,,linear,0 +regional oil,unconventional oil,share-weight,final-calibration-year,2185,2,s-curve,0 +traded unconventional oil,unconventional oil,share-weight,final-calibration-year,2050,,linear,1 +regional corn for ethanol,regional corn for ethanol,share-weight,final-calibration-year,end-year,,fixed,0 +regional sugar for ethanol,regional sugar for ethanol,share-weight,final-calibration-year,end-year,,fixed,0 +regional biomassOil,regional biomassOil,share-weight,final-calibration-year,end-year,,fixed,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A21.subsector_logit.csv index b61176813b..94e12341b4 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.subsector_logit.csv @@ -1 +1,12 @@ -# Primary energy handling default subsector logit exponents,,,, supplysector,subsector,logit.exponent,traded,logit.type regional biomass,regional biomass,-6,0, regional coal,regional coal,-6,0, regional natural gas,regional natural gas,-6,0, unconventional oil production,unconventional oil production,-6,0, regional oil,crude oil,-6,0, regional oil,unconventional oil,-6,0, traded unconventional oil,unconventional oil,-3,1, regional corn for ethanol,regional corn for ethanol,-6,0, regional sugar for ethanol,regional sugar for ethanol,-6,0, regional biomassOil,regional biomassOil,0,0, \ No newline at end of file +# Primary energy handling default subsector logit exponents,,,, +supplysector,subsector,logit.exponent,traded,logit.type +regional biomass,regional biomass,-6,0, +regional coal,regional coal,-6,0, +regional natural gas,regional natural gas,-6,0, +unconventional oil production,unconventional oil production,-6,0, +regional oil,crude oil,-6,0, +regional oil,unconventional oil,-6,0, +traded unconventional oil,unconventional oil,-3,1, +regional corn for ethanol,regional corn for ethanol,-6,0, +regional sugar for ethanol,regional sugar for ethanol,-6,0, +regional biomassOil,regional biomassOil,0,0, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A21.subsector_shrwt.csv index 5587a57f8e..7d156dab37 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.subsector_shrwt.csv @@ -1 +1,12 @@ -# Primary energy handling default subsector shareweights,,,,, supplysector,subsector,year.fillout,year,share.weight,traded regional biomass,regional biomass,start-year,,1,0 regional coal,regional coal,start-year,,1,0 regional natural gas,regional natural gas,start-year,,1,0 unconventional oil production,unconventional oil production,start-year,,1,0 regional oil,crude oil,start-year,,1,0 regional oil,unconventional oil,2050,,1,0 traded unconventional oil,unconventional oil,initial-future-year,,1,1 regional corn for ethanol,regional corn for ethanol,start-year,,1,0 regional sugar for ethanol,regional sugar for ethanol,start-year,,1,0 regional biomassOil,regional biomassOil,start-year,,1,0 \ No newline at end of file +# Primary energy handling default subsector shareweights,,,,, +supplysector,subsector,year.fillout,year,share.weight,traded +regional biomass,regional biomass,start-year,,1,0 +regional coal,regional coal,start-year,,1,0 +regional natural gas,regional natural gas,start-year,,1,0 +unconventional oil production,unconventional oil production,start-year,,1,0 +regional oil,crude oil,start-year,,1,0 +regional oil,unconventional oil,2050,,1,0 +traded unconventional oil,unconventional oil,initial-future-year,,1,1 +regional corn for ethanol,regional corn for ethanol,start-year,,1,0 +regional sugar for ethanol,regional sugar for ethanol,start-year,,1,0 +regional biomassOil,regional biomassOil,start-year,,1,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_coef.csv b/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_coef.csv index f3e0702cd7..013090756e 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_coef.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_coef.csv @@ -1 +1,3 @@ -# Primary energy handling default coefficients,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2100 traded unconventional oil,unconventional oil,unconventional oil,unconventional oil production,1,1 \ No newline at end of file +# Primary energy handling default coefficients,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2100 +traded unconventional oil,unconventional oil,unconventional oil,unconventional oil production,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_cost.csv index 347fdedcf2..f4a9827c5f 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_cost.csv @@ -1 +1,3 @@ -# Primary energy handling default costs. To include 2005-2010 price shock set the 2010 and 2100 values to 1.5,,,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2005,2010,2100 traded unconventional oil,unconventional oil,unconventional oil,non-energy,0,0,1.5,1.5 \ No newline at end of file +# Primary energy handling default costs. To include 2005-2010 price shock set the 2010 and 2100 values to 1.5,,,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2005,2010,2100 +traded unconventional oil,unconventional oil,unconventional oil,non-energy,0,0,1.5,1.5 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_shrwt.csv index 8c247e896c..aba0882c66 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.tradedtech_shrwt.csv @@ -1 +1,3 @@ -# Primary energy handling default technology shareweights,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2100 traded unconventional oil,unconventional oil,unconventional oil,unconventional oil production,1,1 \ No newline at end of file +# Primary energy handling default technology shareweights,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2100 +traded unconventional oil,unconventional oil,unconventional oil,unconventional oil production,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A21.unoil_demandshares.csv b/input/gcam-data-system/energy-data/assumptions/A21.unoil_demandshares.csv index 09e8db6583..859500625b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A21.unoil_demandshares.csv +++ b/input/gcam-data-system/energy-data/assumptions/A21.unoil_demandshares.csv @@ -1 +1,17 @@ -# This worksheet lists the assumptions for regional shares of global unconventional oil consumption, # Source: GCAM 3.1 model inputs. Calculated from export destinations of Canadian and Venezuelan oil., region_GCAM3,share USA,0.628571429 Canada,0.17012987 Western Europe,0.024675325 Japan,0 Australia_NZ,0 Former Soviet Union,0 China,0.021298701 Middle East,0 Africa,0 Latin America,0.130649351 Southeast Asia,0.024675325 Eastern Europe,0 Korea,0 India,0 \ No newline at end of file +# This worksheet lists the assumptions for regional shares of global unconventional oil consumption, +# Source: GCAM 3.1 model inputs. Calculated from export destinations of Canadian and Venezuelan oil., +region_GCAM3,share +USA,0.628571429 +Canada,0.17012987 +Western Europe,0.024675325 +Japan,0 +Australia_NZ,0 +Former Soviet Union,0 +China,0.021298701 +Middle East,0 +Africa,0 +Latin America,0.130649351 +Southeast Asia,0.024675325 +Eastern Europe,0 +Korea,0 +India,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_co2capture.csv b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_co2capture.csv index d48c2099bf..c1a839d1ff 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_co2capture.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_co2capture.csv @@ -1,8 +1,8 @@ -# Primary energy transformation technology capture fractions,,,, -supplysector,subsector,technology,1971,2100 -refining,coal to liquids,coal to liquids CCS level 1,0.818,0.818 -refining,coal to liquids,coal to liquids CCS level 2,0.9,0.9 -refining,biomass liquids,cellulosic ethanol CCS level 1,0.26,0.26 -refining,biomass liquids,cellulosic ethanol CCS level 2,0.9,0.9 -refining,biomass liquids,FT biofuels CCS level 1,0.818,0.818 +# Primary energy transformation technology capture fractions,,,, +supplysector,subsector,technology,1971,2100 +refining,coal to liquids,coal to liquids CCS level 1,0.818,0.818 +refining,coal to liquids,coal to liquids CCS level 2,0.9,0.9 +refining,biomass liquids,cellulosic ethanol CCS level 1,0.26,0.26 +refining,biomass liquids,cellulosic ethanol CCS level 2,0.9,0.9 +refining,biomass liquids,FT biofuels CCS level 1,0.818,0.818 refining,biomass liquids,FT biofuels CCS level 2,0.9,0.9 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_coef.csv b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_coef.csv index 1e91636388..2cb1a5dbb1 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_coef.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_coef.csv @@ -1 +1,26 @@ -# Primary energy transformation technologies default coefficient assumptions,,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2020,2100 gas processing,natural gas,natural gas,regional natural gas,1,1,1 gas processing,biomass gasification,biomass gasification,regional biomass,1.343,1.343,1.227 gas processing,coal gasification,coal gasification,regional coal,1.326,1.326,1.211 nuclearFuelGenII,enrichedUranium,enrichedUranium,uranium,0.002373172,0.002373172,0.002373172 nuclearFuelGenIII,enrichedUranium,enrichedUranium,uranium,0.002373172,0.002373172,0.002373172 refining,oil refining,oil refining,regional oil,1.055,1.055,1.02 refining,oil refining,oil refining,wholesale gas,0.018,0.018,0.018 refining,oil refining,oil refining,elect_td_ind,0.005,0.005,0.005 refining,coal to liquids,coal to liquids,regional coal,2.112,2.112,1.959 refining,coal to liquids,coal to liquids CCS level 1,regional coal,2.196,2.196,2.037 refining,coal to liquids,coal to liquids CCS level 2,regional coal,2.323,2.323,2.155 refining,gas to liquids,gas to liquids,regional natural gas,1.654,1.654,1.534 refining,biomass liquids,cellulosic ethanol,regional biomass,2.057,2.057,1.771 refining,biomass liquids,cellulosic ethanol CCS level 1,regional biomass,2.139,2.139,1.842 refining,biomass liquids,cellulosic ethanol CCS level 2,regional biomass,2.263,2.263,1.948 refining,biomass liquids,FT biofuels,regional biomass,1.961,1.961,1.739 refining,biomass liquids,FT biofuels CCS level 1,regional biomass,2.039,2.039,1.809 refining,biomass liquids,FT biofuels CCS level 2,regional biomass,2.157,2.157,1.913 refining,biomass liquids,corn ethanol,regional corn for ethanol,1,1,1 refining,biomass liquids,corn ethanol,wholesale gas,0.318,0.318,0.318 refining,biomass liquids,corn ethanol,elect_td_ind,0.026,0.026,0.026 refining,biomass liquids,sugar cane ethanol,regional sugar for ethanol,1,1,1 refining,biomass liquids,biodiesel,regional biomassOil,1.0309,1.0309,1.03 refining,biomass liquids,biodiesel,wholesale gas,0.05767,0.05767,0.06 \ No newline at end of file +# Primary energy transformation technologies default coefficient assumptions,,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2020,2100 +gas processing,natural gas,natural gas,regional natural gas,1,1,1 +gas processing,biomass gasification,biomass gasification,regional biomass,1.343,1.343,1.227 +gas processing,coal gasification,coal gasification,regional coal,1.326,1.326,1.211 +nuclearFuelGenII,enrichedUranium,enrichedUranium,uranium,0.002373172,0.002373172,0.002373172 +nuclearFuelGenIII,enrichedUranium,enrichedUranium,uranium,0.002373172,0.002373172,0.002373172 +refining,oil refining,oil refining,regional oil,1.055,1.055,1.02 +refining,oil refining,oil refining,wholesale gas,0.018,0.018,0.018 +refining,oil refining,oil refining,elect_td_ind,0.005,0.005,0.005 +refining,coal to liquids,coal to liquids,regional coal,2.112,2.112,1.959 +refining,coal to liquids,coal to liquids CCS level 1,regional coal,2.196,2.196,2.037 +refining,coal to liquids,coal to liquids CCS level 2,regional coal,2.323,2.323,2.155 +refining,gas to liquids,gas to liquids,regional natural gas,1.654,1.654,1.534 +refining,biomass liquids,cellulosic ethanol,regional biomass,2.057,2.057,1.771 +refining,biomass liquids,cellulosic ethanol CCS level 1,regional biomass,2.139,2.139,1.842 +refining,biomass liquids,cellulosic ethanol CCS level 2,regional biomass,2.263,2.263,1.948 +refining,biomass liquids,FT biofuels,regional biomass,1.961,1.961,1.739 +refining,biomass liquids,FT biofuels CCS level 1,regional biomass,2.039,2.039,1.809 +refining,biomass liquids,FT biofuels CCS level 2,regional biomass,2.157,2.157,1.913 +refining,biomass liquids,corn ethanol,regional corn for ethanol,1,1,1 +refining,biomass liquids,corn ethanol,wholesale gas,0.318,0.318,0.318 +refining,biomass liquids,corn ethanol,elect_td_ind,0.026,0.026,0.026 +refining,biomass liquids,sugar cane ethanol,regional sugar for ethanol,1,1,1 +refining,biomass liquids,biodiesel,regional biomassOil,1.0309,1.0309,1.03 +refining,biomass liquids,biodiesel,wholesale gas,0.05767,0.05767,0.06 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_cost.csv index 3687c31816..9de54623f4 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_cost.csv @@ -1,21 +1,21 @@ -# Primary energy transformation technologies default cost assumptions,,,,,,,,, -supplysector,subsector,technology,minicam.non.energy.input,1971,2010,2100,improvement.max,improvement.rate,improvement.shadow.technology -gas processing,natural gas,natural gas,non-energy,0.2,0.2,0.2,,, -gas processing,biomass gasification,biomass gasification,non-energy,7.0300865,7.0300865,,0.7,0.03, -gas processing,coal gasification,coal gasification,non-energy,5.285779323,5.285779323,,0.7,0.03, -nuclearFuelGenII,enrichedUranium,enrichedUranium,non-energy,0.124464,0.124464,0.124464,,, -nuclearFuelGenIII,enrichedUranium,enrichedUranium,non-energy,0.124464,0.124464,0.124464,,, -refining,oil refining,oil refining,non-energy,0.84,0.84,0.84,,, -refining,coal to liquids,coal to liquids,non-energy,5.294117647,5.294117647,,0.7,0.03, -refining,coal to liquids,coal to liquids CCS level 1,non-energy,5.980615385,5.980615385,,0.6,0.05,coal to liquids -refining,coal to liquids,coal to liquids CCS level 2,non-energy,6.467671233,6.467671233,,0.6,0.05,coal to liquids -refining,gas to liquids,gas to liquids,non-energy,3.970588235,3.970588235,,0.7,0.03, -refining,biomass liquids,cellulosic ethanol,non-energy,4.74,4.74,,0.7,0.03, -refining,biomass liquids,cellulosic ethanol CCS level 1,non-energy,4.991818182,4.991818182,,0.6,0.05,cellulosic ethanol -refining,biomass liquids,cellulosic ethanol CCS level 2,non-energy,6.850561798,6.850561798,,0.6,0.05,cellulosic ethanol -refining,biomass liquids,FT biofuels,non-energy,7.802307692,7.802307692,,0.7,0.03, -refining,biomass liquids,FT biofuels CCS level 1,non-energy,8.516923077,8.516923077,,0.6,0.05,FT biofuels -refining,biomass liquids,FT biofuels CCS level 2,non-energy,8.97527027,8.97527027,,0.6,0.05,FT biofuels -refining,biomass liquids,corn ethanol,non-energy,2.38,2.38,2.38,,, -refining,biomass liquids,sugar cane ethanol,non-energy,0,0,0,,, +# Primary energy transformation technologies default cost assumptions,,,,,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2010,2100,improvement.max,improvement.rate,improvement.shadow.technology +gas processing,natural gas,natural gas,non-energy,0.2,0.2,0.2,,, +gas processing,biomass gasification,biomass gasification,non-energy,7.0300865,7.0300865,,0.7,0.03, +gas processing,coal gasification,coal gasification,non-energy,5.285779323,5.285779323,,0.7,0.03, +nuclearFuelGenII,enrichedUranium,enrichedUranium,non-energy,0.124464,0.124464,0.124464,,, +nuclearFuelGenIII,enrichedUranium,enrichedUranium,non-energy,0.124464,0.124464,0.124464,,, +refining,oil refining,oil refining,non-energy,0.84,0.84,0.84,,, +refining,coal to liquids,coal to liquids,non-energy,5.294117647,5.294117647,,0.7,0.03, +refining,coal to liquids,coal to liquids CCS level 1,non-energy,5.980615385,5.980615385,,0.6,0.05,coal to liquids +refining,coal to liquids,coal to liquids CCS level 2,non-energy,6.467671233,6.467671233,,0.6,0.05,coal to liquids +refining,gas to liquids,gas to liquids,non-energy,3.970588235,3.970588235,,0.7,0.03, +refining,biomass liquids,cellulosic ethanol,non-energy,4.74,4.74,,0.7,0.03, +refining,biomass liquids,cellulosic ethanol CCS level 1,non-energy,4.991818182,4.991818182,,0.6,0.05,cellulosic ethanol +refining,biomass liquids,cellulosic ethanol CCS level 2,non-energy,6.850561798,6.850561798,,0.6,0.05,cellulosic ethanol +refining,biomass liquids,FT biofuels,non-energy,7.802307692,7.802307692,,0.7,0.03, +refining,biomass liquids,FT biofuels CCS level 1,non-energy,8.516923077,8.516923077,,0.6,0.05,FT biofuels +refining,biomass liquids,FT biofuels CCS level 2,non-energy,8.97527027,8.97527027,,0.6,0.05,FT biofuels +refining,biomass liquids,corn ethanol,non-energy,2.38,2.38,2.38,,, +refining,biomass liquids,sugar cane ethanol,non-energy,0,0,0,,, refining,biomass liquids,biodiesel,non-energy,1.88,1.88,1.88,,, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_interp.csv b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_interp.csv index 8b58f8f179..b256f85ccd 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_interp.csv @@ -1 +1,7 @@ -# Primary energy transformation technology interpolation (for techs that may have cal values in subsectors with multiple calibrated technologies),,,,,, supplysector,subsector,technology,apply.to,from.year,to.year,interpolation.function refining,biomass liquids,cellulosic ethanol,share-weight,final-calibration-year,2015,fixed refining,biomass liquids,FT biofuels,share-weight,final-calibration-year,2015,linear refining,biomass liquids,corn ethanol,share-weight,final-calibration-year,end-year,linear refining,biomass liquids,sugar cane ethanol,share-weight,final-calibration-year,end-year,linear refining,biomass liquids,biodiesel,share-weight,final-calibration-year,end-year,linear \ No newline at end of file +# Primary energy transformation technology interpolation (for techs that may have cal values in subsectors with multiple calibrated technologies),,,,,, +supplysector,subsector,technology,apply.to,from.year,to.year,interpolation.function +refining,biomass liquids,cellulosic ethanol,share-weight,final-calibration-year,2015,fixed +refining,biomass liquids,FT biofuels,share-weight,final-calibration-year,2015,linear +refining,biomass liquids,corn ethanol,share-weight,final-calibration-year,end-year,linear +refining,biomass liquids,sugar cane ethanol,share-weight,final-calibration-year,end-year,linear +refining,biomass liquids,biodiesel,share-weight,final-calibration-year,end-year,linear \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_retirement.csv b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_retirement.csv index 5e78963422..6bb8594272 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_retirement.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_retirement.csv @@ -1 +1,30 @@ -# Primary energy transformation technology lifetimes and shutdown rates,,,,,,,,, supplysector,subsector,technology,year,lifetime,shutdown.rate,half.life,steepness,median.shutdown.point,profit.shutdown.steepness refining,oil refining,oil refining,final-calibration-year,50,,30,0.2,0,50 refining,coal to liquids,coal to liquids,final-calibration-year,45,,25,0.2,0,50 refining,coal to liquids,coal to liquids CCS level 1,final-calibration-year,45,,25,0.2,0,50 refining,coal to liquids,coal to liquids CCS level 2,final-calibration-year,45,,25,0.2,0,50 refining,gas to liquids,gas to liquids,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,cellulosic ethanol,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,cellulosic ethanol CCS level 1,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,cellulosic ethanol CCS level 2,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,FT biofuels,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,FT biofuels CCS level 1,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,FT biofuels CCS level 2,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,corn ethanol,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,sugar cane ethanol,final-calibration-year,45,,25,0.2,0,50 refining,biomass liquids,biodiesel,final-calibration-year,45,,25,0.2,0,50 refining,oil refining,oil refining,initial-future-year,45,,30,0.3,0,50 refining,coal to liquids,coal to liquids,initial-future-year,45,,30,0.3,0,50 refining,coal to liquids,coal to liquids CCS level 1,initial-future-year,45,,30,0.3,0,50 refining,coal to liquids,coal to liquids CCS level 2,initial-future-year,45,,30,0.3,0,50 refining,gas to liquids,gas to liquids,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,cellulosic ethanol,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,cellulosic ethanol CCS level 1,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,cellulosic ethanol CCS level 2,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,FT biofuels,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,FT biofuels CCS level 1,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,FT biofuels CCS level 2,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,corn ethanol,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,sugar cane ethanol,initial-future-year,45,,30,0.3,0,50 refining,biomass liquids,biodiesel,initial-future-year,45,,30,0.3,0,50 \ No newline at end of file +# Primary energy transformation technology lifetimes and shutdown rates,,,,,,,,, +supplysector,subsector,technology,year,lifetime,shutdown.rate,half.life,steepness,median.shutdown.point,profit.shutdown.steepness +refining,oil refining,oil refining,final-calibration-year,50,,30,0.2,0,50 +refining,coal to liquids,coal to liquids,final-calibration-year,45,,25,0.2,0,50 +refining,coal to liquids,coal to liquids CCS level 1,final-calibration-year,45,,25,0.2,0,50 +refining,coal to liquids,coal to liquids CCS level 2,final-calibration-year,45,,25,0.2,0,50 +refining,gas to liquids,gas to liquids,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,cellulosic ethanol,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,cellulosic ethanol CCS level 1,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,cellulosic ethanol CCS level 2,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,FT biofuels,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,FT biofuels CCS level 1,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,FT biofuels CCS level 2,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,corn ethanol,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,sugar cane ethanol,final-calibration-year,45,,25,0.2,0,50 +refining,biomass liquids,biodiesel,final-calibration-year,45,,25,0.2,0,50 +refining,oil refining,oil refining,initial-future-year,45,,30,0.3,0,50 +refining,coal to liquids,coal to liquids,initial-future-year,45,,30,0.3,0,50 +refining,coal to liquids,coal to liquids CCS level 1,initial-future-year,45,,30,0.3,0,50 +refining,coal to liquids,coal to liquids CCS level 2,initial-future-year,45,,30,0.3,0,50 +refining,gas to liquids,gas to liquids,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,cellulosic ethanol,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,cellulosic ethanol CCS level 1,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,cellulosic ethanol CCS level 2,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,FT biofuels,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,FT biofuels CCS level 1,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,FT biofuels CCS level 2,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,corn ethanol,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,sugar cane ethanol,initial-future-year,45,,30,0.3,0,50 +refining,biomass liquids,biodiesel,initial-future-year,45,,30,0.3,0,50 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_shrwt.csv index 1598918b5c..b1c5c01a97 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.globaltech_shrwt.csv @@ -1,21 +1,21 @@ -# Primary energy transformation default technology shareweights,,,,,,, -supplysector,subsector,technology,1971,2015,2020,2050,2100 -gas processing,natural gas,natural gas,1,1,1,1,1 -gas processing,biomass gasification,biomass gasification,1,1,1,1,1 -gas processing,coal gasification,coal gasification,1,1,1,1,1 -nuclearFuelGenII,enrichedUranium,enrichedUranium,1,1,1,1,1 -nuclearFuelGenIII,enrichedUranium,enrichedUranium,1,1,1,1,1 -refining,oil refining,oil refining,1,1,1,1,1 -refining,coal to liquids,coal to liquids,0,0,1,1,1 -refining,coal to liquids,coal to liquids CCS level 1,0,0,0.333,1,1 -refining,coal to liquids,coal to liquids CCS level 2,0,0,0.333,1,1 -refining,gas to liquids,gas to liquids,0,0,1,1,1 -refining,biomass liquids,cellulosic ethanol,0,0,1,1,1 -refining,biomass liquids,cellulosic ethanol CCS level 1,0,0,0.333,1,1 -refining,biomass liquids,cellulosic ethanol CCS level 2,0,0,0.333,1,1 -refining,biomass liquids,FT biofuels,0,0,1,1,1 -refining,biomass liquids,FT biofuels CCS level 1,0,0,0.333,1,1 -refining,biomass liquids,FT biofuels CCS level 2,0,0,0.333,1,1 -refining,biomass liquids,corn ethanol,0,1,1,1,1 -refining,biomass liquids,sugar cane ethanol,0,1,1,1,1 -refining,biomass liquids,biodiesel,0,1,1,1,1 +# Primary energy transformation default technology shareweights,,,,,,, +supplysector,subsector,technology,1971,2015,2020,2050,2100 +gas processing,natural gas,natural gas,1,1,1,1,1 +gas processing,biomass gasification,biomass gasification,1,1,1,1,1 +gas processing,coal gasification,coal gasification,1,1,1,1,1 +nuclearFuelGenII,enrichedUranium,enrichedUranium,1,1,1,1,1 +nuclearFuelGenIII,enrichedUranium,enrichedUranium,1,1,1,1,1 +refining,oil refining,oil refining,1,1,1,1,1 +refining,coal to liquids,coal to liquids,0,0,1,1,1 +refining,coal to liquids,coal to liquids CCS level 1,0,0,0.333,1,1 +refining,coal to liquids,coal to liquids CCS level 2,0,0,0.333,1,1 +refining,gas to liquids,gas to liquids,0,0,1,1,1 +refining,biomass liquids,cellulosic ethanol,0,0,1,1,1 +refining,biomass liquids,cellulosic ethanol CCS level 1,0,0,0.333,1,1 +refining,biomass liquids,cellulosic ethanol CCS level 2,0,0,0.333,1,1 +refining,biomass liquids,FT biofuels,0,0,1,1,1 +refining,biomass liquids,FT biofuels CCS level 1,0,0,0.333,1,1 +refining,biomass liquids,FT biofuels CCS level 2,0,0,0.333,1,1 +refining,biomass liquids,corn ethanol,0,1,1,1,1 +refining,biomass liquids,sugar cane ethanol,0,1,1,1,1 +refining,biomass liquids,biodiesel,0,1,1,1,1 diff --git a/input/gcam-data-system/energy-data/assumptions/A22.sector.csv b/input/gcam-data-system/energy-data/assumptions/A22.sector.csv index 0606c3b447..b5a4005954 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.sector.csv @@ -1 +1,6 @@ -# Primary energy transformation supplysectors,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type gas processing,EJ,EJ,1975$/GJ,-6, nuclearFuelGenII,EJ,EJ,1975$/GJ,-3, nuclearFuelGenIII,EJ,EJ,1975$/GJ,-3, refining,EJ,EJ,1975$/GJ,-6, \ No newline at end of file +# Primary energy transformation supplysectors,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type +gas processing,EJ,EJ,1975$/GJ,-6, +nuclearFuelGenII,EJ,EJ,1975$/GJ,-3, +nuclearFuelGenIII,EJ,EJ,1975$/GJ,-3, +refining,EJ,EJ,1975$/GJ,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A22.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A22.subsector_interp.csv index 3087ef7181..9122d7afdb 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.subsector_interp.csv @@ -1,11 +1,11 @@ -# Primary energy transformation subsector shareweight interpolation,,,,,, -supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function -gas processing,natural gas,share-weight,final-calibration-year,end-year,,linear -gas processing,biomass gasification,share-weight,final-calibration-year,end-year,,linear -gas processing,coal gasification,share-weight,final-calibration-year,end-year,,linear -nuclearFuelGenII,enrichedUranium,share-weight,final-calibration-year,end-year,,linear -nuclearFuelGenIII,enrichedUranium,share-weight,final-calibration-year,end-year,,linear -refining,oil refining,share-weight,final-calibration-year,end-year,,fixed -refining,biomass liquids,share-weight,final-calibration-year,2015,,linear -refining,coal to liquids,share-weight,initial-future-year,end-year,,linear -refining,gas to liquids,share-weight,initial-future-year,end-year,,linear +# Primary energy transformation subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +gas processing,natural gas,share-weight,final-calibration-year,end-year,,linear +gas processing,biomass gasification,share-weight,final-calibration-year,end-year,,linear +gas processing,coal gasification,share-weight,final-calibration-year,end-year,,linear +nuclearFuelGenII,enrichedUranium,share-weight,final-calibration-year,end-year,,linear +nuclearFuelGenIII,enrichedUranium,share-weight,final-calibration-year,end-year,,linear +refining,oil refining,share-weight,final-calibration-year,end-year,,fixed +refining,biomass liquids,share-weight,final-calibration-year,2015,,linear +refining,coal to liquids,share-weight,initial-future-year,end-year,,linear +refining,gas to liquids,share-weight,initial-future-year,end-year,,linear diff --git a/input/gcam-data-system/energy-data/assumptions/A22.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A22.subsector_logit.csv index 3841c93f8d..6f1243c87a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.subsector_logit.csv @@ -1 +1,11 @@ -# Primary energy transformation subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type gas processing,natural gas,-6, gas processing,biomass gasification,-6, gas processing,coal gasification,-6, nuclearFuelGenII,enrichedUranium,-6, nuclearFuelGenIII,enrichedUranium,-6, refining,oil refining,-6, refining,biomass liquids,-6, refining,coal to liquids,-6, refining,gas to liquids,-6, \ No newline at end of file +# Primary energy transformation subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +gas processing,natural gas,-6, +gas processing,biomass gasification,-6, +gas processing,coal gasification,-6, +nuclearFuelGenII,enrichedUranium,-6, +nuclearFuelGenIII,enrichedUranium,-6, +refining,oil refining,-6, +refining,biomass liquids,-6, +refining,coal to liquids,-6, +refining,gas to liquids,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A22.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A22.subsector_shrwt.csv index 81a15d5616..ba8a4ea14d 100644 --- a/input/gcam-data-system/energy-data/assumptions/A22.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A22.subsector_shrwt.csv @@ -1,13 +1,13 @@ -# Primary energy transformation subsector shareweights,,,, -supplysector,subsector,year.fillout,year,share.weight -gas processing,natural gas,start-year,,1 -gas processing,biomass gasification,start-year,,1 -gas processing,coal gasification,start-year,,1 -nuclearFuelGenII,enrichedUranium,start-year,,1 -nuclearFuelGenIII,enrichedUranium,start-year,,1 -refining,oil refining,start-year,,1 -refining,biomass liquids,initial-future-year,,1 -refining,coal to liquids,initial-future-year,,0 -refining,coal to liquids,end-year,,0.1 -refining,gas to liquids,initial-future-year,,0 -refining,gas to liquids,end-year,,0.25 +# Primary energy transformation subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +gas processing,natural gas,start-year,,1 +gas processing,biomass gasification,start-year,,1 +gas processing,coal gasification,start-year,,1 +nuclearFuelGenII,enrichedUranium,start-year,,1 +nuclearFuelGenIII,enrichedUranium,start-year,,1 +refining,oil refining,start-year,,1 +refining,biomass liquids,initial-future-year,,1 +refining,coal to liquids,initial-future-year,,0 +refining,coal to liquids,end-year,,0.1 +refining,gas to liquids,initial-future-year,,0 +refining,gas to liquids,end-year,,0.25 diff --git a/input/gcam-data-system/energy-data/assumptions/A23.chp_elecratio.csv b/input/gcam-data-system/energy-data/assumptions/A23.chp_elecratio.csv index 27e7086690..868e99eb3b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.chp_elecratio.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.chp_elecratio.csv @@ -1 +1,7 @@ -# Assumed CHP electricity output per unit fuel input, fuel,elec_ratio biomass,0.2 coal,0.25 gas,0.25 refined liquids,0.25 hydrogen,0.5 \ No newline at end of file +# Assumed CHP electricity output per unit fuel input, +fuel,elec_ratio +biomass,0.2 +coal,0.25 +gas,0.25 +refined liquids,0.25 +hydrogen,0.5 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globalinttech.csv b/input/gcam-data-system/energy-data/assumptions/A23.globalinttech.csv index 7ffc5bf329..35ee7f8fac 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globalinttech.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globalinttech.csv @@ -1,7 +1,7 @@ -# Electricity sector intermittent technology information,,,,,,,,, -# Electricity sector intermittent technology information,,,,,,,,, -supplysector,subsector,technology,electric.sector.name,trial.market.name,backup.capital.cost,backup.capacity.factor,capacity.limit,minicam.energy.input,minicam.non.energy.input -electricity,wind,wind,electricity,renewable,36,0.05,0.35,backup_electricity,backup-cap-cost -electricity,solar,PV,electricity,renewable,36,0.05,0.25,backup_electricity,backup-cap-cost -electricity,solar,CSP,electricity,renewable,36,0.05,0.25,csp_backup,backup-cap-cost -elect_td_bld,rooftop_pv,rooftop_pv,electricity,renewable,36,0.05,0.25,backup_electricity,backup-cap-cost +# Electricity sector intermittent technology information,,,,,,,,, +# Electricity sector intermittent technology information,,,,,,,,, +supplysector,subsector,technology,electric.sector.name,trial.market.name,backup.capital.cost,backup.capacity.factor,capacity.limit,minicam.energy.input,minicam.non.energy.input +electricity,wind,wind,electricity,renewable,36,0.05,0.35,backup_electricity,backup-cap-cost +electricity,solar,PV,electricity,renewable,36,0.05,0.25,backup_electricity,backup-cap-cost +electricity,solar,CSP,electricity,renewable,36,0.05,0.25,csp_backup,backup-cap-cost +elect_td_bld,rooftop_pv,rooftop_pv,electricity,renewable,36,0.05,0.25,backup_electricity,backup-cap-cost diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_OMfixed.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_OMfixed.csv index d706561fc8..0bfc335acc 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_OMfixed.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_OMfixed.csv @@ -1,28 +1,28 @@ -# Electricity technology fixed operations and maintenance costs,,,,,,,,,,,, -# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,, -# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,, -supplysector,subsector,technology,input.OM.fixed,capacity.factor,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology -electricity,coal,coal (conv pul),OM-fixed,0.85,8.83,8.83,8.83,7.745675305,7.745675305,0.75,0.01, -electricity,coal,coal (conv pul CCS),OM-fixed,0.8,15.49135061,15.49135061,15.49135061,15.49135061,15.49135061,0.6,0.05,coal (conv pul) -electricity,coal,coal (IGCC),OM-fixed,0.8,12.4,12.4,12.4,10.84394543,10.84394543,0.7,0.03, -electricity,coal,coal (IGCC CCS),OM-fixed,0.8,14.22,14.22,14.22,21.68789085,21.68789085,0.6,0.05,coal (IGCC) -electricity,gas,gas (steam/CT),OM-fixed,0.8,3.63,3.63,3.63,1.858962073,1.858962073,0.75,0.01, -electricity,gas,gas (CC),OM-fixed,0.85,3.88,3.88,3.88,3.098270122,3.098270122,0.75,0.01, -electricity,gas,gas (CC CCS),OM-fixed,0.8,4.29,4.29,4.29,6.196540244,6.196540244,0.6,0.05,gas (CC) -electricity,refined liquids,refined liquids (steam/CT),OM-fixed,0.8,3.63,3.63,3.63,1.858962073,1.858962073,0.75,0.01, -electricity,refined liquids,refined liquids (CC),OM-fixed,0.85,11.16,11.16,11.16,3.098270122,3.098270122,0.75,0.01, -electricity,refined liquids,refined liquids (CC CCS),OM-fixed,0.8,12.02,12.02,12.02,7.374755642,7.374755642,0.6,0.05,refined liquids (CC) -electricity,biomass,biomass (conv),OM-fixed,0.85,9.09,9.09,9.09,29.43356616,29.43356616,0.75,0.01, -electricity,biomass,biomass (conv CCS),OM-fixed,0.8,35.95922667,35.95922667,35.95922667,35.95922667,35.95922667,0.6,0.05,biomass (conv) -electricity,biomass,biomass (IGCC),OM-fixed,0.8,12.77,12.77,12.77,43.37578171,43.37578171,0.7,0.03, -electricity,biomass,biomass (IGCC CCS),OM-fixed,0.8,14.33,14.33,14.33,52.51170642,52.51170642,0.6,0.05,biomass (IGCC) -electricity,nuclear,Gen_II_LWR,OM-fixed,0.9,22.02,22.02,22.02,32.53183628,32.53183628,1,0, -electricity,nuclear,Gen_III,OM-fixed,0.9,21.77,21.77,21.77,29.43356616,29.43356616,0.75,0.01, -electricity,wind,wind,OM-fixed,0.37,3.75,3.75,3.75,15.49135061,15.49135061,0.7,0.03, -electricity,wind,wind_storage,OM-fixed,0.37,8.63,8.63,8.63,18.58962073,18.58962073,0.7,0.03,wind -electricity,solar,PV,OM-fixed,0.2,8.93,8.93,8.93,12.39308049,12.39308049,0.7,0.03, -electricity,solar,PV_storage,OM-fixed,0.2,17.42,17.42,17.42,14.87169658,14.87169658,0.7,0.03,PV -electricity,solar,CSP,OM-fixed,0.25,16.62,16.62,16.62,17.04048567,17.04048567,0.6,0.05, -electricity,solar,CSP_storage,OM-fixed,0.65,16.62,16.62,16.62,20.13875579,20.13875579,0.7,0.03,CSP -electricity,geothermal,geothermal,OM-fixed,0.9,23.54,23.54,23.54,30.98270122,30.98270122,0.75,0.01, +# Electricity technology fixed operations and maintenance costs,,,,,,,,,,,, +# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,, +# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,, +supplysector,subsector,technology,input.OM.fixed,capacity.factor,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology +electricity,coal,coal (conv pul),OM-fixed,0.85,8.83,8.83,8.83,7.745675305,7.745675305,0.75,0.01, +electricity,coal,coal (conv pul CCS),OM-fixed,0.8,15.49135061,15.49135061,15.49135061,15.49135061,15.49135061,0.6,0.05,coal (conv pul) +electricity,coal,coal (IGCC),OM-fixed,0.8,12.4,12.4,12.4,10.84394543,10.84394543,0.7,0.03, +electricity,coal,coal (IGCC CCS),OM-fixed,0.8,14.22,14.22,14.22,21.68789085,21.68789085,0.6,0.05,coal (IGCC) +electricity,gas,gas (steam/CT),OM-fixed,0.8,3.63,3.63,3.63,1.858962073,1.858962073,0.75,0.01, +electricity,gas,gas (CC),OM-fixed,0.85,3.88,3.88,3.88,3.098270122,3.098270122,0.75,0.01, +electricity,gas,gas (CC CCS),OM-fixed,0.8,4.29,4.29,4.29,6.196540244,6.196540244,0.6,0.05,gas (CC) +electricity,refined liquids,refined liquids (steam/CT),OM-fixed,0.8,3.63,3.63,3.63,1.858962073,1.858962073,0.75,0.01, +electricity,refined liquids,refined liquids (CC),OM-fixed,0.85,11.16,11.16,11.16,3.098270122,3.098270122,0.75,0.01, +electricity,refined liquids,refined liquids (CC CCS),OM-fixed,0.8,12.02,12.02,12.02,7.374755642,7.374755642,0.6,0.05,refined liquids (CC) +electricity,biomass,biomass (conv),OM-fixed,0.85,9.09,9.09,9.09,29.43356616,29.43356616,0.75,0.01, +electricity,biomass,biomass (conv CCS),OM-fixed,0.8,35.95922667,35.95922667,35.95922667,35.95922667,35.95922667,0.6,0.05,biomass (conv) +electricity,biomass,biomass (IGCC),OM-fixed,0.8,12.77,12.77,12.77,43.37578171,43.37578171,0.7,0.03, +electricity,biomass,biomass (IGCC CCS),OM-fixed,0.8,14.33,14.33,14.33,52.51170642,52.51170642,0.6,0.05,biomass (IGCC) +electricity,nuclear,Gen_II_LWR,OM-fixed,0.9,22.02,22.02,22.02,32.53183628,32.53183628,1,0, +electricity,nuclear,Gen_III,OM-fixed,0.9,21.77,21.77,21.77,29.43356616,29.43356616,0.75,0.01, +electricity,wind,wind,OM-fixed,0.37,3.75,3.75,3.75,15.49135061,15.49135061,0.7,0.03, +electricity,wind,wind_storage,OM-fixed,0.37,8.63,8.63,8.63,18.58962073,18.58962073,0.7,0.03,wind +electricity,solar,PV,OM-fixed,0.2,8.93,8.93,8.93,12.39308049,12.39308049,0.7,0.03, +electricity,solar,PV_storage,OM-fixed,0.2,17.42,17.42,17.42,14.87169658,14.87169658,0.7,0.03,PV +electricity,solar,CSP,OM-fixed,0.25,16.62,16.62,16.62,17.04048567,17.04048567,0.6,0.05, +electricity,solar,CSP_storage,OM-fixed,0.65,16.62,16.62,16.62,20.13875579,20.13875579,0.7,0.03,CSP +electricity,geothermal,geothermal,OM-fixed,0.9,23.54,23.54,23.54,30.98270122,30.98270122,0.75,0.01, elect_td_bld,rooftop_pv,rooftop_pv,OM-fixed,0.2,46.77,46.77,46.77,18.58962073,18.58962073,0.7,0.03, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_OMvar.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_OMvar.csv index 5bab6f63e3..ac2e0fbbc4 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_OMvar.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_OMvar.csv @@ -1,22 +1,22 @@ -# Electricity technology variable operations and maintenance costs,,,,,,,,,,,, -# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,, -# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,, -supplysector,subsector,technology,input.OM.var,,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology -electricity,coal,coal (conv pul),OM-var,,1.47,1.47,1.47,1.239308049,1.239308049,0.75,0.01, -electricity,coal,coal (conv pul CCS),OM-var,,2.478616097,2.478616097,2.478616097,2.478616097,2.478616097,0.6,0.05,coal (conv pul) -electricity,coal,coal (IGCC),OM-var,,0.94,0.94,0.94,2.013875579,2.013875579,0.7,0.03, -electricity,coal,coal (IGCC CCS),OM-var,,1.72,1.72,1.72,3.098270122,3.098270122,0.6,0.05,coal (IGCC) -electricity,gas,gas (steam/CT),OM-var,,1.08,1.08,1.08,3.098270122,3.098270122,0.75,0.01, -electricity,gas,gas (CC),OM-var,,0.65,0.65,0.65,1.084394543,1.084394543,0.75,0.01, -electricity,gas,gas (CC CCS),OM-var,,0.83,0.83,0.83,2.168789085,2.168789085,0.6,0.05,gas (CC) -electricity,refined liquids,refined liquids (steam/CT),OM-var,,1.08,1.08,1.08,3.098270122,3.098270122,0.75,0.01, -electricity,refined liquids,refined liquids (CC),OM-var,,0.84,0.84,0.84,1.084394543,1.084394543,0.75,0.01, -electricity,refined liquids,refined liquids (CC CCS),OM-var,,1.21,1.21,1.21,2.581164475,2.581164475,0.6,0.05,refined liquids (CC) -electricity,biomass,biomass (conv),OM-var,,1.49,1.49,1.49,3.098270122,3.098270122,0.75,0.01, -electricity,biomass,biomass (conv CCS),OM-var,,4.142375804,4.142375804,4.142375804,4.142375804,4.142375804,0.6,0.05,biomass (conv) -electricity,biomass,biomass (IGCC),OM-var,,0.95,0.95,0.95,4.647405183,4.647405183,0.7,0.03, -electricity,biomass,biomass (IGCC CCS),OM-var,,1.62,1.62,1.62,5.560997655,5.560997655,0.6,0.05,biomass (IGCC) -electricity,nuclear,Gen_II_LWR,OM-var,,0.05,0.05,0.05,0.681619427,0.681619427,1,0, -electricity,nuclear,Gen_III,OM-var,,0.16,0.16,0.16,0.619654024,0.619654024,0.75,0.01, -electricity,wind,wind,OM-var,,2.28,2.28,2.28,0,0,0.7,0.03, +# Electricity technology variable operations and maintenance costs,,,,,,,,,,,, +# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,, +# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,, +supplysector,subsector,technology,input.OM.var,,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology +electricity,coal,coal (conv pul),OM-var,,1.47,1.47,1.47,1.239308049,1.239308049,0.75,0.01, +electricity,coal,coal (conv pul CCS),OM-var,,2.478616097,2.478616097,2.478616097,2.478616097,2.478616097,0.6,0.05,coal (conv pul) +electricity,coal,coal (IGCC),OM-var,,0.94,0.94,0.94,2.013875579,2.013875579,0.7,0.03, +electricity,coal,coal (IGCC CCS),OM-var,,1.72,1.72,1.72,3.098270122,3.098270122,0.6,0.05,coal (IGCC) +electricity,gas,gas (steam/CT),OM-var,,1.08,1.08,1.08,3.098270122,3.098270122,0.75,0.01, +electricity,gas,gas (CC),OM-var,,0.65,0.65,0.65,1.084394543,1.084394543,0.75,0.01, +electricity,gas,gas (CC CCS),OM-var,,0.83,0.83,0.83,2.168789085,2.168789085,0.6,0.05,gas (CC) +electricity,refined liquids,refined liquids (steam/CT),OM-var,,1.08,1.08,1.08,3.098270122,3.098270122,0.75,0.01, +electricity,refined liquids,refined liquids (CC),OM-var,,0.84,0.84,0.84,1.084394543,1.084394543,0.75,0.01, +electricity,refined liquids,refined liquids (CC CCS),OM-var,,1.21,1.21,1.21,2.581164475,2.581164475,0.6,0.05,refined liquids (CC) +electricity,biomass,biomass (conv),OM-var,,1.49,1.49,1.49,3.098270122,3.098270122,0.75,0.01, +electricity,biomass,biomass (conv CCS),OM-var,,4.142375804,4.142375804,4.142375804,4.142375804,4.142375804,0.6,0.05,biomass (conv) +electricity,biomass,biomass (IGCC),OM-var,,0.95,0.95,0.95,4.647405183,4.647405183,0.7,0.03, +electricity,biomass,biomass (IGCC CCS),OM-var,,1.62,1.62,1.62,5.560997655,5.560997655,0.6,0.05,biomass (IGCC) +electricity,nuclear,Gen_II_LWR,OM-var,,0.05,0.05,0.05,0.681619427,0.681619427,1,0, +electricity,nuclear,Gen_III,OM-var,,0.16,0.16,0.16,0.619654024,0.619654024,0.75,0.01, +electricity,wind,wind,OM-var,,2.28,2.28,2.28,0,0,0.7,0.03, electricity,wind,wind_storage,OM-var,,3.91,3.91,3.91,0,0,0.7,0.03,wind \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital.csv index 21a04b1f37..99d094ba83 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital.csv @@ -1,28 +1,28 @@ -# Electricity technology capital costs,,,,,,,,,,,,, -# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,,, -# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,,, -supplysector,subsector,technology,input-capital,fixed.charge.rate,capacity.factor,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology -electricity,coal,coal (conv pul),capital,0.13,0.85,730,730,800,850,898.4983353,0.75,0.01, -electricity,coal,coal (conv pul CCS),capital,0.13,0.8,1796.996671,1796.996671,1796.996671,1796.996671,1796.996671,0.6,0.05,coal (conv pul) -electricity,coal,coal (IGCC),capital,0.13,0.8,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.7,0.03, -electricity,coal,coal (IGCC CCS),capital,0.13,0.8,2044.85828,2044.85828,2044.85828,2044.85828,2044.85828,0.6,0.05,coal (IGCC) -electricity,gas,gas (steam/CT),capital,0.13,0.8,150,150,150,150,232.3702591,0.75,0.01, -electricity,gas,gas (CC),capital,0.13,0.85,320,320,320,320,325.3183628,0.75,0.01, -electricity,gas,gas (CC CCS),capital,0.13,0.8,650.6367256,650.6367256,650.6367256,650.6367256,650.6367256,0.6,0.05,gas (CC) -electricity,refined liquids,refined liquids (steam/CT),capital,0.13,0.8,232.3702591,232.3702591,232.3702591,232.3702591,232.3702591,0.75,0.01, -electricity,refined liquids,refined liquids (CC),capital,0.13,0.85,325.3183628,325.3183628,325.3183628,325.3183628,325.3183628,0.75,0.01, -electricity,refined liquids,refined liquids (CC CCS),capital,0.13,0.8,774.3493424,774.3493424,774.3493424,774.3493424,774.3493424,0.6,0.05,refined liquids (CC) -electricity,biomass,biomass (conv),capital,0.13,0.85,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.75,0.01, -electricity,biomass,biomass (conv CCS),capital,0.13,0.85,2385.667994,2385.667994,2385.667994,2385.667994,2385.667994,0.6,0.05,biomass (conv) -electricity,biomass,biomass (IGCC),capital,0.13,0.8,1858.962073,1858.962073,1858.962073,1858.962073,1858.962073,0.7,0.03, -electricity,biomass,biomass (IGCC CCS),capital,0.13,0.8,2741.969058,2741.969058,2741.969058,2741.969058,2741.969058,0.6,0.05,biomass (IGCC) -electricity,nuclear,Gen_II_LWR,capital,0.13,0.9,1650,1650,1650,1650,1704.048567,1,0, -electricity,nuclear,Gen_III,capital,0.13,0.9,1704.048567,1704.048567,1704.048567,1704.048567,1704.048567,0.75,0.01, -electricity,wind,wind,capital,0.13,0.37,642.2,494,380,619.6540244,619.6540244,0.7,0.03, -electricity,wind,wind_storage,capital,0.13,0.37,1548.04,1190.8,916,1796.996671,1796.996671,0.7,0.03,wind -electricity,solar,PV,capital,0.13,0.2,578.3437561,578.3437561,578.3437561,578.3437561,578.3437561,0.7,0.03, -electricity,solar,PV_storage,capital,0.13,0.2,1363.238854,1363.238854,1363.238854,1363.238854,1363.238854,0.7,0.03,PV -electricity,solar,CSP,capital,0.13,0.25,1487.169658,1487.169658,1487.169658,1487.169658,1487.169658,0.6,0.05, -electricity,solar,CSP_storage,capital,0.13,0.65,2478.616097,2478.616097,2478.616097,2478.616097,2478.616097,0.7,0.03,CSP -electricity,geothermal,geothermal,capital,0.13,0.9,1363.238854,1363.238854,1363.238854,1363.238854,1363.238854,0.75,0.01, +# Electricity technology capital costs,,,,,,,,,,,,, +# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,,, +# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,,, +supplysector,subsector,technology,input-capital,fixed.charge.rate,capacity.factor,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology +electricity,coal,coal (conv pul),capital,0.13,0.85,730,730,800,850,898.4983353,0.75,0.01, +electricity,coal,coal (conv pul CCS),capital,0.13,0.8,1796.996671,1796.996671,1796.996671,1796.996671,1796.996671,0.6,0.05,coal (conv pul) +electricity,coal,coal (IGCC),capital,0.13,0.8,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.7,0.03, +electricity,coal,coal (IGCC CCS),capital,0.13,0.8,2044.85828,2044.85828,2044.85828,2044.85828,2044.85828,0.6,0.05,coal (IGCC) +electricity,gas,gas (steam/CT),capital,0.13,0.8,150,150,150,150,232.3702591,0.75,0.01, +electricity,gas,gas (CC),capital,0.13,0.85,320,320,320,320,325.3183628,0.75,0.01, +electricity,gas,gas (CC CCS),capital,0.13,0.8,650.6367256,650.6367256,650.6367256,650.6367256,650.6367256,0.6,0.05,gas (CC) +electricity,refined liquids,refined liquids (steam/CT),capital,0.13,0.8,232.3702591,232.3702591,232.3702591,232.3702591,232.3702591,0.75,0.01, +electricity,refined liquids,refined liquids (CC),capital,0.13,0.85,325.3183628,325.3183628,325.3183628,325.3183628,325.3183628,0.75,0.01, +electricity,refined liquids,refined liquids (CC CCS),capital,0.13,0.8,774.3493424,774.3493424,774.3493424,774.3493424,774.3493424,0.6,0.05,refined liquids (CC) +electricity,biomass,biomass (conv),capital,0.13,0.85,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.75,0.01, +electricity,biomass,biomass (conv CCS),capital,0.13,0.85,2385.667994,2385.667994,2385.667994,2385.667994,2385.667994,0.6,0.05,biomass (conv) +electricity,biomass,biomass (IGCC),capital,0.13,0.8,1858.962073,1858.962073,1858.962073,1858.962073,1858.962073,0.7,0.03, +electricity,biomass,biomass (IGCC CCS),capital,0.13,0.8,2741.969058,2741.969058,2741.969058,2741.969058,2741.969058,0.6,0.05,biomass (IGCC) +electricity,nuclear,Gen_II_LWR,capital,0.13,0.9,1650,1650,1650,1650,1704.048567,1,0, +electricity,nuclear,Gen_III,capital,0.13,0.9,1704.048567,1704.048567,1704.048567,1704.048567,1704.048567,0.75,0.01, +electricity,wind,wind,capital,0.13,0.37,642.2,494,380,619.6540244,619.6540244,0.7,0.03, +electricity,wind,wind_storage,capital,0.13,0.37,1548.04,1190.8,916,1796.996671,1796.996671,0.7,0.03,wind +electricity,solar,PV,capital,0.13,0.2,578.3437561,578.3437561,578.3437561,578.3437561,578.3437561,0.7,0.03, +electricity,solar,PV_storage,capital,0.13,0.2,1363.238854,1363.238854,1363.238854,1363.238854,1363.238854,0.7,0.03,PV +electricity,solar,CSP,capital,0.13,0.25,1487.169658,1487.169658,1487.169658,1487.169658,1487.169658,0.6,0.05, +electricity,solar,CSP_storage,capital,0.13,0.65,2478.616097,2478.616097,2478.616097,2478.616097,2478.616097,0.7,0.03,CSP +electricity,geothermal,geothermal,capital,0.13,0.9,1363.238854,1363.238854,1363.238854,1363.238854,1363.238854,0.75,0.01, elect_td_bld,rooftop_pv,rooftop_pv,capital,0.1,0.2,1456.186957,1456.186957,1456.186957,1456.186957,1456.186957,0.7,0.03, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital_adv.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital_adv.csv index 3cdfcb0e03..c632221b68 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital_adv.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital_adv.csv @@ -1,28 +1,28 @@ -# Electricity technology capital costs,,,,,,,,,,,,, -# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,,, -# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,,, -supplysector,subsector,technology,input-capital,fixed.charge.rate,capacity.factor,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology -electricity,coal,coal (conv pul),capital,0.13,0.85,730,730,800,850,898.4983353,0.75,0.01, -electricity,coal,coal (conv pul CCS),capital,0.13,0.8,1796.996671,1796.996671,1796.996671,1796.996671,1796.996671,0.6,0.05,coal (conv pul) -electricity,coal,coal (IGCC),capital,0.13,0.8,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.7,0.03, -electricity,coal,coal (IGCC CCS),capital,0.13,0.8,2044.85828,2044.85828,2044.85828,2044.85828,2044.85828,0.6,0.05,coal (IGCC) -electricity,gas,gas (steam/CT),capital,0.13,0.8,150,150,150,150,232.3702591,0.75,0.01, -electricity,gas,gas (CC),capital,0.13,0.85,320,320,320,320,325.3183628,0.75,0.01, -electricity,gas,gas (CC CCS),capital,0.13,0.8,650.6367256,650.6367256,650.6367256,650.6367256,650.6367256,0.6,0.05,gas (CC) -electricity,refined liquids,refined liquids (steam/CT),capital,0.13,0.8,232.3702591,232.3702591,232.3702591,232.3702591,232.3702591,0.75,0.01, -electricity,refined liquids,refined liquids (CC),capital,0.13,0.85,325.3183628,325.3183628,325.3183628,325.3183628,325.3183628,0.75,0.01, -electricity,refined liquids,refined liquids (CC CCS),capital,0.13,0.8,774.3493424,774.3493424,774.3493424,774.3493424,774.3493424,0.6,0.05,refined liquids (CC) -electricity,biomass,biomass (conv),capital,0.13,0.85,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.75,0.01, -electricity,biomass,biomass (conv CCS),capital,0.13,0.85,1996.284668,1996.284668,1996.284668,1996.284668,1996.284668,0.6,0.05,biomass (conv) -electricity,biomass,biomass (IGCC),capital,0.13,0.8,1858.962073,1858.962073,1858.962073,1858.962073,1858.962073,0.7,0.03, -electricity,biomass,biomass (IGCC CCS),capital,0.13,0.8,2537.630766,2537.630766,2537.630766,2537.630766,2537.630766,0.6,0.05,biomass (IGCC) -electricity,nuclear,Gen_II_LWR,capital,0.13,0.9,1650,1650,1650,1650,1704.048567,1,0, -electricity,nuclear,Gen_III,capital,0.13,0.9,1704.048567,1704.048567,1704.048567,1704.048567,1704.048567,0.70,0.03, -electricity,wind,wind,capital,0.13,0.37,642.2,494,380,619.6540244,619.6540244,0.6,0.05, -electricity,wind,wind_storage,capital,0.13,0.37,1548.04,1190.8,916,1642.083165,1642.083165,0.6,0.05,wind -electricity,solar,PV,capital,0.13,0.2,619.6540244,619.6540244,619.6540244,619.6540244,619.6540244,0.6,0.05, -electricity,solar,PV_storage,capital,0.13,0.2,1301.273451,1301.273451,1301.273451,1301.273451,1301.273451,0.6,0.05,PV -electricity,solar,CSP,capital,0.13,0.25,1487.169658,1487.169658,1487.169658,1487.169658,1487.169658,0.3,0.07, -electricity,solar,CSP_storage,capital,0.13,0.65,2478.616097,2478.616097,2478.616097,2478.616097,2478.616097,0.6,0.05,CSP -electricity,geothermal,geothermal,capital,0.13,0.9,1363.238854,1363.238854,1363.238854,1363.238854,1363.238854,0.7,0.03, -elect_td_bld,rooftop_pv,rooftop_pv,capital,0.1,0.2,1456.186957,1456.186957,1456.186957,1456.186957,1456.186957,0.6,0.05, +# Electricity technology capital costs,,,,,,,,,,,,, +# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,,, +# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,,, +supplysector,subsector,technology,input-capital,fixed.charge.rate,capacity.factor,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology +electricity,coal,coal (conv pul),capital,0.13,0.85,730,730,800,850,898.4983353,0.75,0.01, +electricity,coal,coal (conv pul CCS),capital,0.13,0.8,1796.996671,1796.996671,1796.996671,1796.996671,1796.996671,0.6,0.05,coal (conv pul) +electricity,coal,coal (IGCC),capital,0.13,0.8,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.7,0.03, +electricity,coal,coal (IGCC CCS),capital,0.13,0.8,2044.85828,2044.85828,2044.85828,2044.85828,2044.85828,0.6,0.05,coal (IGCC) +electricity,gas,gas (steam/CT),capital,0.13,0.8,150,150,150,150,232.3702591,0.75,0.01, +electricity,gas,gas (CC),capital,0.13,0.85,320,320,320,320,325.3183628,0.75,0.01, +electricity,gas,gas (CC CCS),capital,0.13,0.8,650.6367256,650.6367256,650.6367256,650.6367256,650.6367256,0.6,0.05,gas (CC) +electricity,refined liquids,refined liquids (steam/CT),capital,0.13,0.8,232.3702591,232.3702591,232.3702591,232.3702591,232.3702591,0.75,0.01, +electricity,refined liquids,refined liquids (CC),capital,0.13,0.85,325.3183628,325.3183628,325.3183628,325.3183628,325.3183628,0.75,0.01, +electricity,refined liquids,refined liquids (CC CCS),capital,0.13,0.8,774.3493424,774.3493424,774.3493424,774.3493424,774.3493424,0.6,0.05,refined liquids (CC) +electricity,biomass,biomass (conv),capital,0.13,0.85,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.75,0.01, +electricity,biomass,biomass (conv CCS),capital,0.13,0.85,1996.284668,1996.284668,1996.284668,1996.284668,1996.284668,0.6,0.05,biomass (conv) +electricity,biomass,biomass (IGCC),capital,0.13,0.8,1858.962073,1858.962073,1858.962073,1858.962073,1858.962073,0.7,0.03, +electricity,biomass,biomass (IGCC CCS),capital,0.13,0.8,2537.630766,2537.630766,2537.630766,2537.630766,2537.630766,0.6,0.05,biomass (IGCC) +electricity,nuclear,Gen_II_LWR,capital,0.13,0.9,1650,1650,1650,1650,1704.048567,1,0, +electricity,nuclear,Gen_III,capital,0.13,0.9,1704.048567,1704.048567,1704.048567,1704.048567,1704.048567,0.70,0.03, +electricity,wind,wind,capital,0.13,0.37,642.2,494,380,619.6540244,619.6540244,0.6,0.05, +electricity,wind,wind_storage,capital,0.13,0.37,1548.04,1190.8,916,1642.083165,1642.083165,0.6,0.05,wind +electricity,solar,PV,capital,0.13,0.2,619.6540244,619.6540244,619.6540244,619.6540244,619.6540244,0.6,0.05, +electricity,solar,PV_storage,capital,0.13,0.2,1301.273451,1301.273451,1301.273451,1301.273451,1301.273451,0.6,0.05,PV +electricity,solar,CSP,capital,0.13,0.25,1487.169658,1487.169658,1487.169658,1487.169658,1487.169658,0.3,0.07, +electricity,solar,CSP_storage,capital,0.13,0.65,2478.616097,2478.616097,2478.616097,2478.616097,2478.616097,0.6,0.05,CSP +electricity,geothermal,geothermal,capital,0.13,0.9,1363.238854,1363.238854,1363.238854,1363.238854,1363.238854,0.7,0.03, +elect_td_bld,rooftop_pv,rooftop_pv,capital,0.1,0.2,1456.186957,1456.186957,1456.186957,1456.186957,1456.186957,0.6,0.05, diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital_low.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital_low.csv index ce0ba62452..25940318b7 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital_low.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_capital_low.csv @@ -1,28 +1,28 @@ -# Electricity technology capital costs,,,,,,,,,,,,, -# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,,, -# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,,, -supplysector,subsector,technology,input-capital,fixed.charge.rate,capacity.factor,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology -electricity,coal,coal (conv pul),capital,0.13,0.85,730,730,800,850,898.4983353,0.75,0.01, -electricity,coal,coal (conv pul CCS),capital,0.13,0.8,1796.996671,1796.996671,1796.996671,1796.996671,1796.996671,0.6,0.05,coal (conv pul) -electricity,coal,coal (IGCC),capital,0.13,0.8,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.7,0.03, -electricity,coal,coal (IGCC CCS),capital,0.13,0.8,2044.85828,2044.85828,2044.85828,2044.85828,2044.85828,0.6,0.05,coal (IGCC) -electricity,gas,gas (steam/CT),capital,0.13,0.8,150,150,150,150,232.3702591,0.75,0.01, -electricity,gas,gas (CC),capital,0.13,0.85,320,320,320,320,325.3183628,0.75,0.01, -electricity,gas,gas (CC CCS),capital,0.13,0.8,650.6367256,650.6367256,650.6367256,650.6367256,650.6367256,0.6,0.05,gas (CC) -electricity,refined liquids,refined liquids (steam/CT),capital,0.13,0.8,232.3702591,232.3702591,232.3702591,232.3702591,232.3702591,0.75,0.01, -electricity,refined liquids,refined liquids (CC),capital,0.13,0.85,325.3183628,325.3183628,325.3183628,325.3183628,325.3183628,0.75,0.01, -electricity,refined liquids,refined liquids (CC CCS),capital,0.13,0.8,774.3493424,774.3493424,774.3493424,774.3493424,774.3493424,0.6,0.05,refined liquids (CC) -electricity,biomass,biomass (conv),capital,0.13,0.85,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.75,0.01, -electricity,biomass,biomass (conv CCS),capital,0.13,0.85,1996.284668,1996.284668,1996.284668,1996.284668,1996.284668,0.6,0.05,biomass (conv) -electricity,biomass,biomass (IGCC),capital,0.13,0.8,1858.962073,1858.962073,1858.962073,1858.962073,1858.962073,0.7,0.03, -electricity,biomass,biomass (IGCC CCS),capital,0.13,0.8,2537.630766,2537.630766,2537.630766,2537.630766,2537.630766,0.6,0.05,biomass (IGCC) -electricity,nuclear,Gen_II_LWR,capital,0.13,0.9,1650,1650,1650,1650,1704.048567,1,0, -electricity,nuclear,Gen_III,capital,0.13,0.9,1704.048567,1704.048567,1704.048567,1704.048567,1704.048567,1,0, -electricity,wind,wind,capital,0.13,0.37,642.2,494,380,619.6540244,619.6540244,0.75,0.01, -electricity,wind,wind_storage,capital,0.13,0.37,1548.04,1190.8,916,1642.083165,1642.083165,0.75,0.01,wind -electricity,solar,PV,capital,0.13,0.2,619.6540244,619.6540244,619.6540244,619.6540244,619.6540244,0.75,0.01, -electricity,solar,PV_storage,capital,0.13,0.2,1301.273451,1301.273451,1301.273451,1301.273451,1301.273451,0.75,0.01,PV -electricity,solar,CSP,capital,0.13,0.25,1487.169658,1487.169658,1487.169658,1487.169658,1487.169658,0.7,0.03, -electricity,solar,CSP_storage,capital,0.13,0.65,2478.616097,2478.616097,2478.616097,2478.616097,2478.616097,0.75,0.01,CSP -electricity,geothermal,geothermal,capital,0.13,0.9,1363.238854,1363.238854,1363.238854,1363.238854,1363.238854,1,0, -elect_td_bld,rooftop_pv,rooftop_pv,capital,0.1,0.2,1456.186957,1456.186957,1456.186957,1456.186957,1456.186957,0.75,0.01, +# Electricity technology capital costs,,,,,,,,,,,,, +# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,,, +# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,,, +supplysector,subsector,technology,input-capital,fixed.charge.rate,capacity.factor,1971,1990,2005,2010,2015,improvement.max,improvement.rate,improvement.shadow.technology +electricity,coal,coal (conv pul),capital,0.13,0.85,730,730,800,850,898.4983353,0.75,0.01, +electricity,coal,coal (conv pul CCS),capital,0.13,0.8,1796.996671,1796.996671,1796.996671,1796.996671,1796.996671,0.6,0.05,coal (conv pul) +electricity,coal,coal (IGCC),capital,0.13,0.8,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.7,0.03, +electricity,coal,coal (IGCC CCS),capital,0.13,0.8,2044.85828,2044.85828,2044.85828,2044.85828,2044.85828,0.6,0.05,coal (IGCC) +electricity,gas,gas (steam/CT),capital,0.13,0.8,150,150,150,150,232.3702591,0.75,0.01, +electricity,gas,gas (CC),capital,0.13,0.85,320,320,320,320,325.3183628,0.75,0.01, +electricity,gas,gas (CC CCS),capital,0.13,0.8,650.6367256,650.6367256,650.6367256,650.6367256,650.6367256,0.6,0.05,gas (CC) +electricity,refined liquids,refined liquids (steam/CT),capital,0.13,0.8,232.3702591,232.3702591,232.3702591,232.3702591,232.3702591,0.75,0.01, +electricity,refined liquids,refined liquids (CC),capital,0.13,0.85,325.3183628,325.3183628,325.3183628,325.3183628,325.3183628,0.75,0.01, +electricity,refined liquids,refined liquids (CC CCS),capital,0.13,0.8,774.3493424,774.3493424,774.3493424,774.3493424,774.3493424,0.6,0.05,refined liquids (CC) +electricity,biomass,biomass (conv),capital,0.13,0.85,1239.308049,1239.308049,1239.308049,1239.308049,1239.308049,0.75,0.01, +electricity,biomass,biomass (conv CCS),capital,0.13,0.85,1996.284668,1996.284668,1996.284668,1996.284668,1996.284668,0.6,0.05,biomass (conv) +electricity,biomass,biomass (IGCC),capital,0.13,0.8,1858.962073,1858.962073,1858.962073,1858.962073,1858.962073,0.7,0.03, +electricity,biomass,biomass (IGCC CCS),capital,0.13,0.8,2537.630766,2537.630766,2537.630766,2537.630766,2537.630766,0.6,0.05,biomass (IGCC) +electricity,nuclear,Gen_II_LWR,capital,0.13,0.9,1650,1650,1650,1650,1704.048567,1,0, +electricity,nuclear,Gen_III,capital,0.13,0.9,1704.048567,1704.048567,1704.048567,1704.048567,1704.048567,1,0, +electricity,wind,wind,capital,0.13,0.37,642.2,494,380,619.6540244,619.6540244,0.75,0.01, +electricity,wind,wind_storage,capital,0.13,0.37,1548.04,1190.8,916,1642.083165,1642.083165,0.75,0.01,wind +electricity,solar,PV,capital,0.13,0.2,619.6540244,619.6540244,619.6540244,619.6540244,619.6540244,0.75,0.01, +electricity,solar,PV_storage,capital,0.13,0.2,1301.273451,1301.273451,1301.273451,1301.273451,1301.273451,0.75,0.01,PV +electricity,solar,CSP,capital,0.13,0.25,1487.169658,1487.169658,1487.169658,1487.169658,1487.169658,0.7,0.03, +electricity,solar,CSP_storage,capital,0.13,0.65,2478.616097,2478.616097,2478.616097,2478.616097,2478.616097,0.75,0.01,CSP +electricity,geothermal,geothermal,capital,0.13,0.9,1363.238854,1363.238854,1363.238854,1363.238854,1363.238854,1,0, +elect_td_bld,rooftop_pv,rooftop_pv,capital,0.1,0.2,1456.186957,1456.186957,1456.186957,1456.186957,1456.186957,0.75,0.01, diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_co2capture.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_co2capture.csv index d9d3c733b5..d2cf27dce9 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_co2capture.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_co2capture.csv @@ -1,8 +1,8 @@ -# Electricity technology capture fractions,,,,, -supplysector,subsector,technology,1971,2020,2100 -electricity,coal,coal (conv pul CCS),0.85,0.85,0.95 -electricity,coal,coal (IGCC CCS),0.85,0.85,0.95 -electricity,gas,gas (CC CCS),0.85,0.85,0.95 -electricity,refined liquids,refined liquids (CC CCS),0.85,0.85,0.95 -electricity,biomass,biomass (conv CCS),0.85,0.85,0.95 -electricity,biomass,biomass (IGCC CCS),0.85,0.85,0.95 +# Electricity technology capture fractions,,,,, +supplysector,subsector,technology,1971,2020,2100 +electricity,coal,coal (conv pul CCS),0.85,0.85,0.95 +electricity,coal,coal (IGCC CCS),0.85,0.85,0.95 +electricity,gas,gas (CC CCS),0.85,0.85,0.95 +electricity,refined liquids,refined liquids (CC CCS),0.85,0.85,0.95 +electricity,biomass,biomass (conv CCS),0.85,0.85,0.95 +electricity,biomass,biomass (IGCC CCS),0.85,0.85,0.95 diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_eff.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_eff.csv index 41af06bbc9..424875de9a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_eff.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_eff.csv @@ -1,31 +1,31 @@ -# Electric sector default efficiencies,,,,,,,,,,,, -# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,, -# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,, -supplysector,subsector,technology,minicam.energy.input,1971,1990,2005,2010,2015,2100,improvement.max,improvement.rate,improvement.shadow.technology -electricity,coal,coal (conv pul),regional coal,0.3,0.35,0.391,0.396656458,0.396656458,,1.462222505,0.015, -electricity,coal,coal (conv pul CCS),regional coal,0.29227318,0.29227318,0.29227318,0.29227318,0.29227318,,-0.256609245,0.05,coal (conv pul) -electricity,coal,coal (IGCC),regional coal,0.426,0.426,0.426,0.407094786,0.407094786,,1.473858228,0.02, -electricity,coal,coal (IGCC CCS),regional coal,0.356329323,0.356329323,0.356329323,0.334026491,0.334026491,,-0.149688726,0.05,coal (IGCC) -electricity,gas,gas (steam/CT),wholesale gas,0.25,0.3,0.33,0.376667869,0.376667869,,1.433623743,0.01, -electricity,gas,gas (CC),wholesale gas,0.45,0.45,0.5,0.57608027,0.565001803,,1.292031275,0.015, -electricity,gas,gas (CC CCS),wholesale gas,0.487201482,0.487201482,0.487201482,0.465295603,0.465295603,,-0.10745857,0.05,gas (CC) -electricity,refined liquids,refined liquids (steam/CT),refined liquids industrial,0.3,0.35,0.384,0.362756407,0.362756407,,1.488602239,0.01, -electricity,refined liquids,refined liquids (CC),refined liquids industrial,0.426,0.426,0.426,0.554803917,0.554803917,,1.315780184,0.015, -electricity,refined liquids,refined liquids (CC CCS),refined liquids industrial,0.36,0.36,0.36,0.417573266,0.419929971,,-0.119067472,0.05,refined liquids (CC) -electricity,biomass,biomass (conv),regional biomass,0.3,0.35,0.382,0.26625,0.26625,,1.596244131,0.015, -electricity,biomass,biomass (conv CCS),regional biomass,0.196184211,0.196184211,0.196184211,0.196184211,0.196184211,,-0.382293763,0.05,biomass (conv) -electricity,biomass,biomass (IGCC),regional biomass,0.416,0.416,0.416,0.3195,0.3195,,1.564945227,0.02, -electricity,biomass,biomass (IGCC CCS),regional biomass,0.356852457,0.356852457,0.356852457,0.262153846,0.262153846,,-0.1907277,0.05,biomass (IGCC) -electricity,nuclear,Gen_II_LWR,nuclearFuelGenII,0.333,0.333,0.333,0.333,0.333,0.333,,, -electricity,nuclear,Gen_III,nuclearFuelGenIII,0.333,0.333,0.333,0.333,0.333,0.333,,, -electricity,wind,wind,onshore wind resource,1,1,1,1,1,1,,, -electricity,wind,wind_storage,onshore wind resource,0.96,0.96,0.96,0.96,0.96,0.96,,, -electricity,solar,PV,global solar resource,1,1,1,1,1,1,,, -electricity,solar,PV,backup_electricity,1,1,1,1,1,1,,, -electricity,solar,PV_storage,global solar resource,0.96,0.96,0.96,0.96,0.96,0.96,,, -electricity,solar,CSP,global solar resource,1,1,1,1,1,1,,, -electricity,solar,CSP,csp_backup,1,1,1,1,1,1,,, -electricity,solar,CSP_storage,global solar resource,1,1,1,1,1,1,,, -electricity,geothermal,geothermal,geothermal,0.1,0.1,0.1,0.1,0.1,0.1,,, -elect_td_bld,rooftop_pv,rooftop_pv,distributed_solar,1,1,1,1,1,1,,, +# Electric sector default efficiencies,,,,,,,,,,,, +# Future improvement is based on the maximum % reduction that the literature deems likely and a rate corresponding to the maturity level of the technology,,,,,,,,,,,, +# Note that some technologies are the same as another with additional equipment (i.e. CCS) for those technologies the improvement is on the additional equipment,,,,,,,,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,1990,2005,2010,2015,2100,improvement.max,improvement.rate,improvement.shadow.technology +electricity,coal,coal (conv pul),regional coal,0.3,0.35,0.391,0.396656458,0.396656458,,1.462222505,0.015, +electricity,coal,coal (conv pul CCS),regional coal,0.29227318,0.29227318,0.29227318,0.29227318,0.29227318,,-0.256609245,0.05,coal (conv pul) +electricity,coal,coal (IGCC),regional coal,0.426,0.426,0.426,0.407094786,0.407094786,,1.473858228,0.02, +electricity,coal,coal (IGCC CCS),regional coal,0.356329323,0.356329323,0.356329323,0.334026491,0.334026491,,-0.149688726,0.05,coal (IGCC) +electricity,gas,gas (steam/CT),wholesale gas,0.25,0.3,0.33,0.376667869,0.376667869,,1.433623743,0.01, +electricity,gas,gas (CC),wholesale gas,0.45,0.45,0.5,0.57608027,0.565001803,,1.292031275,0.015, +electricity,gas,gas (CC CCS),wholesale gas,0.487201482,0.487201482,0.487201482,0.465295603,0.465295603,,-0.10745857,0.05,gas (CC) +electricity,refined liquids,refined liquids (steam/CT),refined liquids industrial,0.3,0.35,0.384,0.362756407,0.362756407,,1.488602239,0.01, +electricity,refined liquids,refined liquids (CC),refined liquids industrial,0.426,0.426,0.426,0.554803917,0.554803917,,1.315780184,0.015, +electricity,refined liquids,refined liquids (CC CCS),refined liquids industrial,0.36,0.36,0.36,0.417573266,0.419929971,,-0.119067472,0.05,refined liquids (CC) +electricity,biomass,biomass (conv),regional biomass,0.3,0.35,0.382,0.26625,0.26625,,1.596244131,0.015, +electricity,biomass,biomass (conv CCS),regional biomass,0.196184211,0.196184211,0.196184211,0.196184211,0.196184211,,-0.382293763,0.05,biomass (conv) +electricity,biomass,biomass (IGCC),regional biomass,0.416,0.416,0.416,0.3195,0.3195,,1.564945227,0.02, +electricity,biomass,biomass (IGCC CCS),regional biomass,0.356852457,0.356852457,0.356852457,0.262153846,0.262153846,,-0.1907277,0.05,biomass (IGCC) +electricity,nuclear,Gen_II_LWR,nuclearFuelGenII,0.333,0.333,0.333,0.333,0.333,0.333,,, +electricity,nuclear,Gen_III,nuclearFuelGenIII,0.333,0.333,0.333,0.333,0.333,0.333,,, +electricity,wind,wind,onshore wind resource,1,1,1,1,1,1,,, +electricity,wind,wind_storage,onshore wind resource,0.96,0.96,0.96,0.96,0.96,0.96,,, +electricity,solar,PV,global solar resource,1,1,1,1,1,1,,, +electricity,solar,PV,backup_electricity,1,1,1,1,1,1,,, +electricity,solar,PV_storage,global solar resource,0.96,0.96,0.96,0.96,0.96,0.96,,, +electricity,solar,CSP,global solar resource,1,1,1,1,1,1,,, +electricity,solar,CSP,csp_backup,1,1,1,1,1,1,,, +electricity,solar,CSP_storage,global solar resource,1,1,1,1,1,1,,, +electricity,geothermal,geothermal,geothermal,0.1,0.1,0.1,0.1,0.1,0.1,,, +elect_td_bld,rooftop_pv,rooftop_pv,distributed_solar,1,1,1,1,1,1,,, elect_td_bld,rooftop_pv,rooftop_pv,backup_electricity,1,1,1,1,1,1,,, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_interp.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_interp.csv index a6d61986b1..f8a7f55d8c 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_interp.csv @@ -1,4 +1,4 @@ -# electricity technology share weight interpolation,,,,,, -supplysector,subsector,technology,apply.to,from.year,to.year,interpolation.function -electricity,gas,gas (CC),share-weight,final-calibration-year,end-year,s-curve +# electricity technology share weight interpolation,,,,,, +supplysector,subsector,technology,apply.to,from.year,to.year,interpolation.function +electricity,gas,gas (CC),share-weight,final-calibration-year,end-year,s-curve electricity,refined liquids,refined liquids (CC),share-weight,final-calibration-year,end-year,s-curve \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_keyword.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_keyword.csv index 6e3b91fce4..c6f20bf715 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_keyword.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_keyword.csv @@ -1,27 +1,27 @@ -# Electricity technology shareweights,,,, -supplysector,subsector,technology,primary.renewable,average.fossil.efficiency -electricity,coal,coal (conv pul),,1 -electricity,coal,coal (conv pul CCS),,1 -electricity,coal,coal (IGCC),,1 -electricity,coal,coal (IGCC CCS),,1 -electricity,gas,gas (steam/CT),,1 -electricity,gas,gas (CC),,1 -electricity,gas,gas (CC CCS),,1 -electricity,refined liquids,refined liquids (steam/CT),,1 -electricity,refined liquids,refined liquids (CC),,1 -electricity,refined liquids,refined liquids (CC CCS),,1 -electricity,biomass,biomass (conv),,1 -electricity,biomass,biomass (conv CCS),,1 -electricity,biomass,biomass (IGCC),,1 -electricity,biomass,biomass (IGCC CCS),,1 -electricity,nuclear,Gen_II_LWR,nuclear-elect, -electricity,nuclear,Gen_III,nuclear-elect, -electricity,hydro,hydro,hydro-elect, -electricity,wind,wind,wind-elect, -electricity,wind,wind_storage,wind-elect, -electricity,solar,PV,solar-elect, -electricity,solar,PV_storage,solar-elect, -electricity,solar,CSP,solar-elect, -electricity,solar,CSP_storage,solar-elect, -electricity,geothermal,geothermal,geothermal-elect, -elect_td_bld,rooftop_pv,rooftop_pv,solar-elect, +# Electricity technology shareweights,,,, +supplysector,subsector,technology,primary.renewable,average.fossil.efficiency +electricity,coal,coal (conv pul),,1 +electricity,coal,coal (conv pul CCS),,1 +electricity,coal,coal (IGCC),,1 +electricity,coal,coal (IGCC CCS),,1 +electricity,gas,gas (steam/CT),,1 +electricity,gas,gas (CC),,1 +electricity,gas,gas (CC CCS),,1 +electricity,refined liquids,refined liquids (steam/CT),,1 +electricity,refined liquids,refined liquids (CC),,1 +electricity,refined liquids,refined liquids (CC CCS),,1 +electricity,biomass,biomass (conv),,1 +electricity,biomass,biomass (conv CCS),,1 +electricity,biomass,biomass (IGCC),,1 +electricity,biomass,biomass (IGCC CCS),,1 +electricity,nuclear,Gen_II_LWR,nuclear-elect, +electricity,nuclear,Gen_III,nuclear-elect, +electricity,hydro,hydro,hydro-elect, +electricity,wind,wind,wind-elect, +electricity,wind,wind_storage,wind-elect, +electricity,solar,PV,solar-elect, +electricity,solar,PV_storage,solar-elect, +electricity,solar,CSP,solar-elect, +electricity,solar,CSP_storage,solar-elect, +electricity,geothermal,geothermal,geothermal-elect, +elect_td_bld,rooftop_pv,rooftop_pv,solar-elect, diff --git a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_retirement.csv b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_retirement.csv index db5fa74b92..1c387a5718 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.globaltech_retirement.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.globaltech_retirement.csv @@ -1,35 +1,35 @@ -# Electricity technology retirement parameters,,,,,,,,, -supplysector,subsector,technology,year,lifetime,shutdown.rate,half.life,steepness,median.shutdown.point,profit.shutdown.steepness -electricity,coal,coal (conv pul),final-calibration-year,60,,30,0.1,-0.1,6 -electricity,gas,gas (steam/CT),final-calibration-year,60,,30,0.1,-0.1,6 -electricity,gas,gas (CC),final-calibration-year,60,,30,0.1,-0.1,6 -electricity,refined liquids,refined liquids (steam/CT),final-calibration-year,60,,30,0.1,-0.5,6 -electricity,biomass,biomass (conv),final-calibration-year,60,,30,0.1,-0.1,6 -electricity,nuclear,Gen_II_LWR,final-historical-year,60,,30,0.1,-0.1,6 -electricity,wind,wind,final-calibration-year,30,,,,, -electricity,solar,PV,final-calibration-year,30,,,,, -electricity,solar,CSP,final-calibration-year,30,,,,, -electricity,geothermal,geothermal,final-calibration-year,30,,,,-0.1,6 -electricity,coal,coal (conv pul),initial-future-year,60,,,,-0.1,6 -electricity,coal,coal (conv pul CCS),initial-future-year,60,,,,-0.1,6 -electricity,coal,coal (IGCC),initial-future-year,60,,,,-0.1,6 -electricity,coal,coal (IGCC CCS),initial-future-year,60,,,,-0.1,6 -electricity,gas,gas (steam/CT),initial-future-year,45,,,,-0.1,6 -electricity,gas,gas (CC),initial-future-year,45,,,,-0.1,6 -electricity,gas,gas (CC CCS),initial-future-year,45,,,,-0.1,6 -electricity,refined liquids,refined liquids (steam/CT),initial-future-year,45,,,,-0.5,6 -electricity,refined liquids,refined liquids (CC),initial-future-year,45,,,,-0.1,6 -electricity,refined liquids,refined liquids (CC CCS),initial-future-year,45,,,,-0.1,6 -electricity,biomass,biomass (conv),initial-future-year,60,,,,-0.1,6 -electricity,biomass,biomass (conv CCS),initial-future-year,60,,,,-0.1,6 -electricity,biomass,biomass (IGCC),initial-future-year,60,,,,-0.1,6 -electricity,biomass,biomass (IGCC CCS),initial-future-year,60,,,,-0.1,6 -electricity,nuclear,Gen_III,initial-nonhistorical-year,60,,,,-0.1,6 -electricity,wind,wind,initial-future-year,30,,,,, -electricity,wind,wind_storage,initial-future-year,30,,,,, -electricity,solar,PV,initial-future-year,30,,,,, -electricity,solar,PV_storage,initial-future-year,30,,,,, -electricity,solar,CSP,initial-future-year,30,,,,, -electricity,solar,CSP_storage,initial-future-year,30,,,,, -electricity,geothermal,geothermal,initial-future-year,30,,,,-0.1,6 - +# Electricity technology retirement parameters,,,,,,,,, +supplysector,subsector,technology,year,lifetime,shutdown.rate,half.life,steepness,median.shutdown.point,profit.shutdown.steepness +electricity,coal,coal (conv pul),final-calibration-year,60,,30,0.1,-0.1,6 +electricity,gas,gas (steam/CT),final-calibration-year,60,,30,0.1,-0.1,6 +electricity,gas,gas (CC),final-calibration-year,60,,30,0.1,-0.1,6 +electricity,refined liquids,refined liquids (steam/CT),final-calibration-year,60,,30,0.1,-0.5,6 +electricity,biomass,biomass (conv),final-calibration-year,60,,30,0.1,-0.1,6 +electricity,nuclear,Gen_II_LWR,final-historical-year,60,,30,0.1,-0.1,6 +electricity,wind,wind,final-calibration-year,30,,,,, +electricity,solar,PV,final-calibration-year,30,,,,, +electricity,solar,CSP,final-calibration-year,30,,,,, +electricity,geothermal,geothermal,final-calibration-year,30,,,,-0.1,6 +electricity,coal,coal (conv pul),initial-future-year,60,,,,-0.1,6 +electricity,coal,coal (conv pul CCS),initial-future-year,60,,,,-0.1,6 +electricity,coal,coal (IGCC),initial-future-year,60,,,,-0.1,6 +electricity,coal,coal (IGCC CCS),initial-future-year,60,,,,-0.1,6 +electricity,gas,gas (steam/CT),initial-future-year,45,,,,-0.1,6 +electricity,gas,gas (CC),initial-future-year,45,,,,-0.1,6 +electricity,gas,gas (CC CCS),initial-future-year,45,,,,-0.1,6 +electricity,refined liquids,refined liquids (steam/CT),initial-future-year,45,,,,-0.5,6 +electricity,refined liquids,refined liquids (CC),initial-future-year,45,,,,-0.1,6 +electricity,refined liquids,refined liquids (CC CCS),initial-future-year,45,,,,-0.1,6 +electricity,biomass,biomass (conv),initial-future-year,60,,,,-0.1,6 +electricity,biomass,biomass (conv CCS),initial-future-year,60,,,,-0.1,6 +electricity,biomass,biomass (IGCC),initial-future-year,60,,,,-0.1,6 +electricity,biomass,biomass (IGCC CCS),initial-future-year,60,,,,-0.1,6 +electricity,nuclear,Gen_III,initial-nonhistorical-year,60,,,,-0.1,6 +electricity,wind,wind,initial-future-year,30,,,,, +electricity,wind,wind_storage,initial-future-year,30,,,,, +electricity,solar,PV,initial-future-year,30,,,,, +electricity,solar,PV_storage,initial-future-year,30,,,,, +electricity,solar,CSP,initial-future-year,30,,,,, +electricity,solar,CSP_storage,initial-future-year,30,,,,, +electricity,geothermal,geothermal,initial-future-year,30,,,,-0.1,6 + diff --git a/input/gcam-data-system/energy-data/assumptions/A23.sector.csv b/input/gcam-data-system/energy-data/assumptions/A23.sector.csv index 69a151f084..928460548b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.sector.csv @@ -1,4 +1,4 @@ -# Electricity sector - supplysector characteristics,,,,,,, -supplysector,output.unit,input.unit,price.unit,logit.exponent,electricity.reserve.margin,average.grid.capacity.factor,logit.type -electricity,EJ,EJ,1975$/GJ,-3,0.15,0.6, +# Electricity sector - supplysector characteristics,,,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,electricity.reserve.margin,average.grid.capacity.factor,logit.type +electricity,EJ,EJ,1975$/GJ,-3,0.15,0.6, elect_td_bld,EJ,EJ,1975$/GJ,-6,0.15,0.6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A23.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A23.subsector_interp.csv index d3f1eef8a6..903b167c91 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.subsector_interp.csv @@ -1,14 +1,14 @@ -# Electricity subsector shareweight interpolation,,,,,, -supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function -electricity,coal,share-weight,final-calibration-year,2300,1,s-curve -electricity,gas,share-weight,final-calibration-year,2300,1,s-curve -electricity,refined liquids,share-weight,final-calibration-year,2100,,linear -electricity,biomass,share-weight,final-calibration-year,2100,,linear -electricity,nuclear,share-weight,final-calibration-year,2015,,linear -electricity,nuclear,share-weight,2020,2035,,linear -electricity,nuclear,share-weight,2035,2050,,linear -electricity,nuclear,share-weight,2050,2300,1,s-curve -electricity,wind,share-weight,final-calibration-year,2100,,linear -electricity,solar,share-weight,final-calibration-year,2100,,linear -electricity,geothermal,share-weight,final-calibration-year,2100,,linear -elect_td_bld,rooftop_pv,share-weight,final-calibration-year,2100,1,linear +# Electricity subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +electricity,coal,share-weight,final-calibration-year,2300,1,s-curve +electricity,gas,share-weight,final-calibration-year,2300,1,s-curve +electricity,refined liquids,share-weight,final-calibration-year,2100,,linear +electricity,biomass,share-weight,final-calibration-year,2100,,linear +electricity,nuclear,share-weight,final-calibration-year,2015,,linear +electricity,nuclear,share-weight,2020,2035,,linear +electricity,nuclear,share-weight,2035,2050,,linear +electricity,nuclear,share-weight,2050,2300,1,s-curve +electricity,wind,share-weight,final-calibration-year,2100,,linear +electricity,solar,share-weight,final-calibration-year,2100,,linear +electricity,geothermal,share-weight,final-calibration-year,2100,,linear +elect_td_bld,rooftop_pv,share-weight,final-calibration-year,2100,1,linear diff --git a/input/gcam-data-system/energy-data/assumptions/A23.subsector_interp_R.csv b/input/gcam-data-system/energy-data/assumptions/A23.subsector_interp_R.csv index 58eeec8340..5e7d7c8fc1 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.subsector_interp_R.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.subsector_interp_R.csv @@ -1,35 +1,35 @@ -# Region-specific electric subsector shareweights interpolation rules by GCAM4 region,,,,,,, -# WARNGING: These are hard coding GCAM 4 region names. If the region definitions change this file may not match.,,,,,,, -region,supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function -USA,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -Africa_Eastern,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -Africa_Northern,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Africa_Southern,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Africa_Western,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Australia_NZ,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -Brazil,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Canada,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -Central America and Caribbean,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -Central Asia,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -China,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -EU-12,electricity,refined liquids,share-weight,final-calibration-year,2100,0.309,linear -EU-15,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -Europe_Eastern,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -Europe_Non_EU,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -European Free Trade Association,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -India,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear -Indonesia,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear -Japan,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Mexico,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Middle East,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Pakistan,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear -Russia,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -South Africa,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -South America_Northern,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -South America_Southern,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -South Asia,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear -South Korea,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed -Southeast Asia,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear -Taiwan,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Argentina,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear -Colombia,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +# Region-specific electric subsector shareweights interpolation rules by GCAM4 region,,,,,,, +# WARNGING: These are hard coding GCAM 4 region names. If the region definitions change this file may not match.,,,,,,, +region,supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +USA,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +Africa_Eastern,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +Africa_Northern,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Africa_Southern,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Africa_Western,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Australia_NZ,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +Brazil,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Canada,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +Central America and Caribbean,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +Central Asia,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +China,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +EU-12,electricity,refined liquids,share-weight,final-calibration-year,2100,0.309,linear +EU-15,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +Europe_Eastern,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +Europe_Non_EU,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +European Free Trade Association,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +India,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear +Indonesia,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear +Japan,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Mexico,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Middle East,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Pakistan,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear +Russia,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +South Africa,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +South America_Northern,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +South America_Southern,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +South Asia,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear +South Korea,electricity,refined liquids,share-weight,final-calibration-year,2100,,fixed +Southeast Asia,electricity,refined liquids,share-weight,final-calibration-year,2100,0.2,linear +Taiwan,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Argentina,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear +Colombia,electricity,refined liquids,share-weight,final-calibration-year,2100,1,linear diff --git a/input/gcam-data-system/energy-data/assumptions/A23.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A23.subsector_logit.csv index fb2d00243f..752f5c71f6 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.subsector_logit.csv @@ -1 +1,12 @@ -# Electric sector subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type electricity,coal,-10, electricity,gas,-10, electricity,refined liquids,-10, electricity,biomass,-10, electricity,nuclear,-6, electricity,hydro,-6, electricity,wind,-6, electricity,solar,-6, electricity,geothermal,-6, elect_td_bld,rooftop_pv,-6, \ No newline at end of file +# Electric sector subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +electricity,coal,-10, +electricity,gas,-10, +electricity,refined liquids,-10, +electricity,biomass,-10, +electricity,nuclear,-6, +electricity,hydro,-6, +electricity,wind,-6, +electricity,solar,-6, +electricity,geothermal,-6, +elect_td_bld,rooftop_pv,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt.csv index 1609a56efc..2a331716ba 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt.csv @@ -1,12 +1,12 @@ -# Electricity subsector logit exponents,,,, -supplysector,subsector,year.fillout,year,share.weight -electricity,coal,start-year,,1 -electricity,gas,start-year,,1 -electricity,biomass,2100,,1 -electricity,nuclear,start-year,,0 -electricity,hydro,start-year,,0 -electricity,wind,2100,,1 -electricity,solar,2100,,1 -electricity,geothermal,2100,,1 -elect_td_bld,rooftop_pv,start-year,,0 -elect_td_bld,rooftop_pv,2100,,1 +# Electricity subsector logit exponents,,,, +supplysector,subsector,year.fillout,year,share.weight +electricity,coal,start-year,,1 +electricity,gas,start-year,,1 +electricity,biomass,2100,,1 +electricity,nuclear,start-year,,0 +electricity,hydro,start-year,,0 +electricity,wind,2100,,1 +electricity,solar,2100,,1 +electricity,geothermal,2100,,1 +elect_td_bld,rooftop_pv,start-year,,0 +elect_td_bld,rooftop_pv,2100,,1 diff --git a/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt_nuc_R.csv b/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt_nuc_R.csv index 0332e23032..e909db9499 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt_nuc_R.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt_nuc_R.csv @@ -1,60 +1,60 @@ -#Region-specific nuclear electric subsector shareweights by GCAM3 region,,,,,,, -region_GCAM3,iso,supplysector,subsector,2015,2020,2035,2050 -USA,,electricity,nuclear,0.8,0.8,1,1 -Canada,,electricity,nuclear,0.8,0.8,1.25,1.25 -Western Europe,,electricity,nuclear,0.8,0.8,0.8,1 -Japan,,electricity,nuclear,0,0,2,2 -Australia_NZ,,electricity,nuclear,0,0,0.05,0.2 -Former Soviet Union,,electricity,nuclear,0.8,0.8,1.75,1.75 -China,,electricity,nuclear,0.2,0.3,0.6,1 -Middle East,,electricity,nuclear,0.05,0.1,0.3,0.4 -Africa,,electricity,nuclear,0.01,0.01,0.2,0.3 -Latin America,,electricity,nuclear,0.125,0.125,0.2,0.3 -Southeast Asia,,electricity,nuclear,0.05,0.05,0.2,0.3 -Eastern Europe,,electricity,nuclear,1,1,1,1 -Korea,,electricity,nuclear,2.75,2.25,2.75,2.5 -India,,electricity,nuclear,0.15,0.15,0.15,0.2 -,abw,electricity,nuclear,0,0,0,0 -,aia,electricity,nuclear,0,0,0,0 -,ant,electricity,nuclear,0,0,0,0 -,atg,electricity,nuclear,0,0,0,0 -,bhs,electricity,nuclear,0,0,0,0 -,blz,electricity,nuclear,0,0,0,0.3 -,bol,electricity,nuclear,0,0,0,0.3 -,bra,electricity,nuclear,0.015,0.1,0.2,0.3 -,brb,electricity,nuclear,0,0,0,0 -,chl,electricity,nuclear,0,0,0.2,0.3 -,col,electricity,nuclear,0,0,0,0.3 -,cri,electricity,nuclear,0,0,0,0.3 -,cub,electricity,nuclear,0,0,0,0.3 -,cym,electricity,nuclear,0,0,0,0 -,dma,electricity,nuclear,0,0,0,0 -,dom,electricity,nuclear,0,0,0,0 -,ecu,electricity,nuclear,0,0,0,0.3 -,glp,electricity,nuclear,0,0,0,0 -,grd,electricity,nuclear,0,0,0,0 -,gtm,electricity,nuclear,0,0,0,0.3 -,guf,electricity,nuclear,0,0,0,0.3 -,guy,electricity,nuclear,0,0,0,0.3 -,hnd,electricity,nuclear,0,0,0,0.3 -,hti,electricity,nuclear,0,0,0,0 -,jam,electricity,nuclear,0,0,0,0 -,kna,electricity,nuclear,0,0,0,0 -,lca,electricity,nuclear,0,0,0,0 -,msr,electricity,nuclear,0,0,0,0 -,nic,electricity,nuclear,0,0,0,0.3 -,pan,electricity,nuclear,0,0,0,0.3 -,per,electricity,nuclear,0,0,0,0.3 -,pry,electricity,nuclear,0,0,0,0.3 -,slv,electricity,nuclear,0,0,0,0.3 -,sur,electricity,nuclear,0,0,0,0.3 -,tto,electricity,nuclear,0,0,0,0 -,ury,electricity,nuclear,0,0,0,0.3 -,vct,electricity,nuclear,0,0,0,0 -,ven,electricity,nuclear,0,0,0,0.3 -,che,electricity,nuclear,0,0,0,0.75 -,isl,electricity,nuclear,0,0,0,0.75 -,lie,electricity,nuclear,0,0,0,0.75 -,nor,electricity,nuclear,0,0,0,0.75 -,sjm,electricity,nuclear,0,0,0,0.75 -,pak,electricity,nuclear,0.05,0.05,0.075,0.1 +#Region-specific nuclear electric subsector shareweights by GCAM3 region,,,,,,, +region_GCAM3,iso,supplysector,subsector,2015,2020,2035,2050 +USA,,electricity,nuclear,0.8,0.8,1,1 +Canada,,electricity,nuclear,0.8,0.8,1.25,1.25 +Western Europe,,electricity,nuclear,0.8,0.8,0.8,1 +Japan,,electricity,nuclear,0,0,2,2 +Australia_NZ,,electricity,nuclear,0,0,0.05,0.2 +Former Soviet Union,,electricity,nuclear,0.8,0.8,1.75,1.75 +China,,electricity,nuclear,0.2,0.3,0.6,1 +Middle East,,electricity,nuclear,0.05,0.1,0.3,0.4 +Africa,,electricity,nuclear,0.01,0.01,0.2,0.3 +Latin America,,electricity,nuclear,0.125,0.125,0.2,0.3 +Southeast Asia,,electricity,nuclear,0.05,0.05,0.2,0.3 +Eastern Europe,,electricity,nuclear,1,1,1,1 +Korea,,electricity,nuclear,2.75,2.25,2.75,2.5 +India,,electricity,nuclear,0.15,0.15,0.15,0.2 +,abw,electricity,nuclear,0,0,0,0 +,aia,electricity,nuclear,0,0,0,0 +,ant,electricity,nuclear,0,0,0,0 +,atg,electricity,nuclear,0,0,0,0 +,bhs,electricity,nuclear,0,0,0,0 +,blz,electricity,nuclear,0,0,0,0.3 +,bol,electricity,nuclear,0,0,0,0.3 +,bra,electricity,nuclear,0.015,0.1,0.2,0.3 +,brb,electricity,nuclear,0,0,0,0 +,chl,electricity,nuclear,0,0,0.2,0.3 +,col,electricity,nuclear,0,0,0,0.3 +,cri,electricity,nuclear,0,0,0,0.3 +,cub,electricity,nuclear,0,0,0,0.3 +,cym,electricity,nuclear,0,0,0,0 +,dma,electricity,nuclear,0,0,0,0 +,dom,electricity,nuclear,0,0,0,0 +,ecu,electricity,nuclear,0,0,0,0.3 +,glp,electricity,nuclear,0,0,0,0 +,grd,electricity,nuclear,0,0,0,0 +,gtm,electricity,nuclear,0,0,0,0.3 +,guf,electricity,nuclear,0,0,0,0.3 +,guy,electricity,nuclear,0,0,0,0.3 +,hnd,electricity,nuclear,0,0,0,0.3 +,hti,electricity,nuclear,0,0,0,0 +,jam,electricity,nuclear,0,0,0,0 +,kna,electricity,nuclear,0,0,0,0 +,lca,electricity,nuclear,0,0,0,0 +,msr,electricity,nuclear,0,0,0,0 +,nic,electricity,nuclear,0,0,0,0.3 +,pan,electricity,nuclear,0,0,0,0.3 +,per,electricity,nuclear,0,0,0,0.3 +,pry,electricity,nuclear,0,0,0,0.3 +,slv,electricity,nuclear,0,0,0,0.3 +,sur,electricity,nuclear,0,0,0,0.3 +,tto,electricity,nuclear,0,0,0,0 +,ury,electricity,nuclear,0,0,0,0.3 +,vct,electricity,nuclear,0,0,0,0 +,ven,electricity,nuclear,0,0,0,0.3 +,che,electricity,nuclear,0,0,0,0.75 +,isl,electricity,nuclear,0,0,0,0.75 +,lie,electricity,nuclear,0,0,0,0.75 +,nor,electricity,nuclear,0,0,0,0.75 +,sjm,electricity,nuclear,0,0,0,0.75 +,pak,electricity,nuclear,0.05,0.05,0.075,0.1 diff --git a/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt_renew_R.csv b/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt_renew_R.csv index 747e93c5b9..277d8e2a91 100644 --- a/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt_renew_R.csv +++ b/input/gcam-data-system/energy-data/assumptions/A23.subsector_shrwt_renew_R.csv @@ -1,57 +1,57 @@ -#Region-specific renewable electric subsector shareweights by GCAM3 region,,, -region_GCAM3,supplysector,subsector,2100 -Africa,electricity,wind,1 -Australia_NZ,electricity,wind,1 -Canada,electricity,wind,1 -China,electricity,wind,1 -Eastern Europe,electricity,wind,1 -Former Soviet Union,electricity,wind,1 -India,electricity,wind,1 -Japan,electricity,wind,1 -Korea,electricity,wind,1 -Latin America,electricity,wind,1 -Middle East,electricity,wind,1 -Southeast Asia,electricity,wind,1 -USA,electricity,wind,1 -Western Europe,electricity,wind,1 -Africa,electricity,solar,1 -Australia_NZ,electricity,solar,1 -Canada,electricity,solar,1 -China,electricity,solar,1 -Eastern Europe,electricity,solar,1 -Former Soviet Union,electricity,solar,1 -India,electricity,solar,1 -Japan,electricity,solar,1 -Korea,electricity,solar,1 -Latin America,electricity,solar,1 -Middle East,electricity,solar,1 -Southeast Asia,electricity,solar,1 -USA,electricity,solar,1 -Western Europe,electricity,solar,1 -Africa,electricity,biomass,1 -Australia_NZ,electricity,biomass,1 -Canada,electricity,biomass,1 -China,electricity,biomass,1 -Eastern Europe,electricity,biomass,1 -Former Soviet Union,electricity,biomass,1 -India,electricity,biomass,1 -Japan,electricity,biomass,1 -Korea,electricity,biomass,1 -Latin America,electricity,biomass,1 -Middle East,electricity,biomass,1 -Southeast Asia,electricity,biomass,1 -USA,electricity,biomass,1 -Western Europe,electricity,biomass,1 -Africa,electricity,geothermal,1 -Australia_NZ,electricity,geothermal,1 -Canada,electricity,geothermal,1 -China,electricity,geothermal,1 -Eastern Europe,electricity,geothermal,1 -Former Soviet Union,electricity,geothermal,1 -India,electricity,geothermal,1 -Japan,electricity,geothermal,1 -Latin America,electricity,geothermal,1 -Middle East,electricity,geothermal,1 -Southeast Asia,electricity,geothermal,1 -USA,electricity,geothermal,1 -Western Europe,electricity,geothermal,1 +#Region-specific renewable electric subsector shareweights by GCAM3 region,,, +region_GCAM3,supplysector,subsector,2100 +Africa,electricity,wind,1 +Australia_NZ,electricity,wind,1 +Canada,electricity,wind,1 +China,electricity,wind,1 +Eastern Europe,electricity,wind,1 +Former Soviet Union,electricity,wind,1 +India,electricity,wind,1 +Japan,electricity,wind,1 +Korea,electricity,wind,1 +Latin America,electricity,wind,1 +Middle East,electricity,wind,1 +Southeast Asia,electricity,wind,1 +USA,electricity,wind,1 +Western Europe,electricity,wind,1 +Africa,electricity,solar,1 +Australia_NZ,electricity,solar,1 +Canada,electricity,solar,1 +China,electricity,solar,1 +Eastern Europe,electricity,solar,1 +Former Soviet Union,electricity,solar,1 +India,electricity,solar,1 +Japan,electricity,solar,1 +Korea,electricity,solar,1 +Latin America,electricity,solar,1 +Middle East,electricity,solar,1 +Southeast Asia,electricity,solar,1 +USA,electricity,solar,1 +Western Europe,electricity,solar,1 +Africa,electricity,biomass,1 +Australia_NZ,electricity,biomass,1 +Canada,electricity,biomass,1 +China,electricity,biomass,1 +Eastern Europe,electricity,biomass,1 +Former Soviet Union,electricity,biomass,1 +India,electricity,biomass,1 +Japan,electricity,biomass,1 +Korea,electricity,biomass,1 +Latin America,electricity,biomass,1 +Middle East,electricity,biomass,1 +Southeast Asia,electricity,biomass,1 +USA,electricity,biomass,1 +Western Europe,electricity,biomass,1 +Africa,electricity,geothermal,1 +Australia_NZ,electricity,geothermal,1 +Canada,electricity,geothermal,1 +China,electricity,geothermal,1 +Eastern Europe,electricity,geothermal,1 +Former Soviet Union,electricity,geothermal,1 +India,electricity,geothermal,1 +Japan,electricity,geothermal,1 +Latin America,electricity,geothermal,1 +Middle East,electricity,geothermal,1 +Southeast Asia,electricity,geothermal,1 +USA,electricity,geothermal,1 +Western Europe,electricity,geothermal,1 diff --git a/input/gcam-data-system/energy-data/assumptions/A24.globaltech_coef.csv b/input/gcam-data-system/energy-data/assumptions/A24.globaltech_coef.csv index 72f9bd79b1..6fe02ddb79 100644 --- a/input/gcam-data-system/energy-data/assumptions/A24.globaltech_coef.csv +++ b/input/gcam-data-system/energy-data/assumptions/A24.globaltech_coef.csv @@ -1 +1,6 @@ -# District heat input-output coefficients,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2100 district heat,biomass,biomass,delivered biomass,1.25,1.25 district heat,coal,coal,delivered coal,1.25,1.25 district heat,gas,gas,wholesale gas,1.25,1.25 district heat,refined liquids,refined liquids,refined liquids industrial,1.25,1.25 \ No newline at end of file +# District heat input-output coefficients,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2100 +district heat,biomass,biomass,delivered biomass,1.25,1.25 +district heat,coal,coal,delivered coal,1.25,1.25 +district heat,gas,gas,wholesale gas,1.25,1.25 +district heat,refined liquids,refined liquids,refined liquids industrial,1.25,1.25 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A24.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A24.globaltech_cost.csv index 0bd8b3ab44..34b7ee496f 100644 --- a/input/gcam-data-system/energy-data/assumptions/A24.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A24.globaltech_cost.csv @@ -1 +1,6 @@ -# District heat non-energy costs,,,,,,,,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2005,2020,2035,2050,2065,2080,2095,2100 district heat,biomass,biomass,non-energy,2.129,2.129,2.129,2.005,1.888,1.778,1.674,1.576,1.576 district heat,coal,coal,non-energy,1.709,1.709,1.709,1.61,1.516,1.427,1.344,1.266,1.266 district heat,gas,gas,non-energy,0.71,0.71,0.734,0.691,0.651,0.613,0.577,0.543,0.543 district heat,refined liquids,refined liquids,non-energy,0.666,0.666,0.688,0.648,0.61,0.574,0.541,0.509,0.509 \ No newline at end of file +# District heat non-energy costs,,,,,,,,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2005,2020,2035,2050,2065,2080,2095,2100 +district heat,biomass,biomass,non-energy,2.129,2.129,2.129,2.005,1.888,1.778,1.674,1.576,1.576 +district heat,coal,coal,non-energy,1.709,1.709,1.709,1.61,1.516,1.427,1.344,1.266,1.266 +district heat,gas,gas,non-energy,0.71,0.71,0.734,0.691,0.651,0.613,0.577,0.543,0.543 +district heat,refined liquids,refined liquids,non-energy,0.666,0.666,0.688,0.648,0.61,0.574,0.541,0.509,0.509 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A24.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A24.globaltech_shrwt.csv index 0a2835bd92..87e80ec708 100644 --- a/input/gcam-data-system/energy-data/assumptions/A24.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A24.globaltech_shrwt.csv @@ -1 +1,6 @@ -# District heat technology shareweights,,,, supplysector,subsector,technology,1971,2100 district heat,biomass,biomass,1,1 district heat,coal,coal,1,1 district heat,gas,gas,1,1 district heat,refined liquids,refined liquids,1,1 \ No newline at end of file +# District heat technology shareweights,,,, +supplysector,subsector,technology,1971,2100 +district heat,biomass,biomass,1,1 +district heat,coal,coal,1,1 +district heat,gas,gas,1,1 +district heat,refined liquids,refined liquids,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A24.sector.csv b/input/gcam-data-system/energy-data/assumptions/A24.sector.csv index e5e02f1084..c0d4978832 100644 --- a/input/gcam-data-system/energy-data/assumptions/A24.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A24.sector.csv @@ -1 +1,3 @@ -# District heat supplysector characteristics,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type district heat,EJ,EJ,1975$/GJ,-3, \ No newline at end of file +# District heat supplysector characteristics,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type +district heat,EJ,EJ,1975$/GJ,-3, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A24.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A24.subsector_interp.csv index a6e0d750c2..fbe9588d88 100644 --- a/input/gcam-data-system/energy-data/assumptions/A24.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A24.subsector_interp.csv @@ -1 +1,6 @@ -# District heat subsector shareweight interpolation,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function district heat,biomass,share-weight,final-calibration-year,end-year,,fixed district heat,coal,share-weight,final-calibration-year,end-year,,fixed district heat,gas,share-weight,final-calibration-year,end-year,,fixed district heat,refined liquids,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# District heat subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +district heat,biomass,share-weight,final-calibration-year,end-year,,fixed +district heat,coal,share-weight,final-calibration-year,end-year,,fixed +district heat,gas,share-weight,final-calibration-year,end-year,,fixed +district heat,refined liquids,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A24.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A24.subsector_logit.csv index d604189192..a05d26a90b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A24.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A24.subsector_logit.csv @@ -1 +1,6 @@ -# District heat subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type district heat,biomass,-6, district heat,coal,-6, district heat,gas,-6, district heat,refined liquids,-6, \ No newline at end of file +# District heat subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +district heat,biomass,-6, +district heat,coal,-6, +district heat,gas,-6, +district heat,refined liquids,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A24.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A24.subsector_shrwt.csv index 9cb6ff2b4e..9ca5ace80b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A24.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A24.subsector_shrwt.csv @@ -1 +1,6 @@ -# District heat subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight district heat,biomass,start-year,,1 district heat,coal,start-year,,1 district heat,gas,start-year,,1 district heat,refined liquids,start-year,,1 \ No newline at end of file +# District heat subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +district heat,biomass,start-year,,1 +district heat,coal,start-year,,1 +district heat,gas,start-year,,1 +district heat,refined liquids,start-year,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_co2capture.csv b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_co2capture.csv index 4c8fef2a8d..57f80bee41 100644 --- a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_co2capture.csv +++ b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_co2capture.csv @@ -1 +1,5 @@ -# Hydrogen technology capture fractions,,,,,,,, supplysector,subsector,technology,1971,2020,2035,2050,2065,2100 H2 central production,coal,coal chemical CCS,0.91,0.91,0.92,0.93,0.94,0.94 H2 central production,gas,natural gas steam reforming CCS,0.91,0.91,0.92,0.93,0.94,0.94 H2 central production,biomass,biomass to H2 CCS,0.91,0.91,0.92,0.93,0.94,0.94 \ No newline at end of file +# Hydrogen technology capture fractions,,,,,,,, +supplysector,subsector,technology,1971,2020,2035,2050,2065,2100 +H2 central production,coal,coal chemical CCS,0.91,0.91,0.92,0.93,0.94,0.94 +H2 central production,gas,natural gas steam reforming CCS,0.91,0.91,0.92,0.93,0.94,0.94 +H2 central production,biomass,biomass to H2 CCS,0.91,0.91,0.92,0.93,0.94,0.94 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_cost.csv index 2824f8214f..b0b4dfb70f 100644 --- a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_cost.csv @@ -1 +1,17 @@ -# Hydrogen non-energy costs,,,,,,,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2020,2035,2050,2065,2080,2095,2100 H2 central production,coal,coal chemical,non-energy,2.999,2.999,2.743,2.509,2.295,2.130,1.976,1.976 H2 central production,coal,coal chemical CCS,non-energy,3.878,3.878,3.560,3.268,3.000,2.784,2.583,2.583 H2 central production,gas,natural gas steam reforming,non-energy,1.029,1.029,0.955,0.886,0.823,0.764,0.709,0.709 H2 central production,gas,natural gas steam reforming CCS,non-energy,1.579,1.579,1.438,1.309,1.192,1.106,1.026,1.026 H2 central production,biomass,biomass to H2,non-energy,2.979,2.979,2.725,2.493,2.280,2.116,1.963,1.963 H2 central production,biomass,biomass to H2 CCS,non-energy,3.878,3.878,3.560,3.268,3.000,2.784,2.583,2.583 H2 central production,nuclear,thermal splitting,non-energy,7.000,7.000,7.000,7.000,4.442,4.122,3.825,3.825 H2 central production,electricity,electrolysis,non-energy,7.397,7.397,6.111,5.048,4.170,3.870,3.591,3.591 H2 central production,wind,electrolysis,non-energy,7.397,7.397,7.397,7.397,7.397,6.864,6.369,6.369 H2 central production,solar,electrolysis,non-energy,7.397,7.397,7.397,7.397,7.397,6.864,6.369,6.369 H2 forecourt production,gas,natural gas steam reforming,non-energy,6.464,6.464,5.701,5.027,4.434,4.114,3.818,3.818 H2 forecourt production,electricity,electrolysis,non-energy,7.397,7.397,7.397,7.397,7.397,6.864,6.369,6.369 H2 distribution,H2 distribution,H2 distribution,non-energy,6.071,6.071,5.713,5.376,5.059,4.694,4.356,4.356 H2 enduse,H2 distribution,H2 distribution,non-energy,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000 H2 enduse,H2 forecourt production,H2 forecourt production,non-energy,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000 \ No newline at end of file +# Hydrogen non-energy costs,,,,,,,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2020,2035,2050,2065,2080,2095,2100 +H2 central production,coal,coal chemical,non-energy,2.999,2.999,2.743,2.509,2.295,2.130,1.976,1.976 +H2 central production,coal,coal chemical CCS,non-energy,3.878,3.878,3.560,3.268,3.000,2.784,2.583,2.583 +H2 central production,gas,natural gas steam reforming,non-energy,1.029,1.029,0.955,0.886,0.823,0.764,0.709,0.709 +H2 central production,gas,natural gas steam reforming CCS,non-energy,1.579,1.579,1.438,1.309,1.192,1.106,1.026,1.026 +H2 central production,biomass,biomass to H2,non-energy,2.979,2.979,2.725,2.493,2.280,2.116,1.963,1.963 +H2 central production,biomass,biomass to H2 CCS,non-energy,3.878,3.878,3.560,3.268,3.000,2.784,2.583,2.583 +H2 central production,nuclear,thermal splitting,non-energy,7.000,7.000,7.000,7.000,4.442,4.122,3.825,3.825 +H2 central production,electricity,electrolysis,non-energy,7.397,7.397,6.111,5.048,4.170,3.870,3.591,3.591 +H2 central production,wind,electrolysis,non-energy,7.397,7.397,7.397,7.397,7.397,6.864,6.369,6.369 +H2 central production,solar,electrolysis,non-energy,7.397,7.397,7.397,7.397,7.397,6.864,6.369,6.369 +H2 forecourt production,gas,natural gas steam reforming,non-energy,6.464,6.464,5.701,5.027,4.434,4.114,3.818,3.818 +H2 forecourt production,electricity,electrolysis,non-energy,7.397,7.397,7.397,7.397,7.397,6.864,6.369,6.369 +H2 distribution,H2 distribution,H2 distribution,non-energy,6.071,6.071,5.713,5.376,5.059,4.694,4.356,4.356 +H2 enduse,H2 distribution,H2 distribution,non-energy,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000 +H2 enduse,H2 forecourt production,H2 forecourt production,non-energy,0.000,0.000,0.000,0.000,0.000,0.000,0.000,0.000 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_eff.csv b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_eff.csv index bcc4c12d74..abbb36a4a6 100644 --- a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_eff.csv +++ b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_eff.csv @@ -1 +1,17 @@ -# Hydrogen efficiencies. Different from GCAM 3.0 in that CCS tech efficiencies take into account electricity inputs and outputs (using 3:1 conversion),,,,,,,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2020,2035,2050,2065,2080,2095,2100 H2 central production,coal,coal chemical,regional coal,0.640,0.640,0.660,0.680,0.701,0.712,0.722,0.722 H2 central production,coal,coal chemical CCS,regional coal,0.586,0.586,0.604,0.623,0.642,0.652,0.662,0.662 H2 central production,gas,natural gas steam reforming,regional natural gas,0.703,0.703,0.715,0.728,0.741,0.752,0.763,0.763 H2 central production,gas,natural gas steam reforming CCS,regional natural gas,0.656,0.656,0.673,0.689,0.706,0.717,0.728,0.728 H2 central production,biomass,biomass to H2,regional biomass,0.451,0.451,0.465,0.480,0.494,0.502,0.509,0.509 H2 central production,biomass,biomass to H2 CCS,regional biomass,0.451,0.451,0.465,0.480,0.494,0.502,0.509,0.509 H2 central production,nuclear,thermal splitting,nuclearFuelGenIII,0.850,0.850,0.850,0.850,0.850,0.863,0.876,0.876 H2 central production,electricity,electrolysis,elect_td_ind,0.626,0.626,0.654,0.682,0.712,0.723,0.734,0.734 H2 central production,wind,electrolysis,onshore wind resource,0.626,0.626,0.654,0.682,0.712,0.723,0.734,0.734 H2 central production,solar,electrolysis,global solar resource,0.626,0.626,0.654,0.682,0.712,0.723,0.734,0.734 H2 forecourt production,gas,natural gas steam reforming,delivered gas,0.561,0.561,0.587,0.615,0.643,0.653,0.663,0.663 H2 forecourt production,electricity,electrolysis,elect_td_trn,0.601,0.601,0.627,0.655,0.684,0.694,0.704,0.704 H2 distribution,H2 distribution,H2 distribution,H2 central production,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000 H2 enduse,H2 distribution,H2 distribution,H2 distribution,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000 H2 enduse,H2 forecourt production,H2 forecourt production,H2 forecourt production,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000 \ No newline at end of file +# Hydrogen efficiencies. Different from GCAM 3.0 in that CCS tech efficiencies take into account electricity inputs and outputs (using 3:1 conversion),,,,,,,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2020,2035,2050,2065,2080,2095,2100 +H2 central production,coal,coal chemical,regional coal,0.640,0.640,0.660,0.680,0.701,0.712,0.722,0.722 +H2 central production,coal,coal chemical CCS,regional coal,0.586,0.586,0.604,0.623,0.642,0.652,0.662,0.662 +H2 central production,gas,natural gas steam reforming,regional natural gas,0.703,0.703,0.715,0.728,0.741,0.752,0.763,0.763 +H2 central production,gas,natural gas steam reforming CCS,regional natural gas,0.656,0.656,0.673,0.689,0.706,0.717,0.728,0.728 +H2 central production,biomass,biomass to H2,regional biomass,0.451,0.451,0.465,0.480,0.494,0.502,0.509,0.509 +H2 central production,biomass,biomass to H2 CCS,regional biomass,0.451,0.451,0.465,0.480,0.494,0.502,0.509,0.509 +H2 central production,nuclear,thermal splitting,nuclearFuelGenIII,0.850,0.850,0.850,0.850,0.850,0.863,0.876,0.876 +H2 central production,electricity,electrolysis,elect_td_ind,0.626,0.626,0.654,0.682,0.712,0.723,0.734,0.734 +H2 central production,wind,electrolysis,onshore wind resource,0.626,0.626,0.654,0.682,0.712,0.723,0.734,0.734 +H2 central production,solar,electrolysis,global solar resource,0.626,0.626,0.654,0.682,0.712,0.723,0.734,0.734 +H2 forecourt production,gas,natural gas steam reforming,delivered gas,0.561,0.561,0.587,0.615,0.643,0.653,0.663,0.663 +H2 forecourt production,electricity,electrolysis,elect_td_trn,0.601,0.601,0.627,0.655,0.684,0.694,0.704,0.704 +H2 distribution,H2 distribution,H2 distribution,H2 central production,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000 +H2 enduse,H2 distribution,H2 distribution,H2 distribution,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000 +H2 enduse,H2 forecourt production,H2 forecourt production,H2 forecourt production,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_keyword.csv b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_keyword.csv index cb07729179..24386ea278 100644 --- a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_keyword.csv +++ b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_keyword.csv @@ -1 +1,11 @@ -# Hydrogen technology keywords,,,, supplysector,subsector,technology,primary.renewable,average.fossil.efficiency H2 central production,coal,coal chemical,,1 H2 central production,coal,coal chemical CCS,,1 H2 central production,gas,natural gas steam reforming,,1 H2 central production,gas,natural gas steam reforming CCS,,1 H2 central production,biomass,biomass to H2,,1 H2 central production,biomass,biomass to H2 CCS,,1 H2 central production,nuclear,thermal splitting,nuclear-H2, H2 central production,wind,electrolysis,wind-H2, H2 central production,solar,electrolysis,solar-H2, \ No newline at end of file +# Hydrogen technology keywords,,,, +supplysector,subsector,technology,primary.renewable,average.fossil.efficiency +H2 central production,coal,coal chemical,,1 +H2 central production,coal,coal chemical CCS,,1 +H2 central production,gas,natural gas steam reforming,,1 +H2 central production,gas,natural gas steam reforming CCS,,1 +H2 central production,biomass,biomass to H2,,1 +H2 central production,biomass,biomass to H2 CCS,,1 +H2 central production,nuclear,thermal splitting,nuclear-H2, +H2 central production,wind,electrolysis,wind-H2, +H2 central production,solar,electrolysis,solar-H2, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_shrwt.csv index 47be9c051b..5f72b8a6f6 100644 --- a/input/gcam-data-system/energy-data/assumptions/A25.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A25.globaltech_shrwt.csv @@ -1 +1,17 @@ -# Hydrogen technology shareweights,,,, supplysector,subsector,technology,1971,2100 H2 central production,coal,coal chemical,1,1 H2 central production,coal,coal chemical CCS,1,1 H2 central production,gas,natural gas steam reforming,1,1 H2 central production,gas,natural gas steam reforming CCS,1,1 H2 central production,biomass,biomass to H2,1,1 H2 central production,biomass,biomass to H2 CCS,1,1 H2 central production,nuclear,thermal splitting,1,1 H2 central production,electricity,electrolysis,1,1 H2 central production,wind,electrolysis,1,1 H2 central production,solar,electrolysis,1,1 H2 forecourt production,gas,natural gas steam reforming,1,1 H2 forecourt production,electricity,electrolysis,1,1 H2 distribution,H2 distribution,H2 distribution,1,1 H2 enduse,H2 distribution,H2 distribution,1,1 H2 enduse,H2 forecourt production,H2 forecourt production,1,1 \ No newline at end of file +# Hydrogen technology shareweights,,,, +supplysector,subsector,technology,1971,2100 +H2 central production,coal,coal chemical,1,1 +H2 central production,coal,coal chemical CCS,1,1 +H2 central production,gas,natural gas steam reforming,1,1 +H2 central production,gas,natural gas steam reforming CCS,1,1 +H2 central production,biomass,biomass to H2,1,1 +H2 central production,biomass,biomass to H2 CCS,1,1 +H2 central production,nuclear,thermal splitting,1,1 +H2 central production,electricity,electrolysis,1,1 +H2 central production,wind,electrolysis,1,1 +H2 central production,solar,electrolysis,1,1 +H2 forecourt production,gas,natural gas steam reforming,1,1 +H2 forecourt production,electricity,electrolysis,1,1 +H2 distribution,H2 distribution,H2 distribution,1,1 +H2 enduse,H2 distribution,H2 distribution,1,1 +H2 enduse,H2 forecourt production,H2 forecourt production,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A25.sector.csv b/input/gcam-data-system/energy-data/assumptions/A25.sector.csv index 147c3c68b9..352fd0ae01 100644 --- a/input/gcam-data-system/energy-data/assumptions/A25.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A25.sector.csv @@ -1 +1,6 @@ -# Hydrogen supplysector characteristics,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type H2 central production,EJ,EJ,1975$/GJ,-3, H2 forecourt production,EJ,EJ,1975$/GJ,-3, H2 distribution,EJ,EJ,1975$/GJ,-3, H2 enduse,EJ,EJ,1975$/GJ,-3, \ No newline at end of file +# Hydrogen supplysector characteristics,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type +H2 central production,EJ,EJ,1975$/GJ,-3, +H2 forecourt production,EJ,EJ,1975$/GJ,-3, +H2 distribution,EJ,EJ,1975$/GJ,-3, +H2 enduse,EJ,EJ,1975$/GJ,-3, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A25.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A25.subsector_logit.csv index af9afbcda6..35c4acb17a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A25.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A25.subsector_logit.csv @@ -1 +1,14 @@ -# Hydrogen subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type H2 central production,coal,-10, H2 central production,gas,-10, H2 central production,biomass,-10, H2 central production,nuclear,-10, H2 central production,electricity,-10, H2 central production,wind,-10, H2 central production,solar,-10, H2 forecourt production,gas,-6, H2 forecourt production,electricity,-6, H2 distribution,H2 distribution,-6, H2 enduse,H2 distribution,-6, H2 enduse,H2 forecourt production,-6, \ No newline at end of file +# Hydrogen subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +H2 central production,coal,-10, +H2 central production,gas,-10, +H2 central production,biomass,-10, +H2 central production,nuclear,-10, +H2 central production,electricity,-10, +H2 central production,wind,-10, +H2 central production,solar,-10, +H2 forecourt production,gas,-6, +H2 forecourt production,electricity,-6, +H2 distribution,H2 distribution,-6, +H2 enduse,H2 distribution,-6, +H2 enduse,H2 forecourt production,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A25.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A25.subsector_shrwt.csv index 4f84ab586d..ce3bcb66e5 100644 --- a/input/gcam-data-system/energy-data/assumptions/A25.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A25.subsector_shrwt.csv @@ -1 +1,26 @@ -# Hydrogen subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight H2 central production,coal,start-year,,0 H2 central production,gas,start-year,,0 H2 central production,biomass,start-year,,0 H2 central production,nuclear,start-year,,0 H2 central production,electricity,start-year,,0 H2 central production,wind,start-year,,0 H2 central production,solar,start-year,,0 H2 forecourt production,gas,start-year,,0 H2 forecourt production,electricity,start-year,,0 H2 distribution,H2 distribution,start-year,,0 H2 enduse,H2 distribution,start-year,,0 H2 enduse,H2 forecourt production,start-year,,0 H2 central production,coal,2020,,1 H2 central production,gas,2020,,1 H2 central production,biomass,2020,,1 H2 central production,nuclear,2020,,1 H2 central production,electricity,2020,,1 H2 central production,wind,2020,,1 H2 central production,solar,2020,,1 H2 forecourt production,gas,2020,,1 H2 forecourt production,electricity,2020,,1 H2 distribution,H2 distribution,2020,,1 H2 enduse,H2 distribution,2020,,1 H2 enduse,H2 forecourt production,2020,,1 \ No newline at end of file +# Hydrogen subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +H2 central production,coal,start-year,,0 +H2 central production,gas,start-year,,0 +H2 central production,biomass,start-year,,0 +H2 central production,nuclear,start-year,,0 +H2 central production,electricity,start-year,,0 +H2 central production,wind,start-year,,0 +H2 central production,solar,start-year,,0 +H2 forecourt production,gas,start-year,,0 +H2 forecourt production,electricity,start-year,,0 +H2 distribution,H2 distribution,start-year,,0 +H2 enduse,H2 distribution,start-year,,0 +H2 enduse,H2 forecourt production,start-year,,0 +H2 central production,coal,2020,,1 +H2 central production,gas,2020,,1 +H2 central production,biomass,2020,,1 +H2 central production,nuclear,2020,,1 +H2 central production,electricity,2020,,1 +H2 central production,wind,2020,,1 +H2 central production,solar,2020,,1 +H2 forecourt production,gas,2020,,1 +H2 forecourt production,electricity,2020,,1 +H2 distribution,H2 distribution,2020,,1 +H2 enduse,H2 distribution,2020,,1 +H2 enduse,H2 forecourt production,2020,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A26.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A26.globaltech_cost.csv index 38f36ad19e..9b81ba5ff5 100644 --- a/input/gcam-data-system/energy-data/assumptions/A26.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A26.globaltech_cost.csv @@ -1 +1,15 @@ -# Final energy delivery cost adders,,,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,1975,2005,2100 backup_electricity,gas,gas (steam/CT),non-energy,1.84,1.84,1.84,1.69 csp_backup,gas,CSP gas hybrid mode,non-energy,0,0,0,0 delivered biomass,delivered biomass,delivered biomass,non-energy,0.14,0.14,0.14,0.14 delivered coal,delivered coal,delivered coal,non-energy,0.14,0.14,0.14,0.14 electricity_net_ownuse,electricity_net_ownuse,electricity_net_ownuse,non-energy,0,0,0,0 elect_td_bld,elect_td_bld,elect_td_bld,non-energy,3.03,3.03,2.81,1.79 elect_td_ind,elect_td_ind,elect_td_ind,non-energy,0.75,0.75,0.7,0.44 elect_td_trn,elect_td_trn,elect_td_trn,non-energy,3.03,3.03,2.81,1.79 gas pipeline,gas pipeline,gas pipeline,non-energy,0,0,0,0 wholesale gas,wholesale gas,wholesale gas,non-energy,0,0,0,0 delivered gas,delivered gas,delivered gas,non-energy,1.25,1.25,1.25,1.25 refined liquids enduse,refined liquids enduse,refined liquids enduse,non-energy,1.1,1.1,1.1,1.1 refined liquids industrial,refined liquids industrial,refined liquids industrial,non-energy,0,0,0,0 \ No newline at end of file +# Final energy delivery cost adders,,,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,1975,2005,2100 +backup_electricity,gas,gas (steam/CT),non-energy,1.84,1.84,1.84,1.69 +csp_backup,gas,CSP gas hybrid mode,non-energy,0,0,0,0 +delivered biomass,delivered biomass,delivered biomass,non-energy,0.14,0.14,0.14,0.14 +delivered coal,delivered coal,delivered coal,non-energy,0.14,0.14,0.14,0.14 +electricity_net_ownuse,electricity_net_ownuse,electricity_net_ownuse,non-energy,0,0,0,0 +elect_td_bld,elect_td_bld,elect_td_bld,non-energy,3.03,3.03,2.81,1.79 +elect_td_ind,elect_td_ind,elect_td_ind,non-energy,0.75,0.75,0.7,0.44 +elect_td_trn,elect_td_trn,elect_td_trn,non-energy,3.03,3.03,2.81,1.79 +gas pipeline,gas pipeline,gas pipeline,non-energy,0,0,0,0 +wholesale gas,wholesale gas,wholesale gas,non-energy,0,0,0,0 +delivered gas,delivered gas,delivered gas,non-energy,1.25,1.25,1.25,1.25 +refined liquids enduse,refined liquids enduse,refined liquids enduse,non-energy,1.1,1.1,1.1,1.1 +refined liquids industrial,refined liquids industrial,refined liquids industrial,non-energy,0,0,0,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A26.globaltech_eff.csv b/input/gcam-data-system/energy-data/assumptions/A26.globaltech_eff.csv index 3039232f46..ffb2d68fd7 100644 --- a/input/gcam-data-system/energy-data/assumptions/A26.globaltech_eff.csv +++ b/input/gcam-data-system/energy-data/assumptions/A26.globaltech_eff.csv @@ -1 +1,15 @@ -# Final energy delivery efficiencies in global technology database (many over-written in stub technologies),,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2005,2100 backup_electricity,gas,gas (steam/CT),wholesale gas,0.377,0.377,0.428 csp_backup,gas,CSP gas hybrid mode,wholesale gas,0.307,0.307,0.358 delivered biomass,delivered biomass,delivered biomass,regional biomass,1,1,1 delivered coal,delivered coal,delivered coal,regional coal,1,1,1 electricity_net_ownuse,electricity_net_ownuse,electricity_net_ownuse,electricity,1,1,1 elect_td_bld,elect_td_bld,elect_td_bld,electricity_net_ownuse,1,1,1 elect_td_ind,elect_td_ind,elect_td_ind,electricity_net_ownuse,1,1,1 elect_td_trn,elect_td_trn,elect_td_trn,electricity_net_ownuse,1,1,1 gas pipeline,gas pipeline,gas pipeline,gas processing,1,1,1 wholesale gas,wholesale gas,wholesale gas,gas pipeline,1,1,1 delivered gas,delivered gas,delivered gas,gas pipeline,1,1,1 refined liquids enduse,refined liquids enduse,refined liquids enduse,refining,1,1,1 refined liquids industrial,refined liquids industrial,refined liquids industrial,refining,1,1,1 \ No newline at end of file +# Final energy delivery efficiencies in global technology database (many over-written in stub technologies),,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2005,2100 +backup_electricity,gas,gas (steam/CT),wholesale gas,0.377,0.377,0.428 +csp_backup,gas,CSP gas hybrid mode,wholesale gas,0.307,0.307,0.358 +delivered biomass,delivered biomass,delivered biomass,regional biomass,1,1,1 +delivered coal,delivered coal,delivered coal,regional coal,1,1,1 +electricity_net_ownuse,electricity_net_ownuse,electricity_net_ownuse,electricity,1,1,1 +elect_td_bld,elect_td_bld,elect_td_bld,electricity_net_ownuse,1,1,1 +elect_td_ind,elect_td_ind,elect_td_ind,electricity_net_ownuse,1,1,1 +elect_td_trn,elect_td_trn,elect_td_trn,electricity_net_ownuse,1,1,1 +gas pipeline,gas pipeline,gas pipeline,gas processing,1,1,1 +wholesale gas,wholesale gas,wholesale gas,gas pipeline,1,1,1 +delivered gas,delivered gas,delivered gas,gas pipeline,1,1,1 +refined liquids enduse,refined liquids enduse,refined liquids enduse,refining,1,1,1 +refined liquids industrial,refined liquids industrial,refined liquids industrial,refining,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A26.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A26.globaltech_shrwt.csv index e56775db9c..2c451448af 100644 --- a/input/gcam-data-system/energy-data/assumptions/A26.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A26.globaltech_shrwt.csv @@ -1 +1,15 @@ -# Final energy transformation default technology shareweights,,,, supplysector,subsector,technology,1971,2100 backup_electricity,gas,gas (steam/CT),1,1 csp_backup,gas,CSP gas hybrid mode,1,1 delivered biomass,delivered biomass,delivered biomass,1,1 delivered coal,delivered coal,delivered coal,1,1 electricity_net_ownuse,electricity_net_ownuse,electricity_net_ownuse,1,1 elect_td_bld,elect_td_bld,elect_td_bld,1,1 elect_td_ind,elect_td_ind,elect_td_ind,1,1 elect_td_trn,elect_td_trn,elect_td_trn,1,1 gas pipeline,gas pipeline,gas pipeline,1,1 wholesale gas,wholesale gas,wholesale gas,1,1 delivered gas,delivered gas,delivered gas,1,1 refined liquids enduse,refined liquids enduse,refined liquids enduse,1,1 refined liquids industrial,refined liquids industrial,refined liquids industrial,1,1 \ No newline at end of file +# Final energy transformation default technology shareweights,,,, +supplysector,subsector,technology,1971,2100 +backup_electricity,gas,gas (steam/CT),1,1 +csp_backup,gas,CSP gas hybrid mode,1,1 +delivered biomass,delivered biomass,delivered biomass,1,1 +delivered coal,delivered coal,delivered coal,1,1 +electricity_net_ownuse,electricity_net_ownuse,electricity_net_ownuse,1,1 +elect_td_bld,elect_td_bld,elect_td_bld,1,1 +elect_td_ind,elect_td_ind,elect_td_ind,1,1 +elect_td_trn,elect_td_trn,elect_td_trn,1,1 +gas pipeline,gas pipeline,gas pipeline,1,1 +wholesale gas,wholesale gas,wholesale gas,1,1 +delivered gas,delivered gas,delivered gas,1,1 +refined liquids enduse,refined liquids enduse,refined liquids enduse,1,1 +refined liquids industrial,refined liquids industrial,refined liquids industrial,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A26.sector.csv b/input/gcam-data-system/energy-data/assumptions/A26.sector.csv index f4cb921f4b..dd166d7914 100644 --- a/input/gcam-data-system/energy-data/assumptions/A26.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A26.sector.csv @@ -1,15 +1,15 @@ -# Final energy delivery and reliability (backup) sectors - supplysector characteristics,,,,, -supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type -backup_electricity,EJ,EJ,1975$/GJ,-3, -csp_backup,EJ,EJ,1975$/GJ,-3, -delivered biomass,EJ,EJ,1975$/GJ,-3, -delivered coal,EJ,EJ,1975$/GJ,-3, -electricity_net_ownuse,EJ,EJ,1975$/GJ,-3, -elect_td_bld,EJ,EJ,1975$/GJ,-8, -elect_td_ind,EJ,EJ,1975$/GJ,-3, -elect_td_trn,EJ,EJ,1975$/GJ,-3, -gas pipeline,EJ,EJ,1975$/GJ,-3, -wholesale gas,EJ,EJ,1975$/GJ,-3, -delivered gas,EJ,EJ,1975$/GJ,-3, -refined liquids enduse,EJ,EJ,1975$/GJ,-3, +# Final energy delivery and reliability (backup) sectors - supplysector characteristics,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type +backup_electricity,EJ,EJ,1975$/GJ,-3, +csp_backup,EJ,EJ,1975$/GJ,-3, +delivered biomass,EJ,EJ,1975$/GJ,-3, +delivered coal,EJ,EJ,1975$/GJ,-3, +electricity_net_ownuse,EJ,EJ,1975$/GJ,-3, +elect_td_bld,EJ,EJ,1975$/GJ,-8, +elect_td_ind,EJ,EJ,1975$/GJ,-3, +elect_td_trn,EJ,EJ,1975$/GJ,-3, +gas pipeline,EJ,EJ,1975$/GJ,-3, +wholesale gas,EJ,EJ,1975$/GJ,-3, +delivered gas,EJ,EJ,1975$/GJ,-3, +refined liquids enduse,EJ,EJ,1975$/GJ,-3, refined liquids industrial,EJ,EJ,1975$/GJ,-3, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A26.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A26.subsector_interp.csv index d5e53ca101..cd37362d8e 100644 --- a/input/gcam-data-system/energy-data/assumptions/A26.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A26.subsector_interp.csv @@ -1 +1,13 @@ -# Final energy delivery subsector shareweight interpolation,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function delivered biomass,delivered biomass,share-weight,final-calibration-year,end-year,,linear delivered coal,delivered coal,share-weight,final-calibration-year,end-year,,linear electricity_net_ownuse,electricity_net_ownuse,share-weight,final-calibration-year,end-year,,linear elect_td_bld,elect_td_bld,share-weight,final-calibration-year,end-year,,linear elect_td_ind,elect_td_ind,share-weight,final-calibration-year,end-year,,linear elect_td_trn,elect_td_trn,share-weight,final-calibration-year,end-year,,linear gas pipeline,gas pipeline,share-weight,final-calibration-year,end-year,,linear wholesale gas,wholesale gas,share-weight,final-calibration-year,end-year,,linear delivered gas,delivered gas,share-weight,final-calibration-year,end-year,,linear refined liquids enduse,refined liquids enduse,share-weight,final-calibration-year,end-year,,linear refined liquids industrial,refined liquids industrial,share-weight,final-calibration-year,end-year,,linear \ No newline at end of file +# Final energy delivery subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +delivered biomass,delivered biomass,share-weight,final-calibration-year,end-year,,linear +delivered coal,delivered coal,share-weight,final-calibration-year,end-year,,linear +electricity_net_ownuse,electricity_net_ownuse,share-weight,final-calibration-year,end-year,,linear +elect_td_bld,elect_td_bld,share-weight,final-calibration-year,end-year,,linear +elect_td_ind,elect_td_ind,share-weight,final-calibration-year,end-year,,linear +elect_td_trn,elect_td_trn,share-weight,final-calibration-year,end-year,,linear +gas pipeline,gas pipeline,share-weight,final-calibration-year,end-year,,linear +wholesale gas,wholesale gas,share-weight,final-calibration-year,end-year,,linear +delivered gas,delivered gas,share-weight,final-calibration-year,end-year,,linear +refined liquids enduse,refined liquids enduse,share-weight,final-calibration-year,end-year,,linear +refined liquids industrial,refined liquids industrial,share-weight,final-calibration-year,end-year,,linear \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A26.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A26.subsector_logit.csv index 52dc956cfb..db27c63c5c 100644 --- a/input/gcam-data-system/energy-data/assumptions/A26.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A26.subsector_logit.csv @@ -1 +1,15 @@ -# Final energy delivery subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type backup_electricity,gas,-6, csp_backup,gas,-6, delivered biomass,delivered biomass,-6, delivered coal,delivered coal,-6, electricity_net_ownuse,electricity_net_ownuse,-6, elect_td_bld,elect_td_bld,-6, elect_td_ind,elect_td_ind,-6, elect_td_trn,elect_td_trn,-6, gas pipeline,gas pipeline,-6, wholesale gas,wholesale gas,-6, delivered gas,delivered gas,-6, refined liquids enduse,refined liquids enduse,-6, refined liquids industrial,refined liquids industrial,-6, \ No newline at end of file +# Final energy delivery subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +backup_electricity,gas,-6, +csp_backup,gas,-6, +delivered biomass,delivered biomass,-6, +delivered coal,delivered coal,-6, +electricity_net_ownuse,electricity_net_ownuse,-6, +elect_td_bld,elect_td_bld,-6, +elect_td_ind,elect_td_ind,-6, +elect_td_trn,elect_td_trn,-6, +gas pipeline,gas pipeline,-6, +wholesale gas,wholesale gas,-6, +delivered gas,delivered gas,-6, +refined liquids enduse,refined liquids enduse,-6, +refined liquids industrial,refined liquids industrial,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A26.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A26.subsector_shrwt.csv index 0f7e4d66e3..62b3a9b6dd 100644 --- a/input/gcam-data-system/energy-data/assumptions/A26.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A26.subsector_shrwt.csv @@ -1 +1,15 @@ -# Final energy delivery subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight backup_electricity,gas,start-year,,1 csp_backup,gas,start-year,,1 delivered biomass,delivered biomass,start-year,,1 delivered coal,delivered coal,start-year,,1 electricity_net_ownuse,electricity_net_ownuse,start-year,,1 elect_td_bld,elect_td_bld,start-year,,1 elect_td_ind,elect_td_ind,start-year,,1 elect_td_trn,elect_td_trn,start-year,,1 gas pipeline,gas pipeline,start-year,,1 wholesale gas,wholesale gas,start-year,,1 delivered gas,delivered gas,start-year,,1 refined liquids enduse,refined liquids enduse,start-year,,1 refined liquids industrial,refined liquids industrial,start-year,,1 \ No newline at end of file +# Final energy delivery subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +backup_electricity,gas,start-year,,1 +csp_backup,gas,start-year,,1 +delivered biomass,delivered biomass,start-year,,1 +delivered coal,delivered coal,start-year,,1 +electricity_net_ownuse,electricity_net_ownuse,start-year,,1 +elect_td_bld,elect_td_bld,start-year,,1 +elect_td_ind,elect_td_ind,start-year,,1 +elect_td_trn,elect_td_trn,start-year,,1 +gas pipeline,gas pipeline,start-year,,1 +wholesale gas,wholesale gas,start-year,,1 +delivered gas,delivered gas,start-year,,1 +refined liquids enduse,refined liquids enduse,start-year,,1 +refined liquids industrial,refined liquids industrial,start-year,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.demand.csv b/input/gcam-data-system/energy-data/assumptions/A32.demand.csv index 142bf941ef..e7b9ba5342 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.demand.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.demand.csv @@ -1,3 +1,3 @@ -# Industry demand perCapitaBased and price elasticity,, -energy.final.demand,perCapitaBased,price.elasticity +# Industry demand perCapitaBased and price elasticity,, +energy.final.demand,perCapitaBased,price.elasticity industry,1,-1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.fuelprefElasticity.csv b/input/gcam-data-system/energy-data/assumptions/A32.fuelprefElasticity.csv index 1a78ed95ff..111fe4cc6b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.fuelprefElasticity.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.fuelprefElasticity.csv @@ -1 +1,5 @@ -# Fuel preference elasticities for industrial energy use. Using rules rather than ad-hoc regional assignments,,, subsector,criteria,share,fuelprefElasticity biomass,greater than,0.15,-0.1 biomass,greater than,0.3,-0.4 gas,lesser than,0.1,0.1 \ No newline at end of file +# Fuel preference elasticities for industrial energy use. Using rules rather than ad-hoc regional assignments,,, +subsector,criteria,share,fuelprefElasticity +biomass,greater than,0.15,-0.1 +biomass,greater than,0.3,-0.4 +gas,lesser than,0.1,0.1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_coef.csv b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_coef.csv index a6b8605799..5c2669c8d4 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_coef.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_coef.csv @@ -1 +1,4 @@ -# Industry default coefficients,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2100 industry,industry,industry,industrial energy use,0.7,0.7 industry,industry,industry,industrial feedstocks,0.3,0.3 \ No newline at end of file +# Industry default coefficients,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2100 +industry,industry,industry,industrial energy use,0.7,0.7 +industry,industry,industry,industrial feedstocks,0.3,0.3 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_cost.csv index d9e6c9d4d1..fefa54e416 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_cost.csv @@ -1 +1,18 @@ -# Industry default costs,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2100 industrial energy use,biomass,biomass,non-energy,3,3 industrial energy use,biomass,biomass cogen,non-energy,4.5,4.5 industrial energy use,coal,coal,non-energy,3,3 industrial energy use,coal,coal cogen,non-energy,4.5,4.5 industrial energy use,district heat,district heat,non-energy,3,3 industrial energy use,electricity,electricity,non-energy,3,3 industrial energy use,gas,gas,non-energy,3,3 industrial energy use,gas,gas cogen,non-energy,4.5,4.5 industrial energy use,hydrogen,hydrogen,non-energy,3,3 industrial energy use,hydrogen,hydrogen cogen,non-energy,4.5,4.5 industrial energy use,refined liquids,refined liquids,non-energy,3,3 industrial energy use,refined liquids,refined liquids cogen,non-energy,4.5,4.5 industrial feedstocks,coal,coal,non-energy,0,0 industrial feedstocks,gas,gas,non-energy,0,0 industrial feedstocks,refined liquids,refined liquids,non-energy,0,0 industry,industry,industry,non-energy,25,25 \ No newline at end of file +# Industry default costs,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2100 +industrial energy use,biomass,biomass,non-energy,3,3 +industrial energy use,biomass,biomass cogen,non-energy,4.5,4.5 +industrial energy use,coal,coal,non-energy,3,3 +industrial energy use,coal,coal cogen,non-energy,4.5,4.5 +industrial energy use,district heat,district heat,non-energy,3,3 +industrial energy use,electricity,electricity,non-energy,3,3 +industrial energy use,gas,gas,non-energy,3,3 +industrial energy use,gas,gas cogen,non-energy,4.5,4.5 +industrial energy use,hydrogen,hydrogen,non-energy,3,3 +industrial energy use,hydrogen,hydrogen cogen,non-energy,4.5,4.5 +industrial energy use,refined liquids,refined liquids,non-energy,3,3 +industrial energy use,refined liquids,refined liquids cogen,non-energy,4.5,4.5 +industrial feedstocks,coal,coal,non-energy,0,0 +industrial feedstocks,gas,gas,non-energy,0,0 +industrial feedstocks,refined liquids,refined liquids,non-energy,0,0 +industry,industry,industry,non-energy,25,25 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_eff.csv b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_eff.csv index de1804d57c..8c7ba9aeba 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_eff.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_eff.csv @@ -1 +1,17 @@ -# Industry default efficiencies,,,,,,,,,,,,, supplysector,subsector,technology,minicam.energy.input,secondary.output,1971,2005,2020,2035,2050,2065,2080,2095,2100 industrial energy use,biomass,biomass,delivered biomass,,0.746423292,0.799,0.797,0.804,0.81,0.816,0.823,0.828,0.828 industrial energy use,biomass,biomass cogen,delivered biomass,electricity,0.515676667,0.552,0.56,0.568,0.577,0.586,0.595,0.604,0.604 industrial energy use,coal,coal,delivered coal,,0.808080285,0.865,0.891,0.901,0.909,0.917,0.926,0.936,0.936 industrial energy use,coal,coal cogen,delivered coal,electricity,0.582004645,0.623,0.629,0.636,0.644,0.652,0.661,0.67,0.67 industrial energy use,district heat,district heat,district heat,,1,1,1,1,1,1,1,1,1 industrial energy use,electricity,electricity,elect_td_ind,,0.934196861,1,1.015,1.03,1.046,1.062,1.078,1.094,1.094 industrial energy use,gas,gas,wholesale gas,,0.825830025,0.884,0.898,0.913,0.926,0.941,0.955,0.969,0.969 industrial energy use,gas,gas cogen,wholesale gas,electricity,0.563320707,0.603,0.612,0.621,0.63,0.64,0.649,0.659,0.659 industrial energy use,hydrogen,hydrogen,H2 enduse,,1,1,1,1.015,1.03,1.046,1.062,1.078,1.078 industrial energy use,hydrogen,hydrogen cogen,H2 enduse,electricity,0.457,0.457,0.457,0.464,0.471,0.478,0.485,0.492,0.492 industrial energy use,refined liquids,refined liquids,refined liquids industrial,,0.917381318,0.982,1.001,1.018,1.033,1.047,1.062,1.077,1.077 industrial energy use,refined liquids,refined liquids cogen,refined liquids industrial,electricity,0.565189101,0.605,0.614,0.623,0.632,0.642,0.652,0.662,0.662 industrial feedstocks,coal,coal,delivered coal,,1,1,1,1,1,1,1,1,1 industrial feedstocks,gas,gas,wholesale gas,,1,1,1,1,1,1,1,1,1 industrial feedstocks,refined liquids,refined liquids,refined liquids industrial,,1,1,1,1,1,1,1,1,1 \ No newline at end of file +# Industry default efficiencies,,,,,,,,,,,,, +supplysector,subsector,technology,minicam.energy.input,secondary.output,1971,2005,2020,2035,2050,2065,2080,2095,2100 +industrial energy use,biomass,biomass,delivered biomass,,0.746423292,0.799,0.797,0.804,0.81,0.816,0.823,0.828,0.828 +industrial energy use,biomass,biomass cogen,delivered biomass,electricity,0.515676667,0.552,0.56,0.568,0.577,0.586,0.595,0.604,0.604 +industrial energy use,coal,coal,delivered coal,,0.808080285,0.865,0.891,0.901,0.909,0.917,0.926,0.936,0.936 +industrial energy use,coal,coal cogen,delivered coal,electricity,0.582004645,0.623,0.629,0.636,0.644,0.652,0.661,0.67,0.67 +industrial energy use,district heat,district heat,district heat,,1,1,1,1,1,1,1,1,1 +industrial energy use,electricity,electricity,elect_td_ind,,0.934196861,1,1.015,1.03,1.046,1.062,1.078,1.094,1.094 +industrial energy use,gas,gas,wholesale gas,,0.825830025,0.884,0.898,0.913,0.926,0.941,0.955,0.969,0.969 +industrial energy use,gas,gas cogen,wholesale gas,electricity,0.563320707,0.603,0.612,0.621,0.63,0.64,0.649,0.659,0.659 +industrial energy use,hydrogen,hydrogen,H2 enduse,,1,1,1,1.015,1.03,1.046,1.062,1.078,1.078 +industrial energy use,hydrogen,hydrogen cogen,H2 enduse,electricity,0.457,0.457,0.457,0.464,0.471,0.478,0.485,0.492,0.492 +industrial energy use,refined liquids,refined liquids,refined liquids industrial,,0.917381318,0.982,1.001,1.018,1.033,1.047,1.062,1.077,1.077 +industrial energy use,refined liquids,refined liquids cogen,refined liquids industrial,electricity,0.565189101,0.605,0.614,0.623,0.632,0.642,0.652,0.662,0.662 +industrial feedstocks,coal,coal,delivered coal,,1,1,1,1,1,1,1,1,1 +industrial feedstocks,gas,gas,wholesale gas,,1,1,1,1,1,1,1,1,1 +industrial feedstocks,refined liquids,refined liquids,refined liquids industrial,,1,1,1,1,1,1,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_interp.csv b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_interp.csv index c81193553a..9d70218ae0 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_interp.csv @@ -1 +1,10 @@ -# Industry technology interpolation functions,,,,,, supplysector,subsector,technology,apply.to,from.year,to.year,interpolation.function industrial energy use,biomass,biomass,share-weight,final-calibration-year,end-year,fixed industrial energy use,biomass,biomass cogen,share-weight,final-calibration-year,end-year,fixed industrial energy use,coal,coal,share-weight,final-calibration-year,end-year,fixed industrial energy use,coal,coal cogen,share-weight,final-calibration-year,end-year,fixed industrial energy use,gas,gas,share-weight,final-calibration-year,end-year,fixed industrial energy use,gas,gas cogen,share-weight,final-calibration-year,end-year,fixed industrial energy use,refined liquids,refined liquids,share-weight,final-calibration-year,end-year,fixed industrial energy use,refined liquids,refined liquids cogen,share-weight,final-calibration-year,end-year,fixed \ No newline at end of file +# Industry technology interpolation functions,,,,,, +supplysector,subsector,technology,apply.to,from.year,to.year,interpolation.function +industrial energy use,biomass,biomass,share-weight,final-calibration-year,end-year,fixed +industrial energy use,biomass,biomass cogen,share-weight,final-calibration-year,end-year,fixed +industrial energy use,coal,coal,share-weight,final-calibration-year,end-year,fixed +industrial energy use,coal,coal cogen,share-weight,final-calibration-year,end-year,fixed +industrial energy use,gas,gas,share-weight,final-calibration-year,end-year,fixed +industrial energy use,gas,gas cogen,share-weight,final-calibration-year,end-year,fixed +industrial energy use,refined liquids,refined liquids,share-weight,final-calibration-year,end-year,fixed +industrial energy use,refined liquids,refined liquids cogen,share-weight,final-calibration-year,end-year,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_shrwt.csv index 2c57513068..dff9968f90 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.globaltech_shrwt.csv @@ -1 +1,18 @@ -# Industry (intermediate service) default shareweights,,,,,,, supplysector,subsector,technology,1971,2010,2019,2020,2100 industrial energy use,biomass,biomass,1,1,1,1,1 industrial energy use,biomass,biomass cogen,0,0,1,1,1 industrial energy use,coal,coal,1,1,1,1,1 industrial energy use,coal,coal cogen,1,1,1,1,1 industrial energy use,district heat,district heat,1,1,1,1,1 industrial energy use,electricity,electricity,1,1,1,1,1 industrial energy use,gas,gas,1,1,1,1,1 industrial energy use,gas,gas cogen,1,1,1,1,1 industrial energy use,hydrogen,hydrogen,0,0,0,1,1 industrial energy use,hydrogen,hydrogen cogen,0,0,0,1,1 industrial energy use,refined liquids,refined liquids,1,1,1,1,1 industrial energy use,refined liquids,refined liquids cogen,1,1,1,1,1 industrial feedstocks,coal,coal,1,1,1,1,1 industrial feedstocks,gas,gas,1,1,1,1,1 industrial feedstocks,refined liquids,refined liquids,1,1,1,1,1 industry,industry,industry,1,1,1,1,1 \ No newline at end of file +# Industry (intermediate service) default shareweights,,,,,,, +supplysector,subsector,technology,1971,2010,2019,2020,2100 +industrial energy use,biomass,biomass,1,1,1,1,1 +industrial energy use,biomass,biomass cogen,0,0,1,1,1 +industrial energy use,coal,coal,1,1,1,1,1 +industrial energy use,coal,coal cogen,1,1,1,1,1 +industrial energy use,district heat,district heat,1,1,1,1,1 +industrial energy use,electricity,electricity,1,1,1,1,1 +industrial energy use,gas,gas,1,1,1,1,1 +industrial energy use,gas,gas cogen,1,1,1,1,1 +industrial energy use,hydrogen,hydrogen,0,0,0,1,1 +industrial energy use,hydrogen,hydrogen cogen,0,0,0,1,1 +industrial energy use,refined liquids,refined liquids,1,1,1,1,1 +industrial energy use,refined liquids,refined liquids cogen,1,1,1,1,1 +industrial feedstocks,coal,coal,1,1,1,1,1 +industrial feedstocks,gas,gas,1,1,1,1,1 +industrial feedstocks,refined liquids,refined liquids,1,1,1,1,1 +industry,industry,industry,1,1,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.nonenergy_Cseq.csv b/input/gcam-data-system/energy-data/assumptions/A32.nonenergy_Cseq.csv index 24ffe33ac2..bdb51960ac 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.nonenergy_Cseq.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.nonenergy_Cseq.csv @@ -1 +1,5 @@ -# Sequestration of carbon through non-energy use. Following CDIAC method (not EPA FCCC method),,,, supplysector,subsector,technology,remove.fraction,target.gas industrial feedstocks,coal,coal,0,CO2 industrial feedstocks,gas,gas,0,CO2 industrial feedstocks,refined liquids,refined liquids,1,CO2 \ No newline at end of file +# Sequestration of carbon through non-energy use. Following CDIAC method (not EPA FCCC method),,,, +supplysector,subsector,technology,remove.fraction,target.gas +industrial feedstocks,coal,coal,0,CO2 +industrial feedstocks,gas,gas,0,CO2 +industrial feedstocks,refined liquids,refined liquids,1,CO2 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.sector.csv b/input/gcam-data-system/energy-data/assumptions/A32.sector.csv index 4e1875bcad..5b520f859c 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.sector.csv @@ -1 +1,5 @@ -# Industry default supplysector information (units and logit exponents),,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type industrial energy use,EJ,EJ,1975$/GJ,-3,industry, industrial feedstocks,EJ,EJ,1975$/GJ,-1,industry, industry,EJ,EJ,1975$/GJ,-3,, \ No newline at end of file +# Industry default supplysector information (units and logit exponents),,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type +industrial energy use,EJ,EJ,1975$/GJ,-3,industry, +industrial feedstocks,EJ,EJ,1975$/GJ,-1,industry, +industry,EJ,EJ,1975$/GJ,-3,, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A32.subsector_interp.csv index b534929325..2f5e24399b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.subsector_interp.csv @@ -1 +1,12 @@ -# Industry default subsector shareweight interpolation,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function industrial energy use,biomass,share-weight,final-calibration-year,end-year,,fixed industrial energy use,coal,share-weight,final-calibration-year,end-year,,fixed industrial energy use,district heat,share-weight,final-calibration-year,end-year,,fixed industrial energy use,electricity,share-weight,final-calibration-year,end-year,,fixed industrial energy use,gas,share-weight,final-calibration-year,end-year,,fixed industrial energy use,hydrogen,share-weight,final-calibration-year,2050,,linear industrial energy use,refined liquids,share-weight,final-calibration-year,end-year,,fixed industrial feedstocks,coal,share-weight,final-calibration-year,end-year,,fixed industrial feedstocks,gas,share-weight,final-calibration-year,end-year,,fixed industrial feedstocks,refined liquids,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# Industry default subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +industrial energy use,biomass,share-weight,final-calibration-year,end-year,,fixed +industrial energy use,coal,share-weight,final-calibration-year,end-year,,fixed +industrial energy use,district heat,share-weight,final-calibration-year,end-year,,fixed +industrial energy use,electricity,share-weight,final-calibration-year,end-year,,fixed +industrial energy use,gas,share-weight,final-calibration-year,end-year,,fixed +industrial energy use,hydrogen,share-weight,final-calibration-year,2050,,linear +industrial energy use,refined liquids,share-weight,final-calibration-year,end-year,,fixed +industrial feedstocks,coal,share-weight,final-calibration-year,end-year,,fixed +industrial feedstocks,gas,share-weight,final-calibration-year,end-year,,fixed +industrial feedstocks,refined liquids,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A32.subsector_logit.csv index 513cc24233..c19bf0552b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.subsector_logit.csv @@ -1 +1,13 @@ -# Industry default subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type industrial energy use,biomass,-6, industrial energy use,coal,-6, industrial energy use,district heat,-6, industrial energy use,electricity,-6, industrial energy use,gas,-6, industrial energy use,hydrogen,-6, industrial energy use,refined liquids,-6, industrial feedstocks,coal,-6, industrial feedstocks,gas,-6, industrial feedstocks,refined liquids,-6, industry,industry,-6, \ No newline at end of file +# Industry default subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +industrial energy use,biomass,-6, +industrial energy use,coal,-6, +industrial energy use,district heat,-6, +industrial energy use,electricity,-6, +industrial energy use,gas,-6, +industrial energy use,hydrogen,-6, +industrial energy use,refined liquids,-6, +industrial feedstocks,coal,-6, +industrial feedstocks,gas,-6, +industrial feedstocks,refined liquids,-6, +industry,industry,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A32.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A32.subsector_shrwt.csv index b573ce4f5e..da35acd084 100644 --- a/input/gcam-data-system/energy-data/assumptions/A32.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A32.subsector_shrwt.csv @@ -1 +1,14 @@ -# Industry default subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight industrial energy use,biomass,start-year,,1 industrial energy use,coal,start-year,,1 industrial energy use,district heat,start-year,,1 industrial energy use,electricity,start-year,,1 industrial energy use,hydrogen,start-year,,0 industrial energy use,hydrogen,2020,,0.25 industrial energy use,gas,start-year,,1 industrial energy use,refined liquids,start-year,,1 industrial feedstocks,coal,start-year,,1 industrial feedstocks,gas,start-year,,1 industrial feedstocks,refined liquids,start-year,,1 industry,industry,start-year,,1 \ No newline at end of file +# Industry default subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +industrial energy use,biomass,start-year,,1 +industrial energy use,coal,start-year,,1 +industrial energy use,district heat,start-year,,1 +industrial energy use,electricity,start-year,,1 +industrial energy use,hydrogen,start-year,,0 +industrial energy use,hydrogen,2020,,0.25 +industrial energy use,gas,start-year,,1 +industrial energy use,refined liquids,start-year,,1 +industrial feedstocks,coal,start-year,,1 +industrial feedstocks,gas,start-year,,1 +industrial feedstocks,refined liquids,start-year,,1 +industry,industry,start-year,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.demand.csv b/input/gcam-data-system/energy-data/assumptions/A321.demand.csv index 8142c92644..41d057fef2 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.demand.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.demand.csv @@ -1 +1,3 @@ -# Cement final demand perCapitaBased and price elasticity,, energy.final.demand,perCapitaBased,price.elasticity cement,1,-0.4 \ No newline at end of file +# Cement final demand perCapitaBased and price elasticity,, +energy.final.demand,perCapitaBased,price.elasticity +cement,1,-0.4 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.globaltech_co2capture.csv b/input/gcam-data-system/energy-data/assumptions/A321.globaltech_co2capture.csv index 521b4374ec..dd55a52b54 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.globaltech_co2capture.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.globaltech_co2capture.csv @@ -1 +1,3 @@ -#Cement CO2 capture rates,,,, supplysector,subsector,technology,1971,2100 cement,cement,cement CCS,0.9,0.9 \ No newline at end of file +#Cement CO2 capture rates,,,, +supplysector,subsector,technology,1971,2100 +cement,cement,cement CCS,0.9,0.9 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.globaltech_coef.csv b/input/gcam-data-system/energy-data/assumptions/A321.globaltech_coef.csv index f897230839..becfe17747 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.globaltech_coef.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.globaltech_coef.csv @@ -1 +1,12 @@ -# Cement production default coefficients,,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2010,2100 cement,cement,cement,process heat cement,0.004,0.004,0.003 cement,cement,cement,elect_td_ind,0.0005,0.0005,0.0005 cement,cement,cement,limestone,1.5,1.5,1.5 cement,cement,cement CCS,process heat cement,0.004,0.004,0.003 cement,cement,cement CCS,elect_td_ind,0.0005,0.0005,0.0005 cement,cement,cement CCS,limestone,1.5,1.5,1.5 process heat cement,biomass,biomass,delivered biomass,1,1,1 process heat cement,coal,coal,delivered coal,1,1,1 process heat cement,gas,gas,wholesale gas,1,1,1 process heat cement,refined liquids,refined liquids,refined liquids industrial,1,1,1 \ No newline at end of file +# Cement production default coefficients,,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2010,2100 +cement,cement,cement,process heat cement,0.004,0.004,0.003 +cement,cement,cement,elect_td_ind,0.0005,0.0005,0.0005 +cement,cement,cement,limestone,1.5,1.5,1.5 +cement,cement,cement CCS,process heat cement,0.004,0.004,0.003 +cement,cement,cement CCS,elect_td_ind,0.0005,0.0005,0.0005 +cement,cement,cement CCS,limestone,1.5,1.5,1.5 +process heat cement,biomass,biomass,delivered biomass,1,1,1 +process heat cement,coal,coal,delivered coal,1,1,1 +process heat cement,gas,gas,wholesale gas,1,1,1 +process heat cement,refined liquids,refined liquids,refined liquids industrial,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A321.globaltech_cost.csv index 54ba4c1d42..e9243e2ca6 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.globaltech_cost.csv @@ -1 +1,8 @@ -# Cement default costs (note: CCS cost not included here; calculated in data processing),,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2100 cement,cement,cement,non-energy,0.005,0.005 cement,cement,cement CCS,non-energy,0.005,0.005 process heat cement,biomass,biomass,non-energy,1,1 process heat cement,coal,coal,non-energy,1,1 process heat cement,gas,gas,non-energy,1,1 process heat cement,refined liquids,refined liquids,non-energy,1,1 \ No newline at end of file +# Cement default costs (note: CCS cost not included here; calculated in data processing),,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2100 +cement,cement,cement,non-energy,0.005,0.005 +cement,cement,cement CCS,non-energy,0.005,0.005 +process heat cement,biomass,biomass,non-energy,1,1 +process heat cement,coal,coal,non-energy,1,1 +process heat cement,gas,gas,non-energy,1,1 +process heat cement,refined liquids,refined liquids,non-energy,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A321.globaltech_shrwt.csv index 32c8e9ebdf..c966b92691 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.globaltech_shrwt.csv @@ -1 +1,8 @@ -# Cement default shareweights,,,,,, supplysector,subsector,technology,1971,2019,2020,2100 cement,cement,cement,1,1,1,1 cement,cement,cement CCS,0,0,1,1 process heat cement,biomass,biomass,1,1,1,1 process heat cement,coal,coal,1,1,1,1 process heat cement,gas,gas,1,1,1,1 process heat cement,refined liquids,refined liquids,1,1,1,1 \ No newline at end of file +# Cement default shareweights,,,,,, +supplysector,subsector,technology,1971,2019,2020,2100 +cement,cement,cement,1,1,1,1 +cement,cement,cement CCS,0,0,1,1 +process heat cement,biomass,biomass,1,1,1,1 +process heat cement,coal,coal,1,1,1,1 +process heat cement,gas,gas,1,1,1,1 +process heat cement,refined liquids,refined liquids,1,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.sector.csv b/input/gcam-data-system/energy-data/assumptions/A321.sector.csv index bae455ef2d..e957c0de00 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.sector.csv @@ -1 +1,4 @@ -# Cement default supplysector information (units and logit exponents),,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type cement,Mt,EJ or Mt,1975$/kg,-3,industry, process heat cement,EJ,EJ,1975$/GJ,-3,industry, \ No newline at end of file +# Cement default supplysector information (units and logit exponents),,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type +cement,Mt,EJ or Mt,1975$/kg,-3,industry, +process heat cement,EJ,EJ,1975$/GJ,-3,industry, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A321.subsector_interp.csv index c8b31109ca..80cdd5b6fe 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.subsector_interp.csv @@ -1 +1,7 @@ -# Cement default subsector shareweight interpolation,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function cement,cement,share-weight,final-calibration-year,end-year,,fixed process heat cement,biomass,share-weight,final-calibration-year,end-year,,fixed process heat cement,coal,share-weight,final-calibration-year,end-year,,fixed process heat cement,gas,share-weight,final-calibration-year,end-year,,fixed process heat cement,refined liquids,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# Cement default subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +cement,cement,share-weight,final-calibration-year,end-year,,fixed +process heat cement,biomass,share-weight,final-calibration-year,end-year,,fixed +process heat cement,coal,share-weight,final-calibration-year,end-year,,fixed +process heat cement,gas,share-weight,final-calibration-year,end-year,,fixed +process heat cement,refined liquids,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A321.subsector_logit.csv index a1bf72cee3..8e9c7afac6 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.subsector_logit.csv @@ -1 +1,7 @@ -# Cement default subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type cement,cement,-12, process heat cement,biomass,-6, process heat cement,coal,-6, process heat cement,gas,-6, process heat cement,refined liquids,-6, \ No newline at end of file +# Cement default subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +cement,cement,-12, +process heat cement,biomass,-6, +process heat cement,coal,-6, +process heat cement,gas,-6, +process heat cement,refined liquids,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A321.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A321.subsector_shrwt.csv index 172e8bacf3..421635d12c 100644 --- a/input/gcam-data-system/energy-data/assumptions/A321.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A321.subsector_shrwt.csv @@ -1 +1,7 @@ -# Cement default subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight cement,cement,start-year,,1 process heat cement,biomass,start-year,,1 process heat cement,coal,start-year,,1 process heat cement,gas,start-year,,1 process heat cement,refined liquids,start-year,,1 \ No newline at end of file +# Cement default subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +cement,cement,start-year,,1 +process heat cement,biomass,start-year,,1 +process heat cement,coal,start-year,,1 +process heat cement,gas,start-year,,1 +process heat cement,refined liquids,start-year,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_co2capture.csv b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_co2capture.csv index 708f8ba731..91896ebbce 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_co2capture.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_co2capture.csv @@ -1 +1,4 @@ -#Fertilizer CO2 capture rates,,,, supplysector,subsector,technology,1971,2100 N fertilizer,coal,coal CCS,0.9,0.9 N fertilizer,gas,gas CCS,0.9,0.9 \ No newline at end of file +#Fertilizer CO2 capture rates,,,, +supplysector,subsector,technology,1971,2100 +N fertilizer,coal,coal CCS,0.9,0.9 +N fertilizer,gas,gas CCS,0.9,0.9 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_coef.csv b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_coef.csv index 73720d03ed..736cbca36a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_coef.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_coef.csv @@ -1 +1,8 @@ -# Fertilizer production default coefficients,,,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2010,2050,2100 N fertilizer,coal,coal,delivered coal,0.054,0.054,0.0442,0.0390 N fertilizer,coal,coal CCS,delivered coal,0.06,0.06,0.0491,0.0433 N fertilizer,gas,gas,wholesale gas,0.04,0.035,0.0286,0.0253 N fertilizer,gas,gas CCS,wholesale gas,0.045,0.04,0.0327,0.0289 N fertilizer,refined liquids,refined liquids,refined liquids industrial,0.05,0.045,0.0368,0.0325 Exports_fertilizer,N fertilizer,N fertilizer,N fertilizer,1,1,1,1 \ No newline at end of file +# Fertilizer production default coefficients,,,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2010,2050,2100 +N fertilizer,coal,coal,delivered coal,0.054,0.054,0.0442,0.0390 +N fertilizer,coal,coal CCS,delivered coal,0.06,0.06,0.0491,0.0433 +N fertilizer,gas,gas,wholesale gas,0.04,0.035,0.0286,0.0253 +N fertilizer,gas,gas CCS,wholesale gas,0.045,0.04,0.0327,0.0289 +N fertilizer,refined liquids,refined liquids,refined liquids industrial,0.05,0.045,0.0368,0.0325 +Exports_fertilizer,N fertilizer,N fertilizer,N fertilizer,1,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_renew.csv b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_renew.csv index e0acff4a81..54111d470c 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_renew.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_renew.csv @@ -1 +1,3 @@ -# Renewable input to import technologies of fertilizer production,,, supplysector,subsector,technology,renewable.input N fertilizer,Imports,Imports,renewable \ No newline at end of file +# Renewable input to import technologies of fertilizer production,,, +supplysector,subsector,technology,renewable.input +N fertilizer,Imports,Imports,renewable \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_retirement.csv b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_retirement.csv index 12eeda0aa6..bae9be7101 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_retirement.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_retirement.csv @@ -1,11 +1,11 @@ -# Fertilizer technology retirement parameters,,,,,,,,, -supplysector,subsector,technology,year,lifetime,shutdown.rate,half.life,steepness,median.shutdown.point,profit.shutdown.steepness -N fertilizer,coal,coal,final-calibration-year,40,,20,0.15,-0.1,6 -N fertilizer,gas,gas,final-calibration-year,40,,20,0.15,-0.1,6 -N fertilizer,refined liquids,refined liquids,final-calibration-year,40,,20,0.15,-0.1,6 -N fertilizer,coal,coal,initial-future-year,40,,30,0.3,-0.1,6 -N fertilizer,coal,coal CCS,initial-future-year,40,,30,0.3,-0.1,6 -N fertilizer,gas,gas,initial-future-year,40,,30,0.3,-0.1,6 -N fertilizer,gas,gas CCS,initial-future-year,40,,30,0.3,-0.1,6 -N fertilizer,refined liquids,refined liquids,initial-future-year,40,,30,0.3,-0.1,6 - +# Fertilizer technology retirement parameters,,,,,,,,, +supplysector,subsector,technology,year,lifetime,shutdown.rate,half.life,steepness,median.shutdown.point,profit.shutdown.steepness +N fertilizer,coal,coal,final-calibration-year,40,,20,0.15,-0.1,6 +N fertilizer,gas,gas,final-calibration-year,40,,20,0.15,-0.1,6 +N fertilizer,refined liquids,refined liquids,final-calibration-year,40,,20,0.15,-0.1,6 +N fertilizer,coal,coal,initial-future-year,40,,30,0.3,-0.1,6 +N fertilizer,coal,coal CCS,initial-future-year,40,,30,0.3,-0.1,6 +N fertilizer,gas,gas,initial-future-year,40,,30,0.3,-0.1,6 +N fertilizer,gas,gas CCS,initial-future-year,40,,30,0.3,-0.1,6 +N fertilizer,refined liquids,refined liquids,initial-future-year,40,,30,0.3,-0.1,6 + diff --git a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_shrwt.csv index 91ab7e305b..8a61389ed0 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.globaltech_shrwt.csv @@ -1 +1,9 @@ -# Fertilizer default shareweights,,,,,,,, supplysector,subsector,technology,1971,2010,2015,2019,2020,2100 N fertilizer,coal,coal,1,1,1,1,1,1 N fertilizer,coal,coal CCS,0,0,0,0,1,1 N fertilizer,gas,gas,1,1,1,1,1,1 N fertilizer,gas,gas CCS,0,0,0,0,1,1 N fertilizer,refined liquids,refined liquids,1,1,1,1,1,1 N fertilizer,Imports,Imports,0,0,0,0,0,0 Exports_fertilizer,N fertilizer,N fertilizer,0,0,0,0,0,0 \ No newline at end of file +# Fertilizer default shareweights,,,,,,,, +supplysector,subsector,technology,1971,2010,2015,2019,2020,2100 +N fertilizer,coal,coal,1,1,1,1,1,1 +N fertilizer,coal,coal CCS,0,0,0,0,1,1 +N fertilizer,gas,gas,1,1,1,1,1,1 +N fertilizer,gas,gas CCS,0,0,0,0,1,1 +N fertilizer,refined liquids,refined liquids,1,1,1,1,1,1 +N fertilizer,Imports,Imports,0,0,0,0,0,0 +Exports_fertilizer,N fertilizer,N fertilizer,0,0,0,0,0,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A322.sector.csv b/input/gcam-data-system/energy-data/assumptions/A322.sector.csv index 81d74ea86f..1e6c5dd746 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.sector.csv @@ -1 +1,4 @@ -# Fertilizer default supplysector information (units and logit exponents),,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type N fertilizer,Mt N,EJ,1975$/kgN,-3,industry, Exports_fertilizer,Mt N,Mt N,1975$/kgN,-3,, \ No newline at end of file +# Fertilizer default supplysector information (units and logit exponents),,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type +N fertilizer,Mt N,EJ,1975$/kgN,-3,industry, +Exports_fertilizer,Mt N,Mt N,1975$/kgN,-3,, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A322.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A322.subsector_interp.csv index 4012478086..0b6a2d4585 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.subsector_interp.csv @@ -1 +1,7 @@ -# Fertilizer default subsector shareweight interpolation,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function N fertilizer,coal,share-weight,final-calibration-year,end-year,,fixed N fertilizer,gas,share-weight,final-calibration-year,end-year,,linear N fertilizer,refined liquids,share-weight,final-calibration-year,2035,,linear N fertilizer,refined liquids,share-weight,2035,end-year,,fixed Exports_fertilizer,N fertilizer,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# Fertilizer default subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +N fertilizer,coal,share-weight,final-calibration-year,end-year,,fixed +N fertilizer,gas,share-weight,final-calibration-year,end-year,,linear +N fertilizer,refined liquids,share-weight,final-calibration-year,2035,,linear +N fertilizer,refined liquids,share-weight,2035,end-year,,fixed +Exports_fertilizer,N fertilizer,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A322.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A322.subsector_logit.csv index 023b6a552b..803f675ad2 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.subsector_logit.csv @@ -1 +1,7 @@ -# Fertilizer default technology logit exponents,,, supplysector,subsector,logit.exponent,logit.type N fertilizer,coal,-12, N fertilizer,gas,-12, N fertilizer,refined liquids,-12, N fertilizer,Imports,-6, Exports_fertilizer,N fertilizer,-12, \ No newline at end of file +# Fertilizer default technology logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +N fertilizer,coal,-12, +N fertilizer,gas,-12, +N fertilizer,refined liquids,-12, +N fertilizer,Imports,-6, +Exports_fertilizer,N fertilizer,-12, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A322.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A322.subsector_shrwt.csv index 30c70f937d..173cbe7b6a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A322.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A322.subsector_shrwt.csv @@ -1 +1,8 @@ -# Fertilizer default subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight N fertilizer,coal,start-year,,1 N fertilizer,gas,start-year,,1 N fertilizer,refined liquids,start-year,,1 N fertilizer,refined liquids,2035,,0 N fertilizer,Imports,start-year,,0 Exports_fertilizer,N fertilizer,start-year,,0 \ No newline at end of file +# Fertilizer default subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +N fertilizer,coal,start-year,,1 +N fertilizer,gas,start-year,,1 +N fertilizer,refined liquids,start-year,,1 +N fertilizer,refined liquids,2035,,0 +N fertilizer,Imports,start-year,,0 +Exports_fertilizer,N fertilizer,start-year,,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.demand.csv b/input/gcam-data-system/energy-data/assumptions/A42.demand.csv index 4044160840..8c03caadee 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.demand.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.demand.csv @@ -1 +1,3 @@ -# Aggregate building final demand perCapitaBased and price elasticity,, energy.final.demand,perCapitaBased,price.elasticity building,1,-1 \ No newline at end of file +# Aggregate building final demand perCapitaBased and price elasticity,, +energy.final.demand,perCapitaBased,price.elasticity +building,1,-1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.fuelprefElasticity.csv b/input/gcam-data-system/energy-data/assumptions/A42.fuelprefElasticity.csv index e44cf26f06..0f4fa1e990 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.fuelprefElasticity.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.fuelprefElasticity.csv @@ -1 +1,7 @@ -#Fuel preference elasticities for building energy use,, supplysector,subsector,fuelprefElasticity building,biomass,-1 building,coal,-0.7 building,electricity,0.2 building,gas,0.1 building,traditional biomass,-2 \ No newline at end of file +#Fuel preference elasticities for building energy use,, +supplysector,subsector,fuelprefElasticity +building,biomass,-1 +building,coal,-0.7 +building,electricity,0.2 +building,gas,0.1 +building,traditional biomass,-2 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A42.globaltech_cost.csv index ac6efdbff6..650fffdcd8 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.globaltech_cost.csv @@ -1 +1,9 @@ -# Aggregate building default costs,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2100 building,biomass,biomass,non-energy,3,3 building,coal,coal,non-energy,3,3 building,district heat,district heat,non-energy,3,3 building,electricity,electricity,non-energy,3,3 building,gas,gas,non-energy,3,3 building,refined liquids,refined liquids,non-energy,3,3 building,traditional biomass,traditional biomass,non-energy,3,3 \ No newline at end of file +# Aggregate building default costs,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2100 +building,biomass,biomass,non-energy,3,3 +building,coal,coal,non-energy,3,3 +building,district heat,district heat,non-energy,3,3 +building,electricity,electricity,non-energy,3,3 +building,gas,gas,non-energy,3,3 +building,refined liquids,refined liquids,non-energy,3,3 +building,traditional biomass,traditional biomass,non-energy,3,3 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.globaltech_eff.csv b/input/gcam-data-system/energy-data/assumptions/A42.globaltech_eff.csv index ff64e4f512..10988f6393 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.globaltech_eff.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.globaltech_eff.csv @@ -1 +1,9 @@ -# Aggregate building default efficiencies,,,,,,,,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2005,2020,2035,2050,2065,2080,2095,2100 building,biomass,biomass,delivered biomass,0.300,0.300,0.300,0.300,0.300,0.300,0.300,0.300,0.300 building,coal,coal,delivered coal,0.300,0.300,0.300,0.300,0.300,0.300,0.300,0.300,0.300 building,district heat,district heat,district heat,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000 building,electricity,electricity,elect_td_bld,1.000,1.000,1.078,1.161,1.252,1.349,1.454,1.567,1.606 building,gas,gas,delivered gas,0.700,0.850,0.880,0.900,0.920,0.940,0.950,0.950,0.950 building,refined liquids,refined liquids,refined liquids enduse,0.700,0.850,0.880,0.900,0.920,0.940,0.950,0.950,0.950 building,traditional biomass,traditional biomass,traditional biomass,0.200,0.200,0.200,0.200,0.200,0.200,0.200,0.200,0.200 \ No newline at end of file +# Aggregate building default efficiencies,,,,,,,,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2005,2020,2035,2050,2065,2080,2095,2100 +building,biomass,biomass,delivered biomass,0.300,0.300,0.300,0.300,0.300,0.300,0.300,0.300,0.300 +building,coal,coal,delivered coal,0.300,0.300,0.300,0.300,0.300,0.300,0.300,0.300,0.300 +building,district heat,district heat,district heat,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000,1.000 +building,electricity,electricity,elect_td_bld,1.000,1.000,1.078,1.161,1.252,1.349,1.454,1.567,1.606 +building,gas,gas,delivered gas,0.700,0.850,0.880,0.900,0.920,0.940,0.950,0.950,0.950 +building,refined liquids,refined liquids,refined liquids enduse,0.700,0.850,0.880,0.900,0.920,0.940,0.950,0.950,0.950 +building,traditional biomass,traditional biomass,traditional biomass,0.200,0.200,0.200,0.200,0.200,0.200,0.200,0.200,0.200 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.globaltech_interp.csv b/input/gcam-data-system/energy-data/assumptions/A42.globaltech_interp.csv index d44b2d7720..4c33b469c3 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.globaltech_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.globaltech_interp.csv @@ -1 +1,3 @@ -# Aggregate building default shareweight technology interpolation,,,,,,, supplysector,subsector,technology,apply.to,from.year,to.year,to.value,interpolation.function building,traditional biomass,traditional biomass,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# Aggregate building default shareweight technology interpolation,,,,,,, +supplysector,subsector,technology,apply.to,from.year,to.year,to.value,interpolation.function +building,traditional biomass,traditional biomass,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A42.globaltech_shrwt.csv index f002dbac6a..32d72ba3bb 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.globaltech_shrwt.csv @@ -1 +1,9 @@ -# Aggregate building default technology shareweights,,,,, supplysector,subsector,technology,1971,2010,2100 building,biomass,biomass,1,1,1 building,coal,coal,1,1,1 building,district heat,district heat,1,1,1 building,electricity,electricity,1,1,1 building,gas,gas,1,1,1 building,refined liquids,refined liquids,1,1,1 building,traditional biomass,traditional biomass,0,0,0 \ No newline at end of file +# Aggregate building default technology shareweights,,,,, +supplysector,subsector,technology,1971,2010,2100 +building,biomass,biomass,1,1,1 +building,coal,coal,1,1,1 +building,district heat,district heat,1,1,1 +building,electricity,electricity,1,1,1 +building,gas,gas,1,1,1 +building,refined liquids,refined liquids,1,1,1 +building,traditional biomass,traditional biomass,0,0,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.sector.csv b/input/gcam-data-system/energy-data/assumptions/A42.sector.csv index 8dc8e8ee52..ee7b46e5fb 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.sector.csv @@ -1 +1,3 @@ -# Aggregate building sector default supplysector information (units and logit exponents),,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type building,EJ,EJ,1975$/GJ,-3,building, \ No newline at end of file +# Aggregate building sector default supplysector information (units and logit exponents),,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type +building,EJ,EJ,1975$/GJ,-3,building, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A42.subsector_interp.csv index 3138b635b7..4bfaba7b63 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.subsector_interp.csv @@ -1 +1,9 @@ -# Aggregate building default subsector shareweight interpolation,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function building,biomass,share-weight,final-calibration-year,end-year,,fixed building,coal,share-weight,final-calibration-year,end-year,,fixed building,district heat,share-weight,final-calibration-year,end-year,,fixed building,electricity,share-weight,final-calibration-year,end-year,,fixed building,gas,share-weight,final-calibration-year,end-year,,fixed building,refined liquids,share-weight,final-calibration-year,end-year,,fixed building,traditional biomass,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# Aggregate building default subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +building,biomass,share-weight,final-calibration-year,end-year,,fixed +building,coal,share-weight,final-calibration-year,end-year,,fixed +building,district heat,share-weight,final-calibration-year,end-year,,fixed +building,electricity,share-weight,final-calibration-year,end-year,,fixed +building,gas,share-weight,final-calibration-year,end-year,,fixed +building,refined liquids,share-weight,final-calibration-year,end-year,,fixed +building,traditional biomass,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A42.subsector_logit.csv index 848104d933..5e2c329bb0 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.subsector_logit.csv @@ -1 +1,9 @@ -# Aggregate building default subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type building,biomass,-6, building,coal,-6, building,district heat,-6, building,electricity,-6, building,gas,-6, building,refined liquids,-6, building,traditional biomass,-6, \ No newline at end of file +# Aggregate building default subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +building,biomass,-6, +building,coal,-6, +building,district heat,-6, +building,electricity,-6, +building,gas,-6, +building,refined liquids,-6, +building,traditional biomass,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A42.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A42.subsector_shrwt.csv index 336e843894..80a57f104d 100644 --- a/input/gcam-data-system/energy-data/assumptions/A42.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A42.subsector_shrwt.csv @@ -1 +1,9 @@ -# Aggregate building default subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight building,biomass,start-year,,1 building,coal,start-year,,1 building,district heat,start-year,,1 building,electricity,start-year,,1 building,gas,start-year,,1 building,refined liquids,start-year,,1 building,traditional biomass,start-year,,1 \ No newline at end of file +# Aggregate building default subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +building,biomass,start-year,,1 +building,coal,start-year,,1 +building,district heat,start-year,,1 +building,electricity,start-year,,1 +building,gas,start-year,,1 +building,refined liquids,start-year,,1 +building,traditional biomass,start-year,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.HouseholdSize.csv b/input/gcam-data-system/energy-data/assumptions/A44.HouseholdSize.csv index d704683c47..77ac0603eb 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.HouseholdSize.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.HouseholdSize.csv @@ -1 +1,3 @@ -# Assumed household size for translating the Odyssee floorspace per house,,,,, Variable,Unit,1973,1980,1990,1998 Household size,Persons/dwelling,3.2,2.9,2.7,2.6 \ No newline at end of file +# Assumed household size for translating the Odyssee floorspace per house,,,,, +Variable,Unit,1973,1980,1990,1998 +Household size,Persons/dwelling,3.2,2.9,2.7,2.6 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.USA_TechChange.csv b/input/gcam-data-system/energy-data/assumptions/A44.USA_TechChange.csv index 3781b860df..c333efe5d4 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.USA_TechChange.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.USA_TechChange.csv @@ -1 +1,34 @@ -# Improvement rates of technologies (percent per year),,,,,,,,,,, supplysector,technology,1971,1990,2010,2020,2035,2050,2065,2080,2095,2100 resid,resid shell,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045 resid heating,biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid heating,coal,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid heating,electricity,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid heating,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 resid heating,refined liquids,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid heating,traditional biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid heating,district heat,0,0,0,0,0,0,0,0,0,0 resid cooling,electricity,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006 resid cooling,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 resid others,biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid others,coal,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid others,electricity,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003 resid others,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 resid others,refined liquids,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid others,traditional biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 resid others,district heat,0,0,0,0,0,0,0,0,0,0 comm,comm shell,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004 comm heating,biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 comm heating,coal,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 comm heating,electricity,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 comm heating,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 comm heating,refined liquids,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 comm heating,district heat,0,0,0,0,0,0,0,0,0,0 comm cooling,electricity,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006 comm cooling,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 comm others,biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 comm others,coal,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 comm others,electricity,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003 comm others,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 comm others,refined liquids,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 comm others,district heat,0,0,0,0,0,0,0,0,0,0 \ No newline at end of file +# Improvement rates of technologies (percent per year),,,,,,,,,,, +supplysector,technology,1971,1990,2010,2020,2035,2050,2065,2080,2095,2100 +resid,resid shell,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045,-0.0045 +resid heating,biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid heating,coal,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid heating,electricity,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid heating,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 +resid heating,refined liquids,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid heating,traditional biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid heating,district heat,0,0,0,0,0,0,0,0,0,0 +resid cooling,electricity,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006 +resid cooling,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 +resid others,biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid others,coal,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid others,electricity,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003 +resid others,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 +resid others,refined liquids,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid others,traditional biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +resid others,district heat,0,0,0,0,0,0,0,0,0,0 +comm,comm shell,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004,-0.004 +comm heating,biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +comm heating,coal,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +comm heating,electricity,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +comm heating,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 +comm heating,refined liquids,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +comm heating,district heat,0,0,0,0,0,0,0,0,0,0 +comm cooling,electricity,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006,0.006 +comm cooling,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 +comm others,biomass,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +comm others,coal,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +comm others,electricity,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003 +comm others,gas,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002,0.002 +comm others,refined liquids,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001 +comm others,district heat,0,0,0,0,0,0,0,0,0,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.cost_efficiency.csv b/input/gcam-data-system/energy-data/assumptions/A44.cost_efficiency.csv index 735b014444..5c34cb6515 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.cost_efficiency.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.cost_efficiency.csv @@ -1 +1,32 @@ -# Base costs and efficiencies of building technologies,,,,,,,, supplysector,subsector,technology,installed cost,lifetime,O&M cost,efficiency,UEC,shutdown.rate resid heating,biomass,biomass,500,15,100,0.4,150,0.024 resid heating,coal,coal,500,15,100,0.5,120,0.024 resid heating,electricity,electricity,2000,20,50,0.95,78.94736842,0.024 resid heating,gas,gas,1500,20,50,0.8,70.1575,0.024 resid heating,refined liquids,refined liquids,1500,15,100,0.8,68.75,0.024 resid heating,traditional biomass,traditional biomass,50,10,10,0.15,150,0.024 resid heating,district heat,district heat,500,20,20,0.9,44.44444444,0.024 resid cooling,electricity,electricity,2000,15,100,2.63,7.0092,0.034 resid cooling,gas,gas,2500,15,100,0.83,15.6626506,0.034 resid others,biomass,biomass,1000,10,25,0.3,66.66666667,0.029 resid others,coal,coal,1000,10,25,0.4,75,0.029 resid others,electricity,electricity,1500,10,20,0.95,36.84210526,0.029 resid others,gas,gas,1500,10,20,0.6,50,0.029 resid others,refined liquids,refined liquids,1500,10,50,0.6,50,0.029 resid others,traditional biomass,traditional biomass,50,10,10,0.15,66.66666667,0.029 resid others,district heat,district heat,500,20,25,0.9,22.22222222,0.029 comm heating,biomass,biomass,2000,20,200,0.4,375,0.024 comm heating,coal,coal,2000,20,200,0.5,300,0.024 comm heating,electricity,electricity,5000,25,200,0.95,210.5263158,0.024 comm heating,gas,gas,5000,25,200,0.79,211,0.024 comm heating,refined liquids,refined liquids,5000,25,200,0.82,182.9268293,0.024 comm heating,district heat,district heat,2000,20,20,0.9,166.6666667,0.024 comm cooling,electricity,electricity,4450,15,153,2.73,35.046,0.034 comm cooling,gas,gas,4000,15,200,0.83,60.24096386,0.034 comm others,biomass,biomass,2000,10,50,0.3,133.3333333,0.029 comm others,coal,coal,2000,10,50,0.4,150,0.029 comm others,electricity,electricity,3000,10,50,0.95,73.68421053,0.029 comm others,gas,gas,3000,10,100,0.6,108.3333333,0.029 comm others,refined liquids,refined liquids,3000,10,100,0.6,100,0.029 comm others,district heat,district heat,2000,20,50,0.9,66.66666667,0.029 \ No newline at end of file +# Base costs and efficiencies of building technologies,,,,,,,, +supplysector,subsector,technology,installed cost,lifetime,O&M cost,efficiency,UEC,shutdown.rate +resid heating,biomass,biomass,500,15,100,0.4,150,0.024 +resid heating,coal,coal,500,15,100,0.5,120,0.024 +resid heating,electricity,electricity,2000,20,50,0.95,78.94736842,0.024 +resid heating,gas,gas,1500,20,50,0.8,70.1575,0.024 +resid heating,refined liquids,refined liquids,1500,15,100,0.8,68.75,0.024 +resid heating,traditional biomass,traditional biomass,50,10,10,0.15,150,0.024 +resid heating,district heat,district heat,500,20,20,0.9,44.44444444,0.024 +resid cooling,electricity,electricity,2000,15,100,2.63,7.0092,0.034 +resid cooling,gas,gas,2500,15,100,0.83,15.6626506,0.034 +resid others,biomass,biomass,1000,10,25,0.3,66.66666667,0.029 +resid others,coal,coal,1000,10,25,0.4,75,0.029 +resid others,electricity,electricity,1500,10,20,0.95,36.84210526,0.029 +resid others,gas,gas,1500,10,20,0.6,50,0.029 +resid others,refined liquids,refined liquids,1500,10,50,0.6,50,0.029 +resid others,traditional biomass,traditional biomass,50,10,10,0.15,66.66666667,0.029 +resid others,district heat,district heat,500,20,25,0.9,22.22222222,0.029 +comm heating,biomass,biomass,2000,20,200,0.4,375,0.024 +comm heating,coal,coal,2000,20,200,0.5,300,0.024 +comm heating,electricity,electricity,5000,25,200,0.95,210.5263158,0.024 +comm heating,gas,gas,5000,25,200,0.79,211,0.024 +comm heating,refined liquids,refined liquids,5000,25,200,0.82,182.9268293,0.024 +comm heating,district heat,district heat,2000,20,20,0.9,166.6666667,0.024 +comm cooling,electricity,electricity,4450,15,153,2.73,35.046,0.034 +comm cooling,gas,gas,4000,15,200,0.83,60.24096386,0.034 +comm others,biomass,biomass,2000,10,50,0.3,133.3333333,0.029 +comm others,coal,coal,2000,10,50,0.4,150,0.029 +comm others,electricity,electricity,3000,10,50,0.95,73.68421053,0.029 +comm others,gas,gas,3000,10,100,0.6,108.3333333,0.029 +comm others,refined liquids,refined liquids,3000,10,100,0.6,100,0.029 +comm others,district heat,district heat,2000,20,50,0.9,66.66666667,0.029 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.demandFn_flsp.csv b/input/gcam-data-system/energy-data/assumptions/A44.demandFn_flsp.csv index 313d0a13b4..2b65b9b49f 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.demandFn_flsp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.demandFn_flsp.csv @@ -1 +1,4 @@ -# Floorspace demand function type,, gcam.consumer,nodeInput,prodDmdFnType resid,resid,building-function comm,comm,building-function \ No newline at end of file +# Floorspace demand function type,, +gcam.consumer,nodeInput,prodDmdFnType +resid,resid,building-function +comm,comm,building-function \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.demandFn_serv.csv b/input/gcam-data-system/energy-data/assumptions/A44.demandFn_serv.csv index 6b3cc2d242..1a6035c033 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.demandFn_serv.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.demandFn_serv.csv @@ -1 +1,4 @@ -# Building service demand function type,,, gcam.consumer,nodeInput,building.node.input,prodDmdFnType resid,resid,resid_building,building-service-function comm,comm,comm_building,building-service-function \ No newline at end of file +# Building service demand function type,,, +gcam.consumer,nodeInput,building.node.input,prodDmdFnType +resid,resid,resid_building,building-service-function +comm,comm,comm_building,building-service-function \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.demand_satiation_mult.csv b/input/gcam-data-system/energy-data/assumptions/A44.demand_satiation_mult.csv index 4d893bd24f..2c61d7510e 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.demand_satiation_mult.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.demand_satiation_mult.csv @@ -1 +1,8 @@ -#Assumed increase in demand of services (per unit floorspace) in USA, supplysector,multiplier resid heating,1.1 resid cooling,1.1 resid others,1.3 comm heating,1.1 comm cooling,1.1 comm others,1.3 \ No newline at end of file +#Assumed increase in demand of services (per unit floorspace) in USA, +supplysector,multiplier +resid heating,1.1 +resid cooling,1.1 +resid others,1.3 +comm heating,1.1 +comm cooling,1.1 +comm others,1.3 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.demand_satiation_mult_SSPs.csv b/input/gcam-data-system/energy-data/assumptions/A44.demand_satiation_mult_SSPs.csv index a368f4287f..0766be5101 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.demand_satiation_mult_SSPs.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.demand_satiation_mult_SSPs.csv @@ -1 +1,12 @@ -#Assumed increase in demand of services (per unit floorspace) in USA,, SSP,supplysector,multiplier SSP1,resid others,1.17 SSP1,comm others,1.17 SSP2,resid others,1.3 SSP2,comm others,1.3 SSP3,resid others,1.3 SSP3,comm others,1.3 SSP4,resid others,1.3 SSP4,comm others,1.3 SSP5,resid others,1.43 SSP5,comm others,1.43 \ No newline at end of file +#Assumed increase in demand of services (per unit floorspace) in USA,, +SSP,supplysector,multiplier +SSP1,resid others,1.17 +SSP1,comm others,1.17 +SSP2,resid others,1.3 +SSP2,comm others,1.3 +SSP3,resid others,1.3 +SSP3,comm others,1.3 +SSP4,resid others,1.3 +SSP4,comm others,1.3 +SSP5,resid others,1.43 +SSP5,comm others,1.43 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.flsp_bm2_state_comm.csv b/input/gcam-data-system/energy-data/assumptions/A44.flsp_bm2_state_comm.csv index 2d3f158685..f242f79e5b 100755 --- a/input/gcam-data-system/energy-data/assumptions/A44.flsp_bm2_state_comm.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.flsp_bm2_state_comm.csv @@ -1 +1,57 @@ -# rgcam-data/Level1//L121_flsp_bm2_state_comm.csv,,,,,,,,, # Written by L121_Comm_flsp.R,,,,,,,,, # Thu Apr 05 20:19:02 2012,,,,,,,,, # " Commercial floorspace by state ",,,,,,,,, # " Unit = billion m2 ",,,,,,,,, state,GCAM_sector,X1975,X1980,X1985,X1990,X1995,X2000,X2005,X2008 AK,comm,0.00505321,0.005398191,0.009820448,0.01022155,0.010520984,0.012603565,0.013446931,0.013821262 AL,comm,0.072051395,0.076263726,0.098189297,0.1158003,0.121323255,0.117509477,0.119969552,0.123464733 AR,comm,0.036844288,0.039009518,0.046215949,0.065261593,0.051590121,0.060756946,0.062978556,0.065055208 AZ,comm,0.03468755,0.041266754,0.065350149,0.103351813,0.097985067,0.117829039,0.136258997,0.148221455 CA,comm,0.289324683,0.317938353,0.487635656,0.553991233,0.551002958,0.682794382,0.718961831,0.734731196 CO,comm,0.039262439,0.043874173,0.065867135,0.092894479,0.085043413,0.098703742,0.106291356,0.112549934 CT,comm,0.06422947,0.064751973,0.075456444,0.074676564,0.071714218,0.083235516,0.084838148,0.085460659 DC,comm,0.012340323,0.011143809,0.013133322,0.013336617,0.010330109,0.012011103,0.012227589,0.012396177 DE,comm,0.010240479,0.010375759,0.012796601,0.01463903,0.013459312,0.016520792,0.017644606,0.018407295 FL,comm,0.148711829,0.170148141,0.234935195,0.28431389,0.265815221,0.337115194,0.37360055,0.387045774 GA,comm,0.088406967,0.095373103,0.123409776,0.142357214,0.134703456,0.172897858,0.191117259,0.203730573 HI,comm,0.011904065,0.012958997,0.019174454,0.020594423,0.020653562,0.024334782,0.02543046,0.025859564 IA,comm,0.070763984,0.071573625,0.075086344,0.083807609,0.067087448,0.078866537,0.079439307,0.080638849 ID,comm,0.012630788,0.014330409,0.020405405,0.028386947,0.026504537,0.029636893,0.032517477,0.034835518 IL,comm,0.24956005,0.252538727,0.277386614,0.271739163,0.244324454,0.294079171,0.299678302,0.303662411 IN,comm,0.118589383,0.121340043,0.132836651,0.13180096,0.119065272,0.144032659,0.147850525,0.151046972 KS,comm,0.056019214,0.058060474,0.064411774,0.074776148,0.061091127,0.072527068,0.073845764,0.07534338 KY,comm,0.067917975,0.071698132,0.091325429,0.105668836,0.109725722,0.106873453,0.110394369,0.113182754 LA,comm,0.066301927,0.071758057,0.087546769,0.117212745,0.090028232,0.10137876,0.102030092,0.100982544 MA,comm,0.119973273,0.119541555,0.138619507,0.136680891,0.133144441,0.155237799,0.15743391,0.15964339 MD,comm,0.072258986,0.073618572,0.09133776,0.105056966,0.09413639,0.111563763,0.117276654,0.118876086 ME,comm,0.022336957,0.023434328,0.027412504,0.027896017,0.027177316,0.031159981,0.031999722,0.032196361 MI,comm,0.20151058,0.204702201,0.220849564,0.22097642,0.198582719,0.235386098,0.238583892,0.236501588 MN,comm,0.096596739,0.100120511,0.111031458,0.13206206,0.108758458,0.132889252,0.137538045,0.140878 MO,comm,0.118109371,0.120771526,0.132683312,0.154433323,0.125741676,0.150991513,0.156393693,0.160425545 MS,comm,0.046994398,0.049367944,0.063970408,0.073814867,0.07658357,0.075183012,0.076550466,0.077608826 MT,comm,0.011358967,0.011943184,0.016880193,0.02253129,0.019759462,0.020600036,0.021318592,0.022076509 NC,comm,0.096840996,0.10268195,0.129438695,0.145747932,0.134644711,0.169730338,0.18212641,0.194262258 ND,comm,0.015693342,0.016033082,0.017963827,0.019279639,0.015150278,0.017269824,0.017112667,0.017275777 NE,comm,0.037904514,0.038560559,0.04204944,0.047638245,0.038614189,0.046146549,0.047180153,0.047994302 NH,comm,0.017264444,0.019182576,0.02349527,0.02519994,0.025160405,0.030263029,0.031750483,0.03224957 NJ,comm,0.12863555,0.129109893,0.153377509,0.198682945,0.169534705,0.179560521,0.183626622,0.184511782 NM,comm,0.017609764,0.019779968,0.029525988,0.042720504,0.038276123,0.041524526,0.043707582,0.045309097 NV,comm,0.009412144,0.012152736,0.01952229,0.033883712,0.034712458,0.046026284,0.054933947,0.059653953 NY,comm,0.315612205,0.30780384,0.360694234,0.461354685,0.386316406,0.404617559,0.411706486,0.414622119 OH,comm,0.238038344,0.238639605,0.261208373,0.257867954,0.229328956,0.268689918,0.271324317,0.272572971 OK,comm,0.047339657,0.051615334,0.0649698,0.087332258,0.067928124,0.078352675,0.080140842,0.082664684 OR,comm,0.031295067,0.035371326,0.04928993,0.052819671,0.054961528,0.0689108,0.072666327,0.075982868 PA,comm,0.208721195,0.207981403,0.238633112,0.304723055,0.256355825,0.261654865,0.264480174,0.267636665 RI,comm,0.019644695,0.019735669,0.022840021,0.022796653,0.021725438,0.025634694,0.025982423,0.025702176 SC,comm,0.050662657,0.054499714,0.068366838,0.076611603,0.069331916,0.084526491,0.089413523,0.094604159 SD,comm,0.016728846,0.016967751,0.018532265,0.021006115,0.017197786,0.02035356,0.021010471,0.021668943 TN,comm,0.083739079,0.089919361,0.116548501,0.139783959,0.149170933,0.150540843,0.158261705,0.164720933 TX,comm,0.214440608,0.242768278,0.323182202,0.471600428,0.388565033,0.475159037,0.517261409,0.551342663 UT,comm,0.018764868,0.022180826,0.033724872,0.048579319,0.044972944,0.051182673,0.057005438,0.062198384 VA,comm,0.088115773,0.093343002,0.118287078,0.136007499,0.123701136,0.149250851,0.158900884,0.163764975 VT,comm,0.009995689,0.010657112,0.012493883,0.012784713,0.012800377,0.014879738,0.015097139,0.015151666 WA,comm,0.048646583,0.055508548,0.081148059,0.090438205,0.095019859,0.118727219,0.125760321,0.131882169 WI,comm,0.101200672,0.104002672,0.115525388,0.116296192,0.105603918,0.127070371,0.131023434,0.133060791 WV,comm,0.032161399,0.034036248,0.039465867,0.039411627,0.034114826,0.037960358,0.037896452,0.038126551 WY,comm,0.005794727,0.00712861,0.010257501,0.01278988,0.010884992,0.011264953,0.011545095,0.012154891 \ No newline at end of file +# rgcam-data/Level1//L121_flsp_bm2_state_comm.csv,,,,,,,,, +# Written by L121_Comm_flsp.R,,,,,,,,, +# Thu Apr 05 20:19:02 2012,,,,,,,,, +# " Commercial floorspace by state ",,,,,,,,, +# " Unit = billion m2 ",,,,,,,,, +state,GCAM_sector,X1975,X1980,X1985,X1990,X1995,X2000,X2005,X2008 +AK,comm,0.00505321,0.005398191,0.009820448,0.01022155,0.010520984,0.012603565,0.013446931,0.013821262 +AL,comm,0.072051395,0.076263726,0.098189297,0.1158003,0.121323255,0.117509477,0.119969552,0.123464733 +AR,comm,0.036844288,0.039009518,0.046215949,0.065261593,0.051590121,0.060756946,0.062978556,0.065055208 +AZ,comm,0.03468755,0.041266754,0.065350149,0.103351813,0.097985067,0.117829039,0.136258997,0.148221455 +CA,comm,0.289324683,0.317938353,0.487635656,0.553991233,0.551002958,0.682794382,0.718961831,0.734731196 +CO,comm,0.039262439,0.043874173,0.065867135,0.092894479,0.085043413,0.098703742,0.106291356,0.112549934 +CT,comm,0.06422947,0.064751973,0.075456444,0.074676564,0.071714218,0.083235516,0.084838148,0.085460659 +DC,comm,0.012340323,0.011143809,0.013133322,0.013336617,0.010330109,0.012011103,0.012227589,0.012396177 +DE,comm,0.010240479,0.010375759,0.012796601,0.01463903,0.013459312,0.016520792,0.017644606,0.018407295 +FL,comm,0.148711829,0.170148141,0.234935195,0.28431389,0.265815221,0.337115194,0.37360055,0.387045774 +GA,comm,0.088406967,0.095373103,0.123409776,0.142357214,0.134703456,0.172897858,0.191117259,0.203730573 +HI,comm,0.011904065,0.012958997,0.019174454,0.020594423,0.020653562,0.024334782,0.02543046,0.025859564 +IA,comm,0.070763984,0.071573625,0.075086344,0.083807609,0.067087448,0.078866537,0.079439307,0.080638849 +ID,comm,0.012630788,0.014330409,0.020405405,0.028386947,0.026504537,0.029636893,0.032517477,0.034835518 +IL,comm,0.24956005,0.252538727,0.277386614,0.271739163,0.244324454,0.294079171,0.299678302,0.303662411 +IN,comm,0.118589383,0.121340043,0.132836651,0.13180096,0.119065272,0.144032659,0.147850525,0.151046972 +KS,comm,0.056019214,0.058060474,0.064411774,0.074776148,0.061091127,0.072527068,0.073845764,0.07534338 +KY,comm,0.067917975,0.071698132,0.091325429,0.105668836,0.109725722,0.106873453,0.110394369,0.113182754 +LA,comm,0.066301927,0.071758057,0.087546769,0.117212745,0.090028232,0.10137876,0.102030092,0.100982544 +MA,comm,0.119973273,0.119541555,0.138619507,0.136680891,0.133144441,0.155237799,0.15743391,0.15964339 +MD,comm,0.072258986,0.073618572,0.09133776,0.105056966,0.09413639,0.111563763,0.117276654,0.118876086 +ME,comm,0.022336957,0.023434328,0.027412504,0.027896017,0.027177316,0.031159981,0.031999722,0.032196361 +MI,comm,0.20151058,0.204702201,0.220849564,0.22097642,0.198582719,0.235386098,0.238583892,0.236501588 +MN,comm,0.096596739,0.100120511,0.111031458,0.13206206,0.108758458,0.132889252,0.137538045,0.140878 +MO,comm,0.118109371,0.120771526,0.132683312,0.154433323,0.125741676,0.150991513,0.156393693,0.160425545 +MS,comm,0.046994398,0.049367944,0.063970408,0.073814867,0.07658357,0.075183012,0.076550466,0.077608826 +MT,comm,0.011358967,0.011943184,0.016880193,0.02253129,0.019759462,0.020600036,0.021318592,0.022076509 +NC,comm,0.096840996,0.10268195,0.129438695,0.145747932,0.134644711,0.169730338,0.18212641,0.194262258 +ND,comm,0.015693342,0.016033082,0.017963827,0.019279639,0.015150278,0.017269824,0.017112667,0.017275777 +NE,comm,0.037904514,0.038560559,0.04204944,0.047638245,0.038614189,0.046146549,0.047180153,0.047994302 +NH,comm,0.017264444,0.019182576,0.02349527,0.02519994,0.025160405,0.030263029,0.031750483,0.03224957 +NJ,comm,0.12863555,0.129109893,0.153377509,0.198682945,0.169534705,0.179560521,0.183626622,0.184511782 +NM,comm,0.017609764,0.019779968,0.029525988,0.042720504,0.038276123,0.041524526,0.043707582,0.045309097 +NV,comm,0.009412144,0.012152736,0.01952229,0.033883712,0.034712458,0.046026284,0.054933947,0.059653953 +NY,comm,0.315612205,0.30780384,0.360694234,0.461354685,0.386316406,0.404617559,0.411706486,0.414622119 +OH,comm,0.238038344,0.238639605,0.261208373,0.257867954,0.229328956,0.268689918,0.271324317,0.272572971 +OK,comm,0.047339657,0.051615334,0.0649698,0.087332258,0.067928124,0.078352675,0.080140842,0.082664684 +OR,comm,0.031295067,0.035371326,0.04928993,0.052819671,0.054961528,0.0689108,0.072666327,0.075982868 +PA,comm,0.208721195,0.207981403,0.238633112,0.304723055,0.256355825,0.261654865,0.264480174,0.267636665 +RI,comm,0.019644695,0.019735669,0.022840021,0.022796653,0.021725438,0.025634694,0.025982423,0.025702176 +SC,comm,0.050662657,0.054499714,0.068366838,0.076611603,0.069331916,0.084526491,0.089413523,0.094604159 +SD,comm,0.016728846,0.016967751,0.018532265,0.021006115,0.017197786,0.02035356,0.021010471,0.021668943 +TN,comm,0.083739079,0.089919361,0.116548501,0.139783959,0.149170933,0.150540843,0.158261705,0.164720933 +TX,comm,0.214440608,0.242768278,0.323182202,0.471600428,0.388565033,0.475159037,0.517261409,0.551342663 +UT,comm,0.018764868,0.022180826,0.033724872,0.048579319,0.044972944,0.051182673,0.057005438,0.062198384 +VA,comm,0.088115773,0.093343002,0.118287078,0.136007499,0.123701136,0.149250851,0.158900884,0.163764975 +VT,comm,0.009995689,0.010657112,0.012493883,0.012784713,0.012800377,0.014879738,0.015097139,0.015151666 +WA,comm,0.048646583,0.055508548,0.081148059,0.090438205,0.095019859,0.118727219,0.125760321,0.131882169 +WI,comm,0.101200672,0.104002672,0.115525388,0.116296192,0.105603918,0.127070371,0.131023434,0.133060791 +WV,comm,0.032161399,0.034036248,0.039465867,0.039411627,0.034114826,0.037960358,0.037896452,0.038126551 +WY,comm,0.005794727,0.00712861,0.010257501,0.01278988,0.010884992,0.011264953,0.011545095,0.012154891 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.flsp_bm2_state_res.csv b/input/gcam-data-system/energy-data/assumptions/A44.flsp_bm2_state_res.csv index bc91d14b54..f4ab1d0fd5 100755 --- a/input/gcam-data-system/energy-data/assumptions/A44.flsp_bm2_state_res.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.flsp_bm2_state_res.csv @@ -1 +1,57 @@ -# rgcam-data/Level1//L111_flsp_bm2_state_res.csv,,,,,,,,, # Written by L111_Res_flsp.R,,,,,,,,, # Thu Apr 05 20:18:49 2012,,,,,,,,, # " Residential floorspace by state ",,,,,,,,, # " Unit = billion m2 ",,,,,,,,, state,GCAM_sector,X1975,X1980,X1985,X1990,X1995,X2000,X2005,X2008 AK,resid,0.016511463,0.017638695,0.023373133,0.025056271,0.031061588,0.028666902,0.033803802,0.034744822 AL,resid,0.187704553,0.198678299,0.202690502,0.239626661,0.238851907,0.277766912,0.254976858,0.262405328 AR,resid,0.080936168,0.085692549,0.087214596,0.107305474,0.122262085,0.139976455,0.121750051,0.125764632 AZ,resid,0.103788551,0.123474174,0.144611344,0.171223018,0.231358435,0.270839508,0.340145835,0.370007939 CA,resid,0.927860535,1.019624207,1.139095252,1.280942705,1.443539355,1.467757951,1.317092074,1.345980541 CO,resid,0.117477066,0.131275826,0.145755366,0.153898346,0.200801118,0.226878477,0.265337063,0.280960466 CT,resid,0.16265178,0.163974945,0.168911486,0.175727028,0.206489391,0.235877611,0.208514025,0.210044024 DC,resid,0.03366166,0.030397835,0.030217639,0.030793185,0.031085451,0.033606364,0.036064821,0.036562065 DE,resid,0.027933752,0.028302765,0.029442898,0.033800353,0.040501878,0.046224209,0.052042113,0.054291637 FL,resid,0.434365675,0.496978033,0.578808614,0.655788236,0.798187157,0.895154562,0.85963293,0.8905696 GA,resid,0.241154566,0.260156636,0.28394582,0.328691449,0.405350793,0.48375809,0.563693285,0.600895788 HI,resid,0.03889677,0.04234378,0.045636109,0.050483482,0.060976467,0.05534964,0.063928806,0.065007518 IA,resid,0.161060054,0.16290281,0.158199674,0.165267367,0.194974859,0.208897546,0.21010109,0.213273638 ID,resid,0.037792555,0.04287799,0.045154495,0.047028674,0.062581457,0.068122778,0.081173974,0.086960542 IL,resid,0.618353828,0.625734322,0.62427153,0.744373128,0.794933585,0.852659614,0.874518935,0.88614533 IN,resid,0.293837891,0.300653409,0.298955088,0.361041417,0.387390545,0.41761146,0.431456274,0.440784121 KS,resid,0.127500702,0.132146645,0.135709387,0.147457459,0.177547873,0.192105892,0.195307286,0.199268181 KY,resid,0.17693638,0.18678425,0.188521536,0.218661525,0.216019575,0.252625658,0.234626277,0.24055256 LA,resid,0.145646021,0.15763155,0.165210412,0.192725438,0.213355564,0.233564066,0.197244423,0.195219305 MA,resid,0.303814846,0.302721583,0.310303874,0.321634067,0.383367698,0.439921839,0.386938884,0.392369314 MD,resid,0.197106461,0.20081511,0.21015333,0.242568152,0.28327603,0.312148882,0.345903154,0.350620618 ME,resid,0.056565092,0.059344023,0.061363702,0.065644212,0.078252646,0.088302953,0.078648473,0.07913177 MI,resid,0.499298019,0.507206141,0.497032258,0.605319113,0.646108362,0.682483628,0.696233694,0.690157129 MN,resid,0.219855854,0.227876019,0.233932557,0.260424431,0.31608245,0.351990079,0.363760641,0.372594154 MO,resid,0.268818977,0.274878087,0.279550921,0.304540231,0.365440424,0.399938399,0.413630061,0.424293504 MS,resid,0.122427365,0.128610805,0.132053029,0.152745806,0.150771851,0.177716332,0.162696258,0.16494564 MT,resid,0.033987144,0.035735178,0.037353661,0.037327604,0.046655255,0.047350838,0.053217992,0.055109995 NC,resid,0.264160724,0.280093547,0.297817383,0.336520346,0.405174015,0.474895556,0.537175109,0.572969343 ND,resid,0.035718319,0.036491572,0.037848048,0.038019164,0.044030938,0.045743405,0.045259584,0.045690977 NE,resid,0.086271332,0.087764501,0.088594108,0.093941915,0.112223616,0.122230559,0.124782075,0.126935336 NH,resid,0.04371969,0.048577082,0.052594858,0.059299872,0.072445282,0.085761119,0.078035898,0.079262548 NJ,resid,0.457625339,0.459312832,0.471829953,0.559346182,0.526103787,0.565481046,0.5375148,0.540105855 NM,resid,0.05269014,0.059183604,0.065337156,0.070775087,0.090376057,0.095447458,0.109108038,0.11310593 NV,resid,0.028162059,0.036362176,0.043200278,0.056135168,0.081961672,0.105795109,0.137132621,0.148915259 NY,resid,0.936005329,0.912848205,0.924993122,1.087064512,1.030029513,1.074677483,1.016176228,1.023372611 OH,resid,0.589805624,0.591295414,0.587861643,0.706375825,0.746144261,0.779045458,0.791776552,0.795420366 OK,resid,0.103991436,0.113383854,0.122605182,0.14359486,0.160981092,0.180514827,0.154928158,0.159807245 OR,resid,0.102257255,0.11557651,0.117312371,0.129477813,0.162265461,0.156738123,0.182673517,0.19101086 PA,resid,0.742532741,0.739900906,0.734098831,0.857877745,0.795528978,0.824016694,0.77419062,0.783430351 RI,resid,0.049747331,0.049977708,0.051128063,0.053644516,0.062554853,0.072645077,0.06385924,0.063170453 SC,resid,0.138196473,0.148663112,0.157300975,0.176890078,0.208634193,0.236500177,0.263721878,0.279031469 SD,resid,0.038075143,0.038618896,0.039045692,0.041423748,0.049981568,0.053911442,0.055568495,0.057310024 TN,resid,0.2181527,0.234253248,0.240589095,0.289256274,0.293676277,0.355845897,0.336360947,0.350089045 TX,resid,0.525671209,0.595112536,0.680580365,0.805063159,0.921593429,1.06846179,1.165136173,1.241904517 UT,resid,0.056146325,0.066367207,0.074628738,0.08048139,0.106188323,0.117647483,0.142303722,0.155266968 VA,resid,0.240360254,0.254618973,0.272159327,0.314030463,0.372242517,0.417595149,0.468672279,0.483018735 VT,resid,0.025312627,0.026987584,0.027967927,0.030084667,0.036856598,0.042167062,0.03710554,0.037239556 WA,resid,0.158953678,0.181375286,0.19313623,0.221692804,0.280531522,0.270045935,0.316144781,0.331534295 WI,resid,0.250752565,0.257695295,0.259995282,0.31856932,0.343592708,0.368430627,0.382351586,0.388296985 WV,resid,0.087729151,0.092843324,0.09080454,0.090998301,0.102658627,0.106210861,0.111774184,0.112452852 WY,resid,0.017338391,0.021329499,0.022698509,0.021189003,0.025701211,0.025893398,0.028820233,0.030342478 \ No newline at end of file +# rgcam-data/Level1//L111_flsp_bm2_state_res.csv,,,,,,,,, +# Written by L111_Res_flsp.R,,,,,,,,, +# Thu Apr 05 20:18:49 2012,,,,,,,,, +# " Residential floorspace by state ",,,,,,,,, +# " Unit = billion m2 ",,,,,,,,, +state,GCAM_sector,X1975,X1980,X1985,X1990,X1995,X2000,X2005,X2008 +AK,resid,0.016511463,0.017638695,0.023373133,0.025056271,0.031061588,0.028666902,0.033803802,0.034744822 +AL,resid,0.187704553,0.198678299,0.202690502,0.239626661,0.238851907,0.277766912,0.254976858,0.262405328 +AR,resid,0.080936168,0.085692549,0.087214596,0.107305474,0.122262085,0.139976455,0.121750051,0.125764632 +AZ,resid,0.103788551,0.123474174,0.144611344,0.171223018,0.231358435,0.270839508,0.340145835,0.370007939 +CA,resid,0.927860535,1.019624207,1.139095252,1.280942705,1.443539355,1.467757951,1.317092074,1.345980541 +CO,resid,0.117477066,0.131275826,0.145755366,0.153898346,0.200801118,0.226878477,0.265337063,0.280960466 +CT,resid,0.16265178,0.163974945,0.168911486,0.175727028,0.206489391,0.235877611,0.208514025,0.210044024 +DC,resid,0.03366166,0.030397835,0.030217639,0.030793185,0.031085451,0.033606364,0.036064821,0.036562065 +DE,resid,0.027933752,0.028302765,0.029442898,0.033800353,0.040501878,0.046224209,0.052042113,0.054291637 +FL,resid,0.434365675,0.496978033,0.578808614,0.655788236,0.798187157,0.895154562,0.85963293,0.8905696 +GA,resid,0.241154566,0.260156636,0.28394582,0.328691449,0.405350793,0.48375809,0.563693285,0.600895788 +HI,resid,0.03889677,0.04234378,0.045636109,0.050483482,0.060976467,0.05534964,0.063928806,0.065007518 +IA,resid,0.161060054,0.16290281,0.158199674,0.165267367,0.194974859,0.208897546,0.21010109,0.213273638 +ID,resid,0.037792555,0.04287799,0.045154495,0.047028674,0.062581457,0.068122778,0.081173974,0.086960542 +IL,resid,0.618353828,0.625734322,0.62427153,0.744373128,0.794933585,0.852659614,0.874518935,0.88614533 +IN,resid,0.293837891,0.300653409,0.298955088,0.361041417,0.387390545,0.41761146,0.431456274,0.440784121 +KS,resid,0.127500702,0.132146645,0.135709387,0.147457459,0.177547873,0.192105892,0.195307286,0.199268181 +KY,resid,0.17693638,0.18678425,0.188521536,0.218661525,0.216019575,0.252625658,0.234626277,0.24055256 +LA,resid,0.145646021,0.15763155,0.165210412,0.192725438,0.213355564,0.233564066,0.197244423,0.195219305 +MA,resid,0.303814846,0.302721583,0.310303874,0.321634067,0.383367698,0.439921839,0.386938884,0.392369314 +MD,resid,0.197106461,0.20081511,0.21015333,0.242568152,0.28327603,0.312148882,0.345903154,0.350620618 +ME,resid,0.056565092,0.059344023,0.061363702,0.065644212,0.078252646,0.088302953,0.078648473,0.07913177 +MI,resid,0.499298019,0.507206141,0.497032258,0.605319113,0.646108362,0.682483628,0.696233694,0.690157129 +MN,resid,0.219855854,0.227876019,0.233932557,0.260424431,0.31608245,0.351990079,0.363760641,0.372594154 +MO,resid,0.268818977,0.274878087,0.279550921,0.304540231,0.365440424,0.399938399,0.413630061,0.424293504 +MS,resid,0.122427365,0.128610805,0.132053029,0.152745806,0.150771851,0.177716332,0.162696258,0.16494564 +MT,resid,0.033987144,0.035735178,0.037353661,0.037327604,0.046655255,0.047350838,0.053217992,0.055109995 +NC,resid,0.264160724,0.280093547,0.297817383,0.336520346,0.405174015,0.474895556,0.537175109,0.572969343 +ND,resid,0.035718319,0.036491572,0.037848048,0.038019164,0.044030938,0.045743405,0.045259584,0.045690977 +NE,resid,0.086271332,0.087764501,0.088594108,0.093941915,0.112223616,0.122230559,0.124782075,0.126935336 +NH,resid,0.04371969,0.048577082,0.052594858,0.059299872,0.072445282,0.085761119,0.078035898,0.079262548 +NJ,resid,0.457625339,0.459312832,0.471829953,0.559346182,0.526103787,0.565481046,0.5375148,0.540105855 +NM,resid,0.05269014,0.059183604,0.065337156,0.070775087,0.090376057,0.095447458,0.109108038,0.11310593 +NV,resid,0.028162059,0.036362176,0.043200278,0.056135168,0.081961672,0.105795109,0.137132621,0.148915259 +NY,resid,0.936005329,0.912848205,0.924993122,1.087064512,1.030029513,1.074677483,1.016176228,1.023372611 +OH,resid,0.589805624,0.591295414,0.587861643,0.706375825,0.746144261,0.779045458,0.791776552,0.795420366 +OK,resid,0.103991436,0.113383854,0.122605182,0.14359486,0.160981092,0.180514827,0.154928158,0.159807245 +OR,resid,0.102257255,0.11557651,0.117312371,0.129477813,0.162265461,0.156738123,0.182673517,0.19101086 +PA,resid,0.742532741,0.739900906,0.734098831,0.857877745,0.795528978,0.824016694,0.77419062,0.783430351 +RI,resid,0.049747331,0.049977708,0.051128063,0.053644516,0.062554853,0.072645077,0.06385924,0.063170453 +SC,resid,0.138196473,0.148663112,0.157300975,0.176890078,0.208634193,0.236500177,0.263721878,0.279031469 +SD,resid,0.038075143,0.038618896,0.039045692,0.041423748,0.049981568,0.053911442,0.055568495,0.057310024 +TN,resid,0.2181527,0.234253248,0.240589095,0.289256274,0.293676277,0.355845897,0.336360947,0.350089045 +TX,resid,0.525671209,0.595112536,0.680580365,0.805063159,0.921593429,1.06846179,1.165136173,1.241904517 +UT,resid,0.056146325,0.066367207,0.074628738,0.08048139,0.106188323,0.117647483,0.142303722,0.155266968 +VA,resid,0.240360254,0.254618973,0.272159327,0.314030463,0.372242517,0.417595149,0.468672279,0.483018735 +VT,resid,0.025312627,0.026987584,0.027967927,0.030084667,0.036856598,0.042167062,0.03710554,0.037239556 +WA,resid,0.158953678,0.181375286,0.19313623,0.221692804,0.280531522,0.270045935,0.316144781,0.331534295 +WI,resid,0.250752565,0.257695295,0.259995282,0.31856932,0.343592708,0.368430627,0.382351586,0.388296985 +WV,resid,0.087729151,0.092843324,0.09080454,0.090998301,0.102658627,0.106210861,0.111774184,0.112452852 +WY,resid,0.017338391,0.021329499,0.022698509,0.021189003,0.025701211,0.025893398,0.028820233,0.030342478 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.fuelprefElasticity.csv b/input/gcam-data-system/energy-data/assumptions/A44.fuelprefElasticity.csv index 0cb87a28fd..a6296eff3e 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.fuelprefElasticity.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.fuelprefElasticity.csv @@ -1 +1,32 @@ -#Fuel preference elasticities for building energy use,, supplysector,subsector,fuelprefElasticity resid heating,biomass,-1 resid heating,coal,-0.7 resid heating,electricity,0 resid heating,gas,0 resid heating,refined liquids,0 resid heating,traditional biomass,-2 resid heating,district heat,-0.5 resid cooling,electricity,0 resid cooling,gas,-1 resid others,biomass,-1 resid others,coal,-0.7 resid others,electricity,0 resid others,gas,0 resid others,refined liquids,0 resid others,traditional biomass,-2 resid others,district heat,-0.5 comm heating,biomass,-1 comm heating,coal,-0.7 comm heating,electricity,0 comm heating,gas,0 comm heating,refined liquids,0 comm heating,district heat,-0.5 comm cooling,electricity,0 comm cooling,gas,-1 comm others,biomass,-1 comm others,coal,-0.7 comm others,electricity,0 comm others,gas,0 comm others,refined liquids,0 comm others,district heat,-0.5 \ No newline at end of file +#Fuel preference elasticities for building energy use,, +supplysector,subsector,fuelprefElasticity +resid heating,biomass,-1 +resid heating,coal,-0.7 +resid heating,electricity,0 +resid heating,gas,0 +resid heating,refined liquids,0 +resid heating,traditional biomass,-2 +resid heating,district heat,-0.5 +resid cooling,electricity,0 +resid cooling,gas,-1 +resid others,biomass,-1 +resid others,coal,-0.7 +resid others,electricity,0 +resid others,gas,0 +resid others,refined liquids,0 +resid others,traditional biomass,-2 +resid others,district heat,-0.5 +comm heating,biomass,-1 +comm heating,coal,-0.7 +comm heating,electricity,0 +comm heating,gas,0 +comm heating,refined liquids,0 +comm heating,district heat,-0.5 +comm cooling,electricity,0 +comm cooling,gas,-1 +comm others,biomass,-1 +comm others,coal,-0.7 +comm others,electricity,0 +comm others,gas,0 +comm others,refined liquids,0 +comm others,district heat,-0.5 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.gcam_consumer.csv b/input/gcam-data-system/energy-data/assumptions/A44.gcam_consumer.csv index 60e9183017..e51c2d72ff 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.gcam_consumer.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.gcam_consumer.csv @@ -1 +1,4 @@ -# GCAM consumer attributes,,,,, gcam.consumer,nodeInput,building.node.input,price.exponent,internal.gains.market.name,internal.gains.unit resid,resid,resid_building,-0.1,resid-internal-gains-trial-market,EJ comm,comm,comm_building,-0.1,comm-internal-gains-trial-market,EJ \ No newline at end of file +# GCAM consumer attributes,,,,, +gcam.consumer,nodeInput,building.node.input,price.exponent,internal.gains.market.name,internal.gains.unit +resid,resid,resid_building,-0.1,resid-internal-gains-trial-market,EJ +comm,comm,comm_building,-0.1,comm-internal-gains-trial-market,EJ \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A44.globaltech_shrwt.csv index 095dcd2d44..1e47f95a8a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.globaltech_shrwt.csv @@ -1 +1,32 @@ -# Building default technology shareweights,,,,, supplysector,subsector,technology,1971,2010,2100 resid heating,biomass,biomass,1,1,1 resid heating,coal,coal,1,1,1 resid heating,electricity,electricity,1,1,1 resid heating,gas,gas,1,1,1 resid heating,refined liquids,refined liquids,1,1,1 resid heating,traditional biomass,traditional biomass,1,1,1 resid heating,district heat,district heat,1,1,1 resid cooling,electricity,electricity,1,1,1 resid cooling,gas,gas,1,1,1 resid others,biomass,biomass,1,1,1 resid others,coal,coal,1,1,1 resid others,electricity,electricity,1,1,1 resid others,gas,gas,1,1,1 resid others,refined liquids,refined liquids,1,1,1 resid others,traditional biomass,traditional biomass,1,1,1 resid others,district heat,district heat,1,1,1 comm heating,biomass,biomass,1,1,1 comm heating,coal,coal,1,1,1 comm heating,electricity,electricity,1,1,1 comm heating,gas,gas,1,1,1 comm heating,refined liquids,refined liquids,1,1,1 comm heating,district heat,district heat,1,1,1 comm cooling,electricity,electricity,1,1,1 comm cooling,gas,gas,1,1,1 comm others,biomass,biomass,1,1,1 comm others,coal,coal,1,1,1 comm others,electricity,electricity,1,1,1 comm others,gas,gas,1,1,1 comm others,refined liquids,refined liquids,1,1,1 comm others,district heat,district heat,1,1,1 \ No newline at end of file +# Building default technology shareweights,,,,, +supplysector,subsector,technology,1971,2010,2100 +resid heating,biomass,biomass,1,1,1 +resid heating,coal,coal,1,1,1 +resid heating,electricity,electricity,1,1,1 +resid heating,gas,gas,1,1,1 +resid heating,refined liquids,refined liquids,1,1,1 +resid heating,traditional biomass,traditional biomass,1,1,1 +resid heating,district heat,district heat,1,1,1 +resid cooling,electricity,electricity,1,1,1 +resid cooling,gas,gas,1,1,1 +resid others,biomass,biomass,1,1,1 +resid others,coal,coal,1,1,1 +resid others,electricity,electricity,1,1,1 +resid others,gas,gas,1,1,1 +resid others,refined liquids,refined liquids,1,1,1 +resid others,traditional biomass,traditional biomass,1,1,1 +resid others,district heat,district heat,1,1,1 +comm heating,biomass,biomass,1,1,1 +comm heating,coal,coal,1,1,1 +comm heating,electricity,electricity,1,1,1 +comm heating,gas,gas,1,1,1 +comm heating,refined liquids,refined liquids,1,1,1 +comm heating,district heat,district heat,1,1,1 +comm cooling,electricity,electricity,1,1,1 +comm cooling,gas,gas,1,1,1 +comm others,biomass,biomass,1,1,1 +comm others,coal,coal,1,1,1 +comm others,electricity,electricity,1,1,1 +comm others,gas,gas,1,1,1 +comm others,refined liquids,refined liquids,1,1,1 +comm others,district heat,district heat,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.internal_gains.csv b/input/gcam-data-system/energy-data/assumptions/A44.internal_gains.csv index b1ec968602..a28f23d83c 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.internal_gains.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.internal_gains.csv @@ -1 +1,15 @@ -# internal gains fuel input ratio,,, supplysector,subsector,technology,input.ratio resid others,biomass,biomass,0.5 resid others,coal,coal,0.5 resid others,electricity,electric,0.5 resid others,gas,gas,0.5 resid others,refined liquids,oil,0.5 resid others,trad biomass,trad biomass,0.5 resid others,district heat,district heat,0.5 comm others,biomass,biomass,0.5 comm others,coal,coal,0.5 comm others,electricity,electric,0.5 comm others,gas,gas,0.5 comm others,refined liquids,oil,0.5 comm others,district heat,district heat,0.5 \ No newline at end of file +# internal gains fuel input ratio,,, +supplysector,subsector,technology,input.ratio +resid others,biomass,biomass,0.5 +resid others,coal,coal,0.5 +resid others,electricity,electric,0.5 +resid others,gas,gas,0.5 +resid others,refined liquids,oil,0.5 +resid others,trad biomass,trad biomass,0.5 +resid others,district heat,district heat,0.5 +comm others,biomass,biomass,0.5 +comm others,coal,coal,0.5 +comm others,electricity,electric,0.5 +comm others,gas,gas,0.5 +comm others,refined liquids,oil,0.5 +comm others,district heat,district heat,0.5 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.pcflsp_default.csv b/input/gcam-data-system/energy-data/assumptions/A44.pcflsp_default.csv index 324d623364..47e66be33f 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.pcflsp_default.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.pcflsp_default.csv @@ -1 +1,32 @@ -# default per-capita assumption to use for countries with no floorspace data,,,, # Source: GCAM 3.0 assumptions (Jiyong Eom),,,, # India from http://eetd.lbl.gov/sites/all/files/low-co-growth-india-2011.pdf,,,, region_GCAM3,gcam.consumer,1975,1990,2005 USA,resid,62.25796962,66.46814215,69.39578954 Canada,resid,37.25575198,43.05999819,48.33038306 Western Europe,resid,29.38865067,35.38621375,40 Japan,resid,6.331875622,28.74803283,34.56937323 Australia_NZ,resid,36.50304432,40.32238926,47.17862756 Former Soviet Union,resid,24.6120462,24.62160688,24.40555037 China,resid,26.59514901,26.90553353,28.14095812 Middle East,resid,20.89452677,18.40464827,20 Africa,resid,8.99973208,8.959575547,9.089594367 Latin America,resid,15.47345991,15.86076797,17.595 Southeast Asia,resid,6.210086019,7.269943062,8.52 Eastern Europe,resid,26.9530431,27.35131696,29.00908976 Korea,resid,5.009224663,12.23536805,22.22365076 India,resid,9.917673684,10.10755795,10.62 USA,comm,23.18527307,24.59389731,25.55633403 Canada,comm,17.18980921,18.76713091,20.20545826 Western Europe,comm,15.24736089,16.49043341,17.4480639 Japan,comm,4.213465364,11.70292703,13.63394651 Australia_NZ,comm,14.13618349,15.60261329,18.24068422 Former Soviet Union,comm,7.570519739,7.574435101,7.485972843 China,comm,8.38514849,8.520572741,9.059547115 Middle East,comm,10.25747567,9.540961892,10 Africa,comm,2.966059312,2.950893177,3 Latin America,comm,7.262955005,7.397689111,8 Southeast Asia,comm,4.21295963,4.574284966,5 Eastern Europe,comm,6.33930804,6.561920054,7.485972843 Korea,comm,9.430403565,11.39907001,13.91244933 India,comm,0.171296129,0.249268525,0.66 \ No newline at end of file +# default per-capita assumption to use for countries with no floorspace data,,,, +# Source: GCAM 3.0 assumptions (Jiyong Eom),,,, +# India from http://eetd.lbl.gov/sites/all/files/low-co-growth-india-2011.pdf,,,, +region_GCAM3,gcam.consumer,1975,1990,2005 +USA,resid,62.25796962,66.46814215,69.39578954 +Canada,resid,37.25575198,43.05999819,48.33038306 +Western Europe,resid,29.38865067,35.38621375,40 +Japan,resid,6.331875622,28.74803283,34.56937323 +Australia_NZ,resid,36.50304432,40.32238926,47.17862756 +Former Soviet Union,resid,24.6120462,24.62160688,24.40555037 +China,resid,26.59514901,26.90553353,28.14095812 +Middle East,resid,20.89452677,18.40464827,20 +Africa,resid,8.99973208,8.959575547,9.089594367 +Latin America,resid,15.47345991,15.86076797,17.595 +Southeast Asia,resid,6.210086019,7.269943062,8.52 +Eastern Europe,resid,26.9530431,27.35131696,29.00908976 +Korea,resid,5.009224663,12.23536805,22.22365076 +India,resid,9.917673684,10.10755795,10.62 +USA,comm,23.18527307,24.59389731,25.55633403 +Canada,comm,17.18980921,18.76713091,20.20545826 +Western Europe,comm,15.24736089,16.49043341,17.4480639 +Japan,comm,4.213465364,11.70292703,13.63394651 +Australia_NZ,comm,14.13618349,15.60261329,18.24068422 +Former Soviet Union,comm,7.570519739,7.574435101,7.485972843 +China,comm,8.38514849,8.520572741,9.059547115 +Middle East,comm,10.25747567,9.540961892,10 +Africa,comm,2.966059312,2.950893177,3 +Latin America,comm,7.262955005,7.397689111,8 +Southeast Asia,comm,4.21295963,4.574284966,5 +Eastern Europe,comm,6.33930804,6.561920054,7.485972843 +Korea,comm,9.430403565,11.39907001,13.91244933 +India,comm,0.171296129,0.249268525,0.66 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.satiation_flsp.csv b/input/gcam-data-system/energy-data/assumptions/A44.satiation_flsp.csv index f90b77cbf1..f8dbbd6a12 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.satiation_flsp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.satiation_flsp.csv @@ -1 +1,7 @@ -# Assumed satiation levels of floorspace (m2 per capita),, region.class,resid,comm A,60,27 B,50,24 C,45,21 D,40,19 E,35,17 \ No newline at end of file +# Assumed satiation levels of floorspace (m2 per capita),, +region.class,resid,comm +A,60,27 +B,50,24 +C,45,21 +D,40,19 +E,35,17 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.satiation_flsp_SSPs.csv b/input/gcam-data-system/energy-data/assumptions/A44.satiation_flsp_SSPs.csv index ac7255a87e..93be6431ed 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.satiation_flsp_SSPs.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.satiation_flsp_SSPs.csv @@ -1 +1,27 @@ -# Assumed satiation levels of floorspace (m2 per capita),,, SSP,region.class,resid,comm SSP1,A,54,24 SSP1,B,45,22 SSP1,C,41,19 SSP1,D,36,17 SSP1,E,32,15 SSP2,A,60,27 SSP2,B,50,24 SSP2,C,45,21 SSP2,D,40,19 SSP2,E,35,17 SSP3,A,60,27 SSP3,B,50,24 SSP3,C,45,21 SSP3,D,40,19 SSP3,E,35,17 SSP4,A,63,28.35 SSP4,B,51.25,24.6 SSP4,C,45,21 SSP4,D,39,18.525 SSP4,E,33.25,16.15 SSP5,A,66,30 SSP5,B,55,26 SSP5,C,50,23 SSP5,D,44,21 SSP5,E,39,19 \ No newline at end of file +# Assumed satiation levels of floorspace (m2 per capita),,, +SSP,region.class,resid,comm +SSP1,A,54,24 +SSP1,B,45,22 +SSP1,C,41,19 +SSP1,D,36,17 +SSP1,E,32,15 +SSP2,A,60,27 +SSP2,B,50,24 +SSP2,C,45,21 +SSP2,D,40,19 +SSP2,E,35,17 +SSP3,A,60,27 +SSP3,B,50,24 +SSP3,C,45,21 +SSP3,D,40,19 +SSP3,E,35,17 +SSP4,A,63,28.35 +SSP4,B,51.25,24.6 +SSP4,C,45,21 +SSP4,D,39,18.525 +SSP4,E,33.25,16.15 +SSP5,A,66,30 +SSP5,B,55,26 +SSP5,C,50,23 +SSP5,D,44,21 +SSP5,E,39,19 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.sector.csv b/input/gcam-data-system/energy-data/assumptions/A44.sector.csv index 6cb83af3d4..47957a3657 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.sector.csv @@ -1 +1,8 @@ -# Building sector default supplysector information (units and logit exponents),,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type resid heating,EJ,EJ,1975$/GJ,-3,building, resid cooling,EJ,EJ,1975$/GJ,-3,building, resid others,EJ,EJ,1975$/GJ,-3,building, comm heating,EJ,EJ,1975$/GJ,-3,building, comm cooling,EJ,EJ,1975$/GJ,-3,building, comm others,EJ,EJ,1975$/GJ,-3,building, \ No newline at end of file +# Building sector default supplysector information (units and logit exponents),,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type +resid heating,EJ,EJ,1975$/GJ,-3,building, +resid cooling,EJ,EJ,1975$/GJ,-3,building, +resid others,EJ,EJ,1975$/GJ,-3,building, +comm heating,EJ,EJ,1975$/GJ,-3,building, +comm cooling,EJ,EJ,1975$/GJ,-3,building, +comm others,EJ,EJ,1975$/GJ,-3,building, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.share_serv_fuel.csv b/input/gcam-data-system/energy-data/assumptions/A44.share_serv_fuel.csv index 243e06adb9..0c1793d519 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.share_serv_fuel.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.share_serv_fuel.csv @@ -1 +1,548 @@ -# Shares of res and comm TFE by region,,,, region_GCAM3,sector,fuel,service,share_TFEbysector USA,bld_comm,biomass,comm heating,0.00924934 USA,bld_comm,coal,comm heating,0 USA,bld_comm,electricity,comm heating,0.022149504 USA,bld_comm,gas,comm heating,0.143537572 USA,bld_comm,refined liquids,comm heating,0.04934104 USA,bld_comm,heat,comm heating,0 USA,bld_comm,biomass,comm cooling,0 USA,bld_comm,coal,comm cooling,0 USA,bld_comm,electricity,comm cooling,0.066837653 USA,bld_comm,gas,comm cooling,0.002526509 USA,bld_comm,refined liquids,comm cooling,0 USA,bld_comm,heat,comm cooling,0 USA,bld_comm,biomass,comm others,0 USA,bld_comm,coal,comm others,0.008885211 USA,bld_comm,electricity,comm others,0.481445804 USA,bld_comm,gas,comm others,0.186627404 USA,bld_comm,refined liquids,comm others,0.029399962 USA,bld_comm,heat,comm others,0 USA,bld_resid,biomass,resid heating,0.037587395 USA,bld_resid,coal,resid heating,0 USA,bld_resid,electricity,resid heating,0.026704525 USA,bld_resid,gas,resid heating,0.297132928 USA,bld_resid,refined liquids,resid heating,0.081668115 USA,bld_resid,traditional biomass,resid heating,0 USA,bld_resid,heat,resid heating,0 USA,bld_resid,biomass,resid cooling,0 USA,bld_resid,coal,resid cooling,0 USA,bld_resid,electricity,resid cooling,0.079130435 USA,bld_resid,gas,resid cooling,0 USA,bld_resid,refined liquids,resid cooling,0 USA,bld_resid,traditional biomass,resid cooling,0 USA,bld_resid,heat,resid cooling,0 USA,bld_resid,biomass,resid others,0 USA,bld_resid,coal,resid others,0 USA,bld_resid,electricity,resid others,0.328501791 USA,bld_resid,gas,resid others,0.122144117 USA,bld_resid,refined liquids,resid others,0.027130695 USA,bld_resid,traditional biomass,resid others,0 USA,bld_resid,heat,resid others,0 Canada,bld_comm,biomass,comm heating,0 Canada,bld_comm,coal,comm heating,0 Canada,bld_comm,electricity,comm heating,0.0765 Canada,bld_comm,gas,comm heating,0.204 Canada,bld_comm,refined liquids,comm heating,0.2295 Canada,bld_comm,heat,comm heating,0 Canada,bld_comm,biomass,comm cooling,0 Canada,bld_comm,coal,comm cooling,0 Canada,bld_comm,electricity,comm cooling,0.024 Canada,bld_comm,gas,comm cooling,0.006 Canada,bld_comm,refined liquids,comm cooling,0 Canada,bld_comm,heat,comm cooling,0 Canada,bld_comm,biomass,comm others,0 Canada,bld_comm,coal,comm others,0 Canada,bld_comm,electricity,comm others,0.281154451 Canada,bld_comm,gas,comm others,0.133161569 Canada,bld_comm,refined liquids,comm others,0.045683981 Canada,bld_comm,heat,comm others,0 Canada,bld_resid,biomass,resid heating,0.06382927 Canada,bld_resid,coal,resid heating,0 Canada,bld_resid,electricity,resid heating,0.14017073 Canada,bld_resid,gas,resid heating,0.324 Canada,bld_resid,refined liquids,resid heating,0.072 Canada,bld_resid,traditional biomass,resid heating,0 Canada,bld_resid,heat,resid heating,0 Canada,bld_resid,biomass,resid cooling,0 Canada,bld_resid,coal,resid cooling,0 Canada,bld_resid,electricity,resid cooling,0.01 Canada,bld_resid,gas,resid cooling,0 Canada,bld_resid,refined liquids,resid cooling,0 Canada,bld_resid,traditional biomass,resid cooling,0 Canada,bld_resid,heat,resid cooling,0 Canada,bld_resid,biomass,resid others,0 Canada,bld_resid,coal,resid others,0.000778978 Canada,bld_resid,electricity,resid others,0.275231318 Canada,bld_resid,gas,resid others,0.110707268 Canada,bld_resid,refined liquids,resid others,0.003282437 Canada,bld_resid,traditional biomass,resid others,0 Canada,bld_resid,heat,resid others,0 Western Europe,bld_comm,biomass,comm heating,0.009813915 Western Europe,bld_comm,coal,comm heating,0.004590893 Western Europe,bld_comm,electricity,comm heating,0.065595192 Western Europe,bld_comm,gas,comm heating,0.16 Western Europe,bld_comm,refined liquids,comm heating,0.08 Western Europe,bld_comm,heat,comm heating,0 Western Europe,bld_comm,biomass,comm cooling,0 Western Europe,bld_comm,coal,comm cooling,0 Western Europe,bld_comm,electricity,comm cooling,0.05 Western Europe,bld_comm,gas,comm cooling,0 Western Europe,bld_comm,refined liquids,comm cooling,0 Western Europe,bld_comm,heat,comm cooling,0 Western Europe,bld_comm,biomass,comm others,0 Western Europe,bld_comm,coal,comm others,0 Western Europe,bld_comm,electricity,comm others,0.351601113 Western Europe,bld_comm,gas,comm others,0.180185876 Western Europe,bld_comm,refined liquids,comm others,0.098213011 Western Europe,bld_comm,heat,comm others,0 Western Europe,bld_resid,biomass,resid heating,0.10857292 Western Europe,bld_resid,coal,resid heating,0 Western Europe,bld_resid,electricity,resid heating,0.032303092 Western Europe,bld_resid,gas,resid heating,0.29 Western Europe,bld_resid,refined liquids,resid heating,0.149123988 Western Europe,bld_resid,traditional biomass,resid heating,0 Western Europe,bld_resid,heat,resid heating,0 Western Europe,bld_resid,biomass,resid cooling,0 Western Europe,bld_resid,coal,resid cooling,0 Western Europe,bld_resid,electricity,resid cooling,0.025 Western Europe,bld_resid,gas,resid cooling,0 Western Europe,bld_resid,refined liquids,resid cooling,0 Western Europe,bld_resid,traditional biomass,resid cooling,0 Western Europe,bld_resid,heat,resid cooling,0 Western Europe,bld_resid,biomass,resid others,0 Western Europe,bld_resid,coal,resid others,0.018641998 Western Europe,bld_resid,electricity,resid others,0.184093879 Western Europe,bld_resid,gas,resid others,0.127730595 Western Europe,bld_resid,refined liquids,resid others,0.064533528 Western Europe,bld_resid,traditional biomass,resid others,0 Western Europe,bld_resid,heat,resid others,0 Japan,bld_comm,biomass,comm heating,0 Japan,bld_comm,coal,comm heating,0.010742635 Japan,bld_comm,electricity,comm heating,0.009 Japan,bld_comm,gas,comm heating,0.045 Japan,bld_comm,refined liquids,comm heating,0.115257365 Japan,bld_comm,heat,comm heating,0 Japan,bld_comm,biomass,comm cooling,0 Japan,bld_comm,coal,comm cooling,0 Japan,bld_comm,electricity,comm cooling,0.04 Japan,bld_comm,gas,comm cooling,0 Japan,bld_comm,refined liquids,comm cooling,0 Japan,bld_comm,heat,comm cooling,0 Japan,bld_comm,biomass,comm others,0 Japan,bld_comm,coal,comm others,0 Japan,bld_comm,electricity,comm others,0.349655569 Japan,bld_comm,gas,comm others,0.173822652 Japan,bld_comm,refined liquids,comm others,0.256521779 Japan,bld_comm,heat,comm others,0 Japan,bld_resid,biomass,resid heating,0.000527599 Japan,bld_resid,coal,resid heating,0 Japan,bld_resid,electricity,resid heating,0.04356999 Japan,bld_resid,gas,resid heating,0.051258812 Japan,bld_resid,refined liquids,resid heating,0.160937658 Japan,bld_resid,traditional biomass,resid heating,0 Japan,bld_resid,heat,resid heating,0 Japan,bld_resid,biomass,resid cooling,0 Japan,bld_resid,coal,resid cooling,0 Japan,bld_resid,electricity,resid cooling,0.03 Japan,bld_resid,gas,resid cooling,0 Japan,bld_resid,refined liquids,resid cooling,0 Japan,bld_resid,traditional biomass,resid cooling,0 Japan,bld_resid,heat,resid cooling,0 Japan,bld_resid,biomass,resid others,0 Japan,bld_resid,coal,resid others,0 Japan,bld_resid,electricity,resid others,0.455027702 Japan,bld_resid,gas,resid others,0.12470461 Japan,bld_resid,refined liquids,resid others,0.133973629 Japan,bld_resid,traditional biomass,resid others,0 Japan,bld_resid,heat,resid others,0 Korea,bld_comm,biomass,comm heating,0.014992801 Korea,bld_comm,coal,comm heating,0 Korea,bld_comm,electricity,comm heating,0.029661664 Korea,bld_comm,gas,comm heating,0.088984993 Korea,bld_comm,refined liquids,comm heating,0.162977185 Korea,bld_comm,heat,comm heating,0 Korea,bld_comm,biomass,comm cooling,0 Korea,bld_comm,coal,comm cooling,0 Korea,bld_comm,electricity,comm cooling,0.039 Korea,bld_comm,gas,comm cooling,0.011 Korea,bld_comm,refined liquids,comm cooling,0 Korea,bld_comm,heat,comm cooling,0 Korea,bld_comm,biomass,comm others,0 Korea,bld_comm,coal,comm others,0 Korea,bld_comm,electricity,comm others,0.407692789 Korea,bld_comm,gas,comm others,0.053200011 Korea,bld_comm,refined liquids,comm others,0.192490557 Korea,bld_comm,heat,comm others,0 Korea,bld_resid,biomass,resid heating,0.003520598 Korea,bld_resid,coal,resid heating,0.016741527 Korea,bld_resid,electricity,resid heating,0.04 Korea,bld_resid,gas,resid heating,0.3 Korea,bld_resid,refined liquids,resid heating,0.139737875 Korea,bld_resid,traditional biomass,resid heating,0 Korea,bld_resid,heat,resid heating,0 Korea,bld_resid,biomass,resid cooling,0 Korea,bld_resid,coal,resid cooling,0 Korea,bld_resid,electricity,resid cooling,0.02 Korea,bld_resid,gas,resid cooling,0 Korea,bld_resid,refined liquids,resid cooling,0 Korea,bld_resid,traditional biomass,resid cooling,0 Korea,bld_resid,heat,resid cooling,0 Korea,bld_resid,biomass,resid others,0 Korea,bld_resid,coal,resid others,0.039063563 Korea,bld_resid,electricity,resid others,0.195982972 Korea,bld_resid,gas,resid others,0.191927492 Korea,bld_resid,refined liquids,resid others,0.053025972 Korea,bld_resid,traditional biomass,resid others,0 Korea,bld_resid,heat,resid others,0 Southeast Asia,bld_comm,biomass,comm heating,0 Southeast Asia,bld_comm,coal,comm heating,0 Southeast Asia,bld_comm,electricity,comm heating,0 Southeast Asia,bld_comm,gas,comm heating,0.0125 Southeast Asia,bld_comm,refined liquids,comm heating,0.0375 Southeast Asia,bld_comm,heat,comm heating,0 Southeast Asia,bld_comm,biomass,comm cooling,0 Southeast Asia,bld_comm,coal,comm cooling,0 Southeast Asia,bld_comm,electricity,comm cooling,0.15 Southeast Asia,bld_comm,gas,comm cooling,0 Southeast Asia,bld_comm,refined liquids,comm cooling,0 Southeast Asia,bld_comm,heat,comm cooling,0 Southeast Asia,bld_comm,biomass,comm others,0.105112327 Southeast Asia,bld_comm,coal,comm others,0.000293438 Southeast Asia,bld_comm,electricity,comm others,0.468970375 Southeast Asia,bld_comm,gas,comm others,0.060460361 Southeast Asia,bld_comm,refined liquids,comm others,0.165163499 Southeast Asia,bld_comm,heat,comm others,0 Southeast Asia,bld_resid,biomass,resid heating,0 Southeast Asia,bld_resid,coal,resid heating,0 Southeast Asia,bld_resid,electricity,resid heating,0 Southeast Asia,bld_resid,gas,resid heating,0.016666667 Southeast Asia,bld_resid,refined liquids,resid heating,0.016666667 Southeast Asia,bld_resid,traditional biomass,resid heating,0.016666667 Southeast Asia,bld_resid,heat,resid heating,0 Southeast Asia,bld_resid,biomass,resid cooling,0 Southeast Asia,bld_resid,coal,resid cooling,0 Southeast Asia,bld_resid,electricity,resid cooling,0.07 Southeast Asia,bld_resid,gas,resid cooling,0 Southeast Asia,bld_resid,refined liquids,resid cooling,0 Southeast Asia,bld_resid,traditional biomass,resid cooling,0 Southeast Asia,bld_resid,heat,resid cooling,0 Southeast Asia,bld_resid,biomass,resid others,0.026668395 Southeast Asia,bld_resid,coal,resid others,0.00039985 Southeast Asia,bld_resid,electricity,resid others,0.044932235 Southeast Asia,bld_resid,gas,resid others,0.027716673 Southeast Asia,bld_resid,refined liquids,resid others,0.091600333 Southeast Asia,bld_resid,traditional biomass,resid others,0.688682514 Southeast Asia,bld_resid,heat,resid others,0 India,bld_comm,biomass,comm heating,0 India,bld_comm,coal,comm heating,0 India,bld_comm,electricity,comm heating,0.002 India,bld_comm,gas,comm heating,0 India,bld_comm,refined liquids,comm heating,0 India,bld_comm,heat,comm heating,0 India,bld_comm,biomass,comm cooling,0 India,bld_comm,coal,comm cooling,0 India,bld_comm,electricity,comm cooling,0.021 India,bld_comm,gas,comm cooling,0 India,bld_comm,refined liquids,comm cooling,0 India,bld_comm,heat,comm cooling,0 India,bld_comm,biomass,comm others,0.354052453 India,bld_comm,coal,comm others,0.324173339 India,bld_comm,electricity,comm others,0.272365155 India,bld_comm,gas,comm others,0 India,bld_comm,refined liquids,comm others,0.026409053 India,bld_comm,heat,comm others,0 India,bld_resid,biomass,resid heating,0 India,bld_resid,coal,resid heating,0 India,bld_resid,electricity,resid heating,0.001 India,bld_resid,gas,resid heating,0 India,bld_resid,refined liquids,resid heating,0 India,bld_resid,traditional biomass,resid heating,0.001 India,bld_resid,heat,resid heating,0 India,bld_resid,biomass,resid cooling,0 India,bld_resid,coal,resid cooling,0 India,bld_resid,electricity,resid cooling,0.006 India,bld_resid,gas,resid cooling,0 India,bld_resid,refined liquids,resid cooling,0 India,bld_resid,traditional biomass,resid cooling,0 India,bld_resid,heat,resid cooling,0 India,bld_resid,biomass,resid others,0 India,bld_resid,coal,resid others,0.017549117 India,bld_resid,electricity,resid others,0.049475725 India,bld_resid,gas,resid others,0.004041309 India,bld_resid,refined liquids,resid others,0.133481193 India,bld_resid,traditional biomass,resid others,0.787452655 India,bld_resid,heat,resid others,0 Australia_NZ,bld_comm,biomass,comm heating,0.001470887 Australia_NZ,bld_comm,coal,comm heating,0 Australia_NZ,bld_comm,electricity,comm heating,0.024 Australia_NZ,bld_comm,gas,comm heating,0.082529113 Australia_NZ,bld_comm,refined liquids,comm heating,0.012 Australia_NZ,bld_comm,heat,comm heating,0 Australia_NZ,bld_comm,biomass,comm cooling,0 Australia_NZ,bld_comm,coal,comm cooling,0 Australia_NZ,bld_comm,electricity,comm cooling,0.08 Australia_NZ,bld_comm,gas,comm cooling,0 Australia_NZ,bld_comm,refined liquids,comm cooling,0 Australia_NZ,bld_comm,heat,comm cooling,0 Australia_NZ,bld_comm,biomass,comm others,0 Australia_NZ,bld_comm,coal,comm others,0.024918564 Australia_NZ,bld_comm,electricity,comm others,0.601880195 Australia_NZ,bld_comm,gas,comm others,0.082267962 Australia_NZ,bld_comm,refined liquids,comm others,0.09093328 Australia_NZ,bld_comm,heat,comm others,0 Australia_NZ,bld_resid,biomass,resid heating,0.138806089 Australia_NZ,bld_resid,coal,resid heating,0 Australia_NZ,bld_resid,electricity,resid heating,0.034 Australia_NZ,bld_resid,gas,resid heating,0.150193911 Australia_NZ,bld_resid,refined liquids,resid heating,0.017 Australia_NZ,bld_resid,traditional biomass,resid heating,0 Australia_NZ,bld_resid,heat,resid heating,0 Australia_NZ,bld_resid,biomass,resid cooling,0 Australia_NZ,bld_resid,coal,resid cooling,0 Australia_NZ,bld_resid,electricity,resid cooling,0.04 Australia_NZ,bld_resid,gas,resid cooling,0 Australia_NZ,bld_resid,refined liquids,resid cooling,0 Australia_NZ,bld_resid,traditional biomass,resid cooling,0 Australia_NZ,bld_resid,heat,resid cooling,0 Australia_NZ,bld_resid,biomass,resid others,0 Australia_NZ,bld_resid,coal,resid others,0.002567895 Australia_NZ,bld_resid,electricity,resid others,0.480173219 Australia_NZ,bld_resid,gas,resid others,0.119164318 Australia_NZ,bld_resid,refined liquids,resid others,0.018094567 Australia_NZ,bld_resid,traditional biomass,resid others,0 Australia_NZ,bld_resid,heat,resid others,0 Africa,bld_comm,biomass,comm heating,0 Africa,bld_comm,coal,comm heating,0.01 Africa,bld_comm,electricity,comm heating,0 Africa,bld_comm,gas,comm heating,0 Africa,bld_comm,refined liquids,comm heating,0.02 Africa,bld_comm,heat,comm heating,0 Africa,bld_comm,biomass,comm cooling,0 Africa,bld_comm,coal,comm cooling,0 Africa,bld_comm,electricity,comm cooling,0.03 Africa,bld_comm,gas,comm cooling,0 Africa,bld_comm,refined liquids,comm cooling,0 Africa,bld_comm,heat,comm cooling,0 Africa,bld_comm,biomass,comm others,0.581617423 Africa,bld_comm,coal,comm others,0.041001379 Africa,bld_comm,electricity,comm others,0.176083747 Africa,bld_comm,gas,comm others,0.005640937 Africa,bld_comm,refined liquids,comm others,0.135656514 Africa,bld_comm,heat,comm others,0 Africa,bld_resid,biomass,resid heating,0 Africa,bld_resid,coal,resid heating,0 Africa,bld_resid,electricity,resid heating,0 Africa,bld_resid,gas,resid heating,0 Africa,bld_resid,refined liquids,resid heating,0 Africa,bld_resid,traditional biomass,resid heating,0.05 Africa,bld_resid,heat,resid heating,0 Africa,bld_resid,biomass,resid cooling,0 Africa,bld_resid,coal,resid cooling,0 Africa,bld_resid,electricity,resid cooling,0.02 Africa,bld_resid,gas,resid cooling,0 Africa,bld_resid,refined liquids,resid cooling,0 Africa,bld_resid,traditional biomass,resid cooling,0 Africa,bld_resid,heat,resid cooling,0 Africa,bld_resid,biomass,resid others,0.051609501 Africa,bld_resid,coal,resid others,0.013465941 Africa,bld_resid,electricity,resid others,0.028534317 Africa,bld_resid,gas,resid others,0.018568679 Africa,bld_resid,refined liquids,resid others,0.068994338 Africa,bld_resid,traditional biomass,resid others,0.748827225 Africa,bld_resid,heat,resid others,0 Middle East,bld_comm,biomass,comm heating,0 Middle East,bld_comm,coal,comm heating,0 Middle East,bld_comm,electricity,comm heating,0 Middle East,bld_comm,gas,comm heating,0.015 Middle East,bld_comm,refined liquids,comm heating,0.015 Middle East,bld_comm,heat,comm heating,0 Middle East,bld_comm,biomass,comm cooling,0 Middle East,bld_comm,coal,comm cooling,0 Middle East,bld_comm,electricity,comm cooling,0.3 Middle East,bld_comm,gas,comm cooling,0.1 Middle East,bld_comm,refined liquids,comm cooling,0 Middle East,bld_comm,heat,comm cooling,0 Middle East,bld_comm,biomass,comm others,0.027577367 Middle East,bld_comm,coal,comm others,0 Middle East,bld_comm,electricity,comm others,0.265212207 Middle East,bld_comm,gas,comm others,0.041218834 Middle East,bld_comm,refined liquids,comm others,0.235991593 Middle East,bld_comm,heat,comm others,0 Middle East,bld_resid,biomass,resid heating,0 Middle East,bld_resid,coal,resid heating,0 Middle East,bld_resid,electricity,resid heating,0 Middle East,bld_resid,gas,resid heating,0.05 Middle East,bld_resid,refined liquids,resid heating,0.05 Middle East,bld_resid,traditional biomass,resid heating,0 Middle East,bld_resid,heat,resid heating,0 Middle East,bld_resid,biomass,resid cooling,0 Middle East,bld_resid,coal,resid cooling,0 Middle East,bld_resid,electricity,resid cooling,0.166666667 Middle East,bld_resid,gas,resid cooling,0.083333333 Middle East,bld_resid,refined liquids,resid cooling,0 Middle East,bld_resid,traditional biomass,resid cooling,0 Middle East,bld_resid,heat,resid cooling,0 Middle East,bld_resid,biomass,resid others,0.000187993 Middle East,bld_resid,coal,resid others,0.000278957 Middle East,bld_resid,electricity,resid others,0.104255366 Middle East,bld_resid,gas,resid others,0.271724974 Middle East,bld_resid,refined liquids,resid others,0.273552709 Middle East,bld_resid,traditional biomass,resid others,0 Middle East,bld_resid,heat,resid others,0 Latin America,bld_comm,biomass,comm heating,0.032305645 Latin America,bld_comm,coal,comm heating,0 Latin America,bld_comm,electricity,comm heating,0.036570506 Latin America,bld_comm,gas,comm heating,0.051096716 Latin America,bld_comm,refined liquids,comm heating,0.080027133 Latin America,bld_comm,heat,comm heating,0 Latin America,bld_comm,biomass,comm cooling,0 Latin America,bld_comm,coal,comm cooling,0 Latin America,bld_comm,electricity,comm cooling,0.170662363 Latin America,bld_comm,gas,comm cooling,0.029337637 Latin America,bld_comm,refined liquids,comm cooling,0 Latin America,bld_comm,heat,comm cooling,0 Latin America,bld_comm,biomass,comm others,0 Latin America,bld_comm,coal,comm others,8.04E-05 Latin America,bld_comm,electricity,comm others,0.40227557 Latin America,bld_comm,gas,comm others,0.047307438 Latin America,bld_comm,refined liquids,comm others,0.150336639 Latin America,bld_comm,heat,comm others,0 Latin America,bld_resid,biomass,resid heating,0.015 Latin America,bld_resid,coal,resid heating,0 Latin America,bld_resid,electricity,resid heating,0.012 Latin America,bld_resid,gas,resid heating,0.024 Latin America,bld_resid,refined liquids,resid heating,0.099 Latin America,bld_resid,traditional biomass,resid heating,0.15 Latin America,bld_resid,heat,resid heating,0 Latin America,bld_resid,biomass,resid cooling,0 Latin America,bld_resid,coal,resid cooling,0 Latin America,bld_resid,electricity,resid cooling,0.05 Latin America,bld_resid,gas,resid cooling,0 Latin America,bld_resid,refined liquids,resid cooling,0 Latin America,bld_resid,traditional biomass,resid cooling,0 Latin America,bld_resid,heat,resid cooling,0 Latin America,bld_resid,biomass,resid others,0.003579492 Latin America,bld_resid,coal,resid others,0.000744301 Latin America,bld_resid,electricity,resid others,0.178714422 Latin America,bld_resid,gas,resid others,0.086668387 Latin America,bld_resid,refined liquids,resid others,0.159426821 Latin America,bld_resid,traditional biomass,resid others,0.220866576 Latin America,bld_resid,heat,resid others,0 Former Soviet Union,bld_comm,biomass,comm heating,0.017251119 Former Soviet Union,bld_comm,coal,comm heating,0 Former Soviet Union,bld_comm,electricity,comm heating,0.005224811 Former Soviet Union,bld_comm,gas,comm heating,0.286793066 Former Soviet Union,bld_comm,refined liquids,comm heating,0 Former Soviet Union,bld_comm,heat,comm heating,0.270731004 Former Soviet Union,bld_comm,biomass,comm cooling,0 Former Soviet Union,bld_comm,coal,comm cooling,0 Former Soviet Union,bld_comm,electricity,comm cooling,0.001 Former Soviet Union,bld_comm,gas,comm cooling,0 Former Soviet Union,bld_comm,refined liquids,comm cooling,0 Former Soviet Union,bld_comm,heat,comm cooling,0 Former Soviet Union,bld_comm,biomass,comm others,0 Former Soviet Union,bld_comm,coal,comm others,0.037165426 Former Soviet Union,bld_comm,electricity,comm others,0.167935564 Former Soviet Union,bld_comm,gas,comm others,0.048531505 Former Soviet Union,bld_comm,refined liquids,comm others,0.165367505 Former Soviet Union,bld_comm,heat,comm others,0 Former Soviet Union,bld_resid,biomass,resid heating,0.022766199 Former Soviet Union,bld_resid,coal,resid heating,0 Former Soviet Union,bld_resid,electricity,resid heating,0.004958413 Former Soviet Union,bld_resid,gas,resid heating,0.185210131 Former Soviet Union,bld_resid,refined liquids,resid heating,0 Former Soviet Union,bld_resid,traditional biomass,resid heating,0 Former Soviet Union,bld_resid,heat,resid heating,0.367065258 Former Soviet Union,bld_resid,biomass,resid cooling,0 Former Soviet Union,bld_resid,coal,resid cooling,0 Former Soviet Union,bld_resid,electricity,resid cooling,0.001 Former Soviet Union,bld_resid,gas,resid cooling,0 Former Soviet Union,bld_resid,refined liquids,resid cooling,0 Former Soviet Union,bld_resid,traditional biomass,resid cooling,0 Former Soviet Union,bld_resid,heat,resid cooling,0 Former Soviet Union,bld_resid,biomass,resid others,0 Former Soviet Union,bld_resid,coal,resid others,0.026179869 Former Soviet Union,bld_resid,electricity,resid others,0.093209847 Former Soviet Union,bld_resid,gas,resid others,0.247270212 Former Soviet Union,bld_resid,refined liquids,resid others,0.052340072 Former Soviet Union,bld_resid,traditional biomass,resid others,0 Former Soviet Union,bld_resid,heat,resid others,0 China,bld_comm,biomass,comm heating,0.000233251 China,bld_comm,coal,comm heating,0.144524782 China,bld_comm,electricity,comm heating,0.014808961 China,bld_comm,gas,comm heating,0.043453831 China,bld_comm,refined liquids,comm heating,0.220950509 China,bld_comm,heat,comm heating,0.038039217 China,bld_comm,biomass,comm cooling,0 China,bld_comm,coal,comm cooling,0 China,bld_comm,electricity,comm cooling,0.131008688 China,bld_comm,gas,comm cooling,0 China,bld_comm,refined liquids,comm cooling,0 China,bld_comm,heat,comm cooling,0 China,bld_comm,biomass,comm others,0.015573911 China,bld_comm,coal,comm others,0.049200005 China,bld_comm,electricity,comm others,0.198479991 China,bld_comm,gas,comm others,0.008969272 China,bld_comm,refined liquids,comm others,0.13475758 China,bld_comm,heat,comm others,0 China,bld_resid,biomass,resid heating,0.001272349 China,bld_resid,coal,resid heating,0.067351964 China,bld_resid,electricity,resid heating,0.000233963 China,bld_resid,gas,resid heating,0.021731184 China,bld_resid,refined liquids,resid heating,0.009028516 China,bld_resid,traditional biomass,resid heating,0.314293748 China,bld_resid,heat,resid heating,0.040943034 China,bld_resid,biomass,resid cooling,0 China,bld_resid,coal,resid cooling,0 China,bld_resid,electricity,resid cooling,0.01628757 China,bld_resid,gas,resid cooling,0 China,bld_resid,refined liquids,resid cooling,0 China,bld_resid,traditional biomass,resid cooling,0 China,bld_resid,heat,resid cooling,0 China,bld_resid,biomass,resid others,0 China,bld_resid,coal,resid others,0.05623696 China,bld_resid,electricity,resid others,0.055106149 China,bld_resid,gas,resid others,0.017540837 China,bld_resid,refined liquids,resid others,0.042269273 China,bld_resid,traditional biomass,resid others,0.357704454 China,bld_resid,heat,resid others,0 Eastern Europe,bld_comm,biomass,comm heating,0.020715273 Eastern Europe,bld_comm,coal,comm heating,0.067771285 Eastern Europe,bld_comm,electricity,comm heating,0.00400384 Eastern Europe,bld_comm,gas,comm heating,0.172 Eastern Europe,bld_comm,refined liquids,comm heating,0.043 Eastern Europe,bld_comm,heat,comm heating,0.122509601 Eastern Europe,bld_comm,biomass,comm cooling,0 Eastern Europe,bld_comm,coal,comm cooling,0 Eastern Europe,bld_comm,electricity,comm cooling,0.03 Eastern Europe,bld_comm,gas,comm cooling,0 Eastern Europe,bld_comm,refined liquids,comm cooling,0 Eastern Europe,bld_comm,heat,comm cooling,0 Eastern Europe,bld_comm,biomass,comm others,0 Eastern Europe,bld_comm,coal,comm others,0 Eastern Europe,bld_comm,electricity,comm others,0.312104526 Eastern Europe,bld_comm,gas,comm others,0.158299122 Eastern Europe,bld_comm,refined liquids,comm others,0.069596351 Eastern Europe,bld_comm,heat,comm others,0 Eastern Europe,bld_resid,biomass,resid heating,0.17360497 Eastern Europe,bld_resid,coal,resid heating,0.121860557 Eastern Europe,bld_resid,electricity,resid heating,0.016155978 Eastern Europe,bld_resid,gas,resid heating,0.104885975 Eastern Europe,bld_resid,refined liquids,resid heating,0.022257571 Eastern Europe,bld_resid,traditional biomass,resid heating,0 Eastern Europe,bld_resid,heat,resid heating,0.184450379 Eastern Europe,bld_resid,biomass,resid cooling,0 Eastern Europe,bld_resid,coal,resid cooling,0 Eastern Europe,bld_resid,electricity,resid cooling,0.02 Eastern Europe,bld_resid,gas,resid cooling,0 Eastern Europe,bld_resid,refined liquids,resid cooling,0 Eastern Europe,bld_resid,traditional biomass,resid cooling,0 Eastern Europe,bld_resid,heat,resid cooling,0 Eastern Europe,bld_resid,biomass,resid others,0 Eastern Europe,bld_resid,coal,resid others,0 Eastern Europe,bld_resid,electricity,resid others,0.154544803 Eastern Europe,bld_resid,gas,resid others,0.168619381 Eastern Europe,bld_resid,refined liquids,resid others,0.033620385 Eastern Europe,bld_resid,traditional biomass,resid others,0 Eastern Europe,bld_resid,heat,resid others,0 \ No newline at end of file +# Shares of res and comm TFE by region,,,, +region_GCAM3,sector,fuel,service,share_TFEbysector +USA,bld_comm,biomass,comm heating,0.00924934 +USA,bld_comm,coal,comm heating,0 +USA,bld_comm,electricity,comm heating,0.022149504 +USA,bld_comm,gas,comm heating,0.143537572 +USA,bld_comm,refined liquids,comm heating,0.04934104 +USA,bld_comm,heat,comm heating,0 +USA,bld_comm,biomass,comm cooling,0 +USA,bld_comm,coal,comm cooling,0 +USA,bld_comm,electricity,comm cooling,0.066837653 +USA,bld_comm,gas,comm cooling,0.002526509 +USA,bld_comm,refined liquids,comm cooling,0 +USA,bld_comm,heat,comm cooling,0 +USA,bld_comm,biomass,comm others,0 +USA,bld_comm,coal,comm others,0.008885211 +USA,bld_comm,electricity,comm others,0.481445804 +USA,bld_comm,gas,comm others,0.186627404 +USA,bld_comm,refined liquids,comm others,0.029399962 +USA,bld_comm,heat,comm others,0 +USA,bld_resid,biomass,resid heating,0.037587395 +USA,bld_resid,coal,resid heating,0 +USA,bld_resid,electricity,resid heating,0.026704525 +USA,bld_resid,gas,resid heating,0.297132928 +USA,bld_resid,refined liquids,resid heating,0.081668115 +USA,bld_resid,traditional biomass,resid heating,0 +USA,bld_resid,heat,resid heating,0 +USA,bld_resid,biomass,resid cooling,0 +USA,bld_resid,coal,resid cooling,0 +USA,bld_resid,electricity,resid cooling,0.079130435 +USA,bld_resid,gas,resid cooling,0 +USA,bld_resid,refined liquids,resid cooling,0 +USA,bld_resid,traditional biomass,resid cooling,0 +USA,bld_resid,heat,resid cooling,0 +USA,bld_resid,biomass,resid others,0 +USA,bld_resid,coal,resid others,0 +USA,bld_resid,electricity,resid others,0.328501791 +USA,bld_resid,gas,resid others,0.122144117 +USA,bld_resid,refined liquids,resid others,0.027130695 +USA,bld_resid,traditional biomass,resid others,0 +USA,bld_resid,heat,resid others,0 +Canada,bld_comm,biomass,comm heating,0 +Canada,bld_comm,coal,comm heating,0 +Canada,bld_comm,electricity,comm heating,0.0765 +Canada,bld_comm,gas,comm heating,0.204 +Canada,bld_comm,refined liquids,comm heating,0.2295 +Canada,bld_comm,heat,comm heating,0 +Canada,bld_comm,biomass,comm cooling,0 +Canada,bld_comm,coal,comm cooling,0 +Canada,bld_comm,electricity,comm cooling,0.024 +Canada,bld_comm,gas,comm cooling,0.006 +Canada,bld_comm,refined liquids,comm cooling,0 +Canada,bld_comm,heat,comm cooling,0 +Canada,bld_comm,biomass,comm others,0 +Canada,bld_comm,coal,comm others,0 +Canada,bld_comm,electricity,comm others,0.281154451 +Canada,bld_comm,gas,comm others,0.133161569 +Canada,bld_comm,refined liquids,comm others,0.045683981 +Canada,bld_comm,heat,comm others,0 +Canada,bld_resid,biomass,resid heating,0.06382927 +Canada,bld_resid,coal,resid heating,0 +Canada,bld_resid,electricity,resid heating,0.14017073 +Canada,bld_resid,gas,resid heating,0.324 +Canada,bld_resid,refined liquids,resid heating,0.072 +Canada,bld_resid,traditional biomass,resid heating,0 +Canada,bld_resid,heat,resid heating,0 +Canada,bld_resid,biomass,resid cooling,0 +Canada,bld_resid,coal,resid cooling,0 +Canada,bld_resid,electricity,resid cooling,0.01 +Canada,bld_resid,gas,resid cooling,0 +Canada,bld_resid,refined liquids,resid cooling,0 +Canada,bld_resid,traditional biomass,resid cooling,0 +Canada,bld_resid,heat,resid cooling,0 +Canada,bld_resid,biomass,resid others,0 +Canada,bld_resid,coal,resid others,0.000778978 +Canada,bld_resid,electricity,resid others,0.275231318 +Canada,bld_resid,gas,resid others,0.110707268 +Canada,bld_resid,refined liquids,resid others,0.003282437 +Canada,bld_resid,traditional biomass,resid others,0 +Canada,bld_resid,heat,resid others,0 +Western Europe,bld_comm,biomass,comm heating,0.009813915 +Western Europe,bld_comm,coal,comm heating,0.004590893 +Western Europe,bld_comm,electricity,comm heating,0.065595192 +Western Europe,bld_comm,gas,comm heating,0.16 +Western Europe,bld_comm,refined liquids,comm heating,0.08 +Western Europe,bld_comm,heat,comm heating,0 +Western Europe,bld_comm,biomass,comm cooling,0 +Western Europe,bld_comm,coal,comm cooling,0 +Western Europe,bld_comm,electricity,comm cooling,0.05 +Western Europe,bld_comm,gas,comm cooling,0 +Western Europe,bld_comm,refined liquids,comm cooling,0 +Western Europe,bld_comm,heat,comm cooling,0 +Western Europe,bld_comm,biomass,comm others,0 +Western Europe,bld_comm,coal,comm others,0 +Western Europe,bld_comm,electricity,comm others,0.351601113 +Western Europe,bld_comm,gas,comm others,0.180185876 +Western Europe,bld_comm,refined liquids,comm others,0.098213011 +Western Europe,bld_comm,heat,comm others,0 +Western Europe,bld_resid,biomass,resid heating,0.10857292 +Western Europe,bld_resid,coal,resid heating,0 +Western Europe,bld_resid,electricity,resid heating,0.032303092 +Western Europe,bld_resid,gas,resid heating,0.29 +Western Europe,bld_resid,refined liquids,resid heating,0.149123988 +Western Europe,bld_resid,traditional biomass,resid heating,0 +Western Europe,bld_resid,heat,resid heating,0 +Western Europe,bld_resid,biomass,resid cooling,0 +Western Europe,bld_resid,coal,resid cooling,0 +Western Europe,bld_resid,electricity,resid cooling,0.025 +Western Europe,bld_resid,gas,resid cooling,0 +Western Europe,bld_resid,refined liquids,resid cooling,0 +Western Europe,bld_resid,traditional biomass,resid cooling,0 +Western Europe,bld_resid,heat,resid cooling,0 +Western Europe,bld_resid,biomass,resid others,0 +Western Europe,bld_resid,coal,resid others,0.018641998 +Western Europe,bld_resid,electricity,resid others,0.184093879 +Western Europe,bld_resid,gas,resid others,0.127730595 +Western Europe,bld_resid,refined liquids,resid others,0.064533528 +Western Europe,bld_resid,traditional biomass,resid others,0 +Western Europe,bld_resid,heat,resid others,0 +Japan,bld_comm,biomass,comm heating,0 +Japan,bld_comm,coal,comm heating,0.010742635 +Japan,bld_comm,electricity,comm heating,0.009 +Japan,bld_comm,gas,comm heating,0.045 +Japan,bld_comm,refined liquids,comm heating,0.115257365 +Japan,bld_comm,heat,comm heating,0 +Japan,bld_comm,biomass,comm cooling,0 +Japan,bld_comm,coal,comm cooling,0 +Japan,bld_comm,electricity,comm cooling,0.04 +Japan,bld_comm,gas,comm cooling,0 +Japan,bld_comm,refined liquids,comm cooling,0 +Japan,bld_comm,heat,comm cooling,0 +Japan,bld_comm,biomass,comm others,0 +Japan,bld_comm,coal,comm others,0 +Japan,bld_comm,electricity,comm others,0.349655569 +Japan,bld_comm,gas,comm others,0.173822652 +Japan,bld_comm,refined liquids,comm others,0.256521779 +Japan,bld_comm,heat,comm others,0 +Japan,bld_resid,biomass,resid heating,0.000527599 +Japan,bld_resid,coal,resid heating,0 +Japan,bld_resid,electricity,resid heating,0.04356999 +Japan,bld_resid,gas,resid heating,0.051258812 +Japan,bld_resid,refined liquids,resid heating,0.160937658 +Japan,bld_resid,traditional biomass,resid heating,0 +Japan,bld_resid,heat,resid heating,0 +Japan,bld_resid,biomass,resid cooling,0 +Japan,bld_resid,coal,resid cooling,0 +Japan,bld_resid,electricity,resid cooling,0.03 +Japan,bld_resid,gas,resid cooling,0 +Japan,bld_resid,refined liquids,resid cooling,0 +Japan,bld_resid,traditional biomass,resid cooling,0 +Japan,bld_resid,heat,resid cooling,0 +Japan,bld_resid,biomass,resid others,0 +Japan,bld_resid,coal,resid others,0 +Japan,bld_resid,electricity,resid others,0.455027702 +Japan,bld_resid,gas,resid others,0.12470461 +Japan,bld_resid,refined liquids,resid others,0.133973629 +Japan,bld_resid,traditional biomass,resid others,0 +Japan,bld_resid,heat,resid others,0 +Korea,bld_comm,biomass,comm heating,0.014992801 +Korea,bld_comm,coal,comm heating,0 +Korea,bld_comm,electricity,comm heating,0.029661664 +Korea,bld_comm,gas,comm heating,0.088984993 +Korea,bld_comm,refined liquids,comm heating,0.162977185 +Korea,bld_comm,heat,comm heating,0 +Korea,bld_comm,biomass,comm cooling,0 +Korea,bld_comm,coal,comm cooling,0 +Korea,bld_comm,electricity,comm cooling,0.039 +Korea,bld_comm,gas,comm cooling,0.011 +Korea,bld_comm,refined liquids,comm cooling,0 +Korea,bld_comm,heat,comm cooling,0 +Korea,bld_comm,biomass,comm others,0 +Korea,bld_comm,coal,comm others,0 +Korea,bld_comm,electricity,comm others,0.407692789 +Korea,bld_comm,gas,comm others,0.053200011 +Korea,bld_comm,refined liquids,comm others,0.192490557 +Korea,bld_comm,heat,comm others,0 +Korea,bld_resid,biomass,resid heating,0.003520598 +Korea,bld_resid,coal,resid heating,0.016741527 +Korea,bld_resid,electricity,resid heating,0.04 +Korea,bld_resid,gas,resid heating,0.3 +Korea,bld_resid,refined liquids,resid heating,0.139737875 +Korea,bld_resid,traditional biomass,resid heating,0 +Korea,bld_resid,heat,resid heating,0 +Korea,bld_resid,biomass,resid cooling,0 +Korea,bld_resid,coal,resid cooling,0 +Korea,bld_resid,electricity,resid cooling,0.02 +Korea,bld_resid,gas,resid cooling,0 +Korea,bld_resid,refined liquids,resid cooling,0 +Korea,bld_resid,traditional biomass,resid cooling,0 +Korea,bld_resid,heat,resid cooling,0 +Korea,bld_resid,biomass,resid others,0 +Korea,bld_resid,coal,resid others,0.039063563 +Korea,bld_resid,electricity,resid others,0.195982972 +Korea,bld_resid,gas,resid others,0.191927492 +Korea,bld_resid,refined liquids,resid others,0.053025972 +Korea,bld_resid,traditional biomass,resid others,0 +Korea,bld_resid,heat,resid others,0 +Southeast Asia,bld_comm,biomass,comm heating,0 +Southeast Asia,bld_comm,coal,comm heating,0 +Southeast Asia,bld_comm,electricity,comm heating,0 +Southeast Asia,bld_comm,gas,comm heating,0.0125 +Southeast Asia,bld_comm,refined liquids,comm heating,0.0375 +Southeast Asia,bld_comm,heat,comm heating,0 +Southeast Asia,bld_comm,biomass,comm cooling,0 +Southeast Asia,bld_comm,coal,comm cooling,0 +Southeast Asia,bld_comm,electricity,comm cooling,0.15 +Southeast Asia,bld_comm,gas,comm cooling,0 +Southeast Asia,bld_comm,refined liquids,comm cooling,0 +Southeast Asia,bld_comm,heat,comm cooling,0 +Southeast Asia,bld_comm,biomass,comm others,0.105112327 +Southeast Asia,bld_comm,coal,comm others,0.000293438 +Southeast Asia,bld_comm,electricity,comm others,0.468970375 +Southeast Asia,bld_comm,gas,comm others,0.060460361 +Southeast Asia,bld_comm,refined liquids,comm others,0.165163499 +Southeast Asia,bld_comm,heat,comm others,0 +Southeast Asia,bld_resid,biomass,resid heating,0 +Southeast Asia,bld_resid,coal,resid heating,0 +Southeast Asia,bld_resid,electricity,resid heating,0 +Southeast Asia,bld_resid,gas,resid heating,0.016666667 +Southeast Asia,bld_resid,refined liquids,resid heating,0.016666667 +Southeast Asia,bld_resid,traditional biomass,resid heating,0.016666667 +Southeast Asia,bld_resid,heat,resid heating,0 +Southeast Asia,bld_resid,biomass,resid cooling,0 +Southeast Asia,bld_resid,coal,resid cooling,0 +Southeast Asia,bld_resid,electricity,resid cooling,0.07 +Southeast Asia,bld_resid,gas,resid cooling,0 +Southeast Asia,bld_resid,refined liquids,resid cooling,0 +Southeast Asia,bld_resid,traditional biomass,resid cooling,0 +Southeast Asia,bld_resid,heat,resid cooling,0 +Southeast Asia,bld_resid,biomass,resid others,0.026668395 +Southeast Asia,bld_resid,coal,resid others,0.00039985 +Southeast Asia,bld_resid,electricity,resid others,0.044932235 +Southeast Asia,bld_resid,gas,resid others,0.027716673 +Southeast Asia,bld_resid,refined liquids,resid others,0.091600333 +Southeast Asia,bld_resid,traditional biomass,resid others,0.688682514 +Southeast Asia,bld_resid,heat,resid others,0 +India,bld_comm,biomass,comm heating,0 +India,bld_comm,coal,comm heating,0 +India,bld_comm,electricity,comm heating,0.002 +India,bld_comm,gas,comm heating,0 +India,bld_comm,refined liquids,comm heating,0 +India,bld_comm,heat,comm heating,0 +India,bld_comm,biomass,comm cooling,0 +India,bld_comm,coal,comm cooling,0 +India,bld_comm,electricity,comm cooling,0.021 +India,bld_comm,gas,comm cooling,0 +India,bld_comm,refined liquids,comm cooling,0 +India,bld_comm,heat,comm cooling,0 +India,bld_comm,biomass,comm others,0.354052453 +India,bld_comm,coal,comm others,0.324173339 +India,bld_comm,electricity,comm others,0.272365155 +India,bld_comm,gas,comm others,0 +India,bld_comm,refined liquids,comm others,0.026409053 +India,bld_comm,heat,comm others,0 +India,bld_resid,biomass,resid heating,0 +India,bld_resid,coal,resid heating,0 +India,bld_resid,electricity,resid heating,0.001 +India,bld_resid,gas,resid heating,0 +India,bld_resid,refined liquids,resid heating,0 +India,bld_resid,traditional biomass,resid heating,0.001 +India,bld_resid,heat,resid heating,0 +India,bld_resid,biomass,resid cooling,0 +India,bld_resid,coal,resid cooling,0 +India,bld_resid,electricity,resid cooling,0.006 +India,bld_resid,gas,resid cooling,0 +India,bld_resid,refined liquids,resid cooling,0 +India,bld_resid,traditional biomass,resid cooling,0 +India,bld_resid,heat,resid cooling,0 +India,bld_resid,biomass,resid others,0 +India,bld_resid,coal,resid others,0.017549117 +India,bld_resid,electricity,resid others,0.049475725 +India,bld_resid,gas,resid others,0.004041309 +India,bld_resid,refined liquids,resid others,0.133481193 +India,bld_resid,traditional biomass,resid others,0.787452655 +India,bld_resid,heat,resid others,0 +Australia_NZ,bld_comm,biomass,comm heating,0.001470887 +Australia_NZ,bld_comm,coal,comm heating,0 +Australia_NZ,bld_comm,electricity,comm heating,0.024 +Australia_NZ,bld_comm,gas,comm heating,0.082529113 +Australia_NZ,bld_comm,refined liquids,comm heating,0.012 +Australia_NZ,bld_comm,heat,comm heating,0 +Australia_NZ,bld_comm,biomass,comm cooling,0 +Australia_NZ,bld_comm,coal,comm cooling,0 +Australia_NZ,bld_comm,electricity,comm cooling,0.08 +Australia_NZ,bld_comm,gas,comm cooling,0 +Australia_NZ,bld_comm,refined liquids,comm cooling,0 +Australia_NZ,bld_comm,heat,comm cooling,0 +Australia_NZ,bld_comm,biomass,comm others,0 +Australia_NZ,bld_comm,coal,comm others,0.024918564 +Australia_NZ,bld_comm,electricity,comm others,0.601880195 +Australia_NZ,bld_comm,gas,comm others,0.082267962 +Australia_NZ,bld_comm,refined liquids,comm others,0.09093328 +Australia_NZ,bld_comm,heat,comm others,0 +Australia_NZ,bld_resid,biomass,resid heating,0.138806089 +Australia_NZ,bld_resid,coal,resid heating,0 +Australia_NZ,bld_resid,electricity,resid heating,0.034 +Australia_NZ,bld_resid,gas,resid heating,0.150193911 +Australia_NZ,bld_resid,refined liquids,resid heating,0.017 +Australia_NZ,bld_resid,traditional biomass,resid heating,0 +Australia_NZ,bld_resid,heat,resid heating,0 +Australia_NZ,bld_resid,biomass,resid cooling,0 +Australia_NZ,bld_resid,coal,resid cooling,0 +Australia_NZ,bld_resid,electricity,resid cooling,0.04 +Australia_NZ,bld_resid,gas,resid cooling,0 +Australia_NZ,bld_resid,refined liquids,resid cooling,0 +Australia_NZ,bld_resid,traditional biomass,resid cooling,0 +Australia_NZ,bld_resid,heat,resid cooling,0 +Australia_NZ,bld_resid,biomass,resid others,0 +Australia_NZ,bld_resid,coal,resid others,0.002567895 +Australia_NZ,bld_resid,electricity,resid others,0.480173219 +Australia_NZ,bld_resid,gas,resid others,0.119164318 +Australia_NZ,bld_resid,refined liquids,resid others,0.018094567 +Australia_NZ,bld_resid,traditional biomass,resid others,0 +Australia_NZ,bld_resid,heat,resid others,0 +Africa,bld_comm,biomass,comm heating,0 +Africa,bld_comm,coal,comm heating,0.01 +Africa,bld_comm,electricity,comm heating,0 +Africa,bld_comm,gas,comm heating,0 +Africa,bld_comm,refined liquids,comm heating,0.02 +Africa,bld_comm,heat,comm heating,0 +Africa,bld_comm,biomass,comm cooling,0 +Africa,bld_comm,coal,comm cooling,0 +Africa,bld_comm,electricity,comm cooling,0.03 +Africa,bld_comm,gas,comm cooling,0 +Africa,bld_comm,refined liquids,comm cooling,0 +Africa,bld_comm,heat,comm cooling,0 +Africa,bld_comm,biomass,comm others,0.581617423 +Africa,bld_comm,coal,comm others,0.041001379 +Africa,bld_comm,electricity,comm others,0.176083747 +Africa,bld_comm,gas,comm others,0.005640937 +Africa,bld_comm,refined liquids,comm others,0.135656514 +Africa,bld_comm,heat,comm others,0 +Africa,bld_resid,biomass,resid heating,0 +Africa,bld_resid,coal,resid heating,0 +Africa,bld_resid,electricity,resid heating,0 +Africa,bld_resid,gas,resid heating,0 +Africa,bld_resid,refined liquids,resid heating,0 +Africa,bld_resid,traditional biomass,resid heating,0.05 +Africa,bld_resid,heat,resid heating,0 +Africa,bld_resid,biomass,resid cooling,0 +Africa,bld_resid,coal,resid cooling,0 +Africa,bld_resid,electricity,resid cooling,0.02 +Africa,bld_resid,gas,resid cooling,0 +Africa,bld_resid,refined liquids,resid cooling,0 +Africa,bld_resid,traditional biomass,resid cooling,0 +Africa,bld_resid,heat,resid cooling,0 +Africa,bld_resid,biomass,resid others,0.051609501 +Africa,bld_resid,coal,resid others,0.013465941 +Africa,bld_resid,electricity,resid others,0.028534317 +Africa,bld_resid,gas,resid others,0.018568679 +Africa,bld_resid,refined liquids,resid others,0.068994338 +Africa,bld_resid,traditional biomass,resid others,0.748827225 +Africa,bld_resid,heat,resid others,0 +Middle East,bld_comm,biomass,comm heating,0 +Middle East,bld_comm,coal,comm heating,0 +Middle East,bld_comm,electricity,comm heating,0 +Middle East,bld_comm,gas,comm heating,0.015 +Middle East,bld_comm,refined liquids,comm heating,0.015 +Middle East,bld_comm,heat,comm heating,0 +Middle East,bld_comm,biomass,comm cooling,0 +Middle East,bld_comm,coal,comm cooling,0 +Middle East,bld_comm,electricity,comm cooling,0.3 +Middle East,bld_comm,gas,comm cooling,0.1 +Middle East,bld_comm,refined liquids,comm cooling,0 +Middle East,bld_comm,heat,comm cooling,0 +Middle East,bld_comm,biomass,comm others,0.027577367 +Middle East,bld_comm,coal,comm others,0 +Middle East,bld_comm,electricity,comm others,0.265212207 +Middle East,bld_comm,gas,comm others,0.041218834 +Middle East,bld_comm,refined liquids,comm others,0.235991593 +Middle East,bld_comm,heat,comm others,0 +Middle East,bld_resid,biomass,resid heating,0 +Middle East,bld_resid,coal,resid heating,0 +Middle East,bld_resid,electricity,resid heating,0 +Middle East,bld_resid,gas,resid heating,0.05 +Middle East,bld_resid,refined liquids,resid heating,0.05 +Middle East,bld_resid,traditional biomass,resid heating,0 +Middle East,bld_resid,heat,resid heating,0 +Middle East,bld_resid,biomass,resid cooling,0 +Middle East,bld_resid,coal,resid cooling,0 +Middle East,bld_resid,electricity,resid cooling,0.166666667 +Middle East,bld_resid,gas,resid cooling,0.083333333 +Middle East,bld_resid,refined liquids,resid cooling,0 +Middle East,bld_resid,traditional biomass,resid cooling,0 +Middle East,bld_resid,heat,resid cooling,0 +Middle East,bld_resid,biomass,resid others,0.000187993 +Middle East,bld_resid,coal,resid others,0.000278957 +Middle East,bld_resid,electricity,resid others,0.104255366 +Middle East,bld_resid,gas,resid others,0.271724974 +Middle East,bld_resid,refined liquids,resid others,0.273552709 +Middle East,bld_resid,traditional biomass,resid others,0 +Middle East,bld_resid,heat,resid others,0 +Latin America,bld_comm,biomass,comm heating,0.032305645 +Latin America,bld_comm,coal,comm heating,0 +Latin America,bld_comm,electricity,comm heating,0.036570506 +Latin America,bld_comm,gas,comm heating,0.051096716 +Latin America,bld_comm,refined liquids,comm heating,0.080027133 +Latin America,bld_comm,heat,comm heating,0 +Latin America,bld_comm,biomass,comm cooling,0 +Latin America,bld_comm,coal,comm cooling,0 +Latin America,bld_comm,electricity,comm cooling,0.170662363 +Latin America,bld_comm,gas,comm cooling,0.029337637 +Latin America,bld_comm,refined liquids,comm cooling,0 +Latin America,bld_comm,heat,comm cooling,0 +Latin America,bld_comm,biomass,comm others,0 +Latin America,bld_comm,coal,comm others,8.04E-05 +Latin America,bld_comm,electricity,comm others,0.40227557 +Latin America,bld_comm,gas,comm others,0.047307438 +Latin America,bld_comm,refined liquids,comm others,0.150336639 +Latin America,bld_comm,heat,comm others,0 +Latin America,bld_resid,biomass,resid heating,0.015 +Latin America,bld_resid,coal,resid heating,0 +Latin America,bld_resid,electricity,resid heating,0.012 +Latin America,bld_resid,gas,resid heating,0.024 +Latin America,bld_resid,refined liquids,resid heating,0.099 +Latin America,bld_resid,traditional biomass,resid heating,0.15 +Latin America,bld_resid,heat,resid heating,0 +Latin America,bld_resid,biomass,resid cooling,0 +Latin America,bld_resid,coal,resid cooling,0 +Latin America,bld_resid,electricity,resid cooling,0.05 +Latin America,bld_resid,gas,resid cooling,0 +Latin America,bld_resid,refined liquids,resid cooling,0 +Latin America,bld_resid,traditional biomass,resid cooling,0 +Latin America,bld_resid,heat,resid cooling,0 +Latin America,bld_resid,biomass,resid others,0.003579492 +Latin America,bld_resid,coal,resid others,0.000744301 +Latin America,bld_resid,electricity,resid others,0.178714422 +Latin America,bld_resid,gas,resid others,0.086668387 +Latin America,bld_resid,refined liquids,resid others,0.159426821 +Latin America,bld_resid,traditional biomass,resid others,0.220866576 +Latin America,bld_resid,heat,resid others,0 +Former Soviet Union,bld_comm,biomass,comm heating,0.017251119 +Former Soviet Union,bld_comm,coal,comm heating,0 +Former Soviet Union,bld_comm,electricity,comm heating,0.005224811 +Former Soviet Union,bld_comm,gas,comm heating,0.286793066 +Former Soviet Union,bld_comm,refined liquids,comm heating,0 +Former Soviet Union,bld_comm,heat,comm heating,0.270731004 +Former Soviet Union,bld_comm,biomass,comm cooling,0 +Former Soviet Union,bld_comm,coal,comm cooling,0 +Former Soviet Union,bld_comm,electricity,comm cooling,0.001 +Former Soviet Union,bld_comm,gas,comm cooling,0 +Former Soviet Union,bld_comm,refined liquids,comm cooling,0 +Former Soviet Union,bld_comm,heat,comm cooling,0 +Former Soviet Union,bld_comm,biomass,comm others,0 +Former Soviet Union,bld_comm,coal,comm others,0.037165426 +Former Soviet Union,bld_comm,electricity,comm others,0.167935564 +Former Soviet Union,bld_comm,gas,comm others,0.048531505 +Former Soviet Union,bld_comm,refined liquids,comm others,0.165367505 +Former Soviet Union,bld_comm,heat,comm others,0 +Former Soviet Union,bld_resid,biomass,resid heating,0.022766199 +Former Soviet Union,bld_resid,coal,resid heating,0 +Former Soviet Union,bld_resid,electricity,resid heating,0.004958413 +Former Soviet Union,bld_resid,gas,resid heating,0.185210131 +Former Soviet Union,bld_resid,refined liquids,resid heating,0 +Former Soviet Union,bld_resid,traditional biomass,resid heating,0 +Former Soviet Union,bld_resid,heat,resid heating,0.367065258 +Former Soviet Union,bld_resid,biomass,resid cooling,0 +Former Soviet Union,bld_resid,coal,resid cooling,0 +Former Soviet Union,bld_resid,electricity,resid cooling,0.001 +Former Soviet Union,bld_resid,gas,resid cooling,0 +Former Soviet Union,bld_resid,refined liquids,resid cooling,0 +Former Soviet Union,bld_resid,traditional biomass,resid cooling,0 +Former Soviet Union,bld_resid,heat,resid cooling,0 +Former Soviet Union,bld_resid,biomass,resid others,0 +Former Soviet Union,bld_resid,coal,resid others,0.026179869 +Former Soviet Union,bld_resid,electricity,resid others,0.093209847 +Former Soviet Union,bld_resid,gas,resid others,0.247270212 +Former Soviet Union,bld_resid,refined liquids,resid others,0.052340072 +Former Soviet Union,bld_resid,traditional biomass,resid others,0 +Former Soviet Union,bld_resid,heat,resid others,0 +China,bld_comm,biomass,comm heating,0.000233251 +China,bld_comm,coal,comm heating,0.144524782 +China,bld_comm,electricity,comm heating,0.014808961 +China,bld_comm,gas,comm heating,0.043453831 +China,bld_comm,refined liquids,comm heating,0.220950509 +China,bld_comm,heat,comm heating,0.038039217 +China,bld_comm,biomass,comm cooling,0 +China,bld_comm,coal,comm cooling,0 +China,bld_comm,electricity,comm cooling,0.131008688 +China,bld_comm,gas,comm cooling,0 +China,bld_comm,refined liquids,comm cooling,0 +China,bld_comm,heat,comm cooling,0 +China,bld_comm,biomass,comm others,0.015573911 +China,bld_comm,coal,comm others,0.049200005 +China,bld_comm,electricity,comm others,0.198479991 +China,bld_comm,gas,comm others,0.008969272 +China,bld_comm,refined liquids,comm others,0.13475758 +China,bld_comm,heat,comm others,0 +China,bld_resid,biomass,resid heating,0.001272349 +China,bld_resid,coal,resid heating,0.067351964 +China,bld_resid,electricity,resid heating,0.000233963 +China,bld_resid,gas,resid heating,0.021731184 +China,bld_resid,refined liquids,resid heating,0.009028516 +China,bld_resid,traditional biomass,resid heating,0.314293748 +China,bld_resid,heat,resid heating,0.040943034 +China,bld_resid,biomass,resid cooling,0 +China,bld_resid,coal,resid cooling,0 +China,bld_resid,electricity,resid cooling,0.01628757 +China,bld_resid,gas,resid cooling,0 +China,bld_resid,refined liquids,resid cooling,0 +China,bld_resid,traditional biomass,resid cooling,0 +China,bld_resid,heat,resid cooling,0 +China,bld_resid,biomass,resid others,0 +China,bld_resid,coal,resid others,0.05623696 +China,bld_resid,electricity,resid others,0.055106149 +China,bld_resid,gas,resid others,0.017540837 +China,bld_resid,refined liquids,resid others,0.042269273 +China,bld_resid,traditional biomass,resid others,0.357704454 +China,bld_resid,heat,resid others,0 +Eastern Europe,bld_comm,biomass,comm heating,0.020715273 +Eastern Europe,bld_comm,coal,comm heating,0.067771285 +Eastern Europe,bld_comm,electricity,comm heating,0.00400384 +Eastern Europe,bld_comm,gas,comm heating,0.172 +Eastern Europe,bld_comm,refined liquids,comm heating,0.043 +Eastern Europe,bld_comm,heat,comm heating,0.122509601 +Eastern Europe,bld_comm,biomass,comm cooling,0 +Eastern Europe,bld_comm,coal,comm cooling,0 +Eastern Europe,bld_comm,electricity,comm cooling,0.03 +Eastern Europe,bld_comm,gas,comm cooling,0 +Eastern Europe,bld_comm,refined liquids,comm cooling,0 +Eastern Europe,bld_comm,heat,comm cooling,0 +Eastern Europe,bld_comm,biomass,comm others,0 +Eastern Europe,bld_comm,coal,comm others,0 +Eastern Europe,bld_comm,electricity,comm others,0.312104526 +Eastern Europe,bld_comm,gas,comm others,0.158299122 +Eastern Europe,bld_comm,refined liquids,comm others,0.069596351 +Eastern Europe,bld_comm,heat,comm others,0 +Eastern Europe,bld_resid,biomass,resid heating,0.17360497 +Eastern Europe,bld_resid,coal,resid heating,0.121860557 +Eastern Europe,bld_resid,electricity,resid heating,0.016155978 +Eastern Europe,bld_resid,gas,resid heating,0.104885975 +Eastern Europe,bld_resid,refined liquids,resid heating,0.022257571 +Eastern Europe,bld_resid,traditional biomass,resid heating,0 +Eastern Europe,bld_resid,heat,resid heating,0.184450379 +Eastern Europe,bld_resid,biomass,resid cooling,0 +Eastern Europe,bld_resid,coal,resid cooling,0 +Eastern Europe,bld_resid,electricity,resid cooling,0.02 +Eastern Europe,bld_resid,gas,resid cooling,0 +Eastern Europe,bld_resid,refined liquids,resid cooling,0 +Eastern Europe,bld_resid,traditional biomass,resid cooling,0 +Eastern Europe,bld_resid,heat,resid cooling,0 +Eastern Europe,bld_resid,biomass,resid others,0 +Eastern Europe,bld_resid,coal,resid others,0 +Eastern Europe,bld_resid,electricity,resid others,0.154544803 +Eastern Europe,bld_resid,gas,resid others,0.168619381 +Eastern Europe,bld_resid,refined liquids,resid others,0.033620385 +Eastern Europe,bld_resid,traditional biomass,resid others,0 +Eastern Europe,bld_resid,heat,resid others,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.shell_eff_mult_RG3.csv b/input/gcam-data-system/energy-data/assumptions/A44.shell_eff_mult_RG3.csv index 21b6a50cbc..08cb66b566 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.shell_eff_mult_RG3.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.shell_eff_mult_RG3.csv @@ -1 +1,16 @@ -#GCAM 3.0 multipliers from USA to other regions - shell efficiency. Calculated based on per-capita GDP and heating degree days,,,,,,,,, region_GCAM3,1971,2005,2020,2035,2050,2065,2080,2095,2100 USA,1,1,1,1,1,1,1,1,1 Canada,1.030301607,1.026630629,1.022972731,1.020943932,1.018242741,1.01564377,1.014421959,1.012913258,1.012913258 Western Europe,1.066621573,1.062643772,1.058680805,1.054048162,1.051475742,1.048247858,1.045311213,1.04337865,1.04337865 Japan,0.99506183,0.997916341,1.00077904,1.000198397,1.000319506,0.999280129,0.999968095,1.001684673,1.001684673 Australia_NZ,1.077007755,1.068339342,1.059740697,1.056280339,1.05356462,1.051303819,1.051489648,1.050965902,1.050965902 Former Soviet Union,1.40591974,1.337086644,1.271623581,1.225393659,1.186261891,1.152876329,1.125750262,1.102306692,1.102306692 China,1.544520112,1.394210061,1.258527927,1.184774717,1.138762746,1.107267385,1.081153373,1.064248361,1.064248361 Middle East,1.29755401,1.261624129,1.226689163,1.203733231,1.185295515,1.170171506,1.154075623,1.139937526,1.139937526 Africa,1.596472495,1.543338511,1.491972939,1.456513744,1.417835016,1.367529598,1.317343154,1.274395042,1.274395042 Latin America,1.310234705,1.279042228,1.248592345,1.226813359,1.205561885,1.180916196,1.151767399,1.12825199,1.12825199 Southeast Asia,1.502289264,1.424501723,1.350741968,1.285856119,1.237324941,1.194450948,1.162928492,1.137861619,1.137861619 Eastern Europe,1.294277362,1.238060623,1.184285649,1.150355037,1.115900248,1.088818653,1.06555252,1.047596357,1.047596357 Korea,1.123217514,1.102754361,1.082664012,1.072133048,1.061018733,1.051037645,1.043416233,1.037123655,1.037123655 India,1.739317916,1.602221578,1.475931434,1.38144364,1.31137399,1.256676105,1.216545985,1.183043209,1.183043209 \ No newline at end of file +#GCAM 3.0 multipliers from USA to other regions - shell efficiency. Calculated based on per-capita GDP and heating degree days,,,,,,,,, +region_GCAM3,1971,2005,2020,2035,2050,2065,2080,2095,2100 +USA,1,1,1,1,1,1,1,1,1 +Canada,1.030301607,1.026630629,1.022972731,1.020943932,1.018242741,1.01564377,1.014421959,1.012913258,1.012913258 +Western Europe,1.066621573,1.062643772,1.058680805,1.054048162,1.051475742,1.048247858,1.045311213,1.04337865,1.04337865 +Japan,0.99506183,0.997916341,1.00077904,1.000198397,1.000319506,0.999280129,0.999968095,1.001684673,1.001684673 +Australia_NZ,1.077007755,1.068339342,1.059740697,1.056280339,1.05356462,1.051303819,1.051489648,1.050965902,1.050965902 +Former Soviet Union,1.40591974,1.337086644,1.271623581,1.225393659,1.186261891,1.152876329,1.125750262,1.102306692,1.102306692 +China,1.544520112,1.394210061,1.258527927,1.184774717,1.138762746,1.107267385,1.081153373,1.064248361,1.064248361 +Middle East,1.29755401,1.261624129,1.226689163,1.203733231,1.185295515,1.170171506,1.154075623,1.139937526,1.139937526 +Africa,1.596472495,1.543338511,1.491972939,1.456513744,1.417835016,1.367529598,1.317343154,1.274395042,1.274395042 +Latin America,1.310234705,1.279042228,1.248592345,1.226813359,1.205561885,1.180916196,1.151767399,1.12825199,1.12825199 +Southeast Asia,1.502289264,1.424501723,1.350741968,1.285856119,1.237324941,1.194450948,1.162928492,1.137861619,1.137861619 +Eastern Europe,1.294277362,1.238060623,1.184285649,1.150355037,1.115900248,1.088818653,1.06555252,1.047596357,1.047596357 +Korea,1.123217514,1.102754361,1.082664012,1.072133048,1.061018733,1.051037645,1.043416233,1.037123655,1.037123655 +India,1.739317916,1.602221578,1.475931434,1.38144364,1.31137399,1.256676105,1.216545985,1.183043209,1.183043209 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A44.subsector_interp.csv index b6a8af139b..cd77779f53 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.subsector_interp.csv @@ -1 +1,32 @@ -# Building default subsector shareweight interpolation,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function resid heating,biomass,share-weight,final-calibration-year,end-year,,fixed resid heating,coal,share-weight,final-calibration-year,end-year,,fixed resid heating,electricity,share-weight,final-calibration-year,end-year,,fixed resid heating,gas,share-weight,final-calibration-year,end-year,,fixed resid heating,refined liquids,share-weight,final-calibration-year,end-year,,fixed resid heating,traditional biomass,share-weight,final-calibration-year,end-year,,fixed resid heating,district heat,share-weight,final-calibration-year,end-year,,fixed resid cooling,electricity,share-weight,final-calibration-year,end-year,,fixed resid cooling,gas,share-weight,final-calibration-year,end-year,,fixed resid others,biomass,share-weight,final-calibration-year,end-year,,fixed resid others,coal,share-weight,final-calibration-year,end-year,,fixed resid others,electricity,share-weight,final-calibration-year,end-year,,fixed resid others,gas,share-weight,final-calibration-year,end-year,,fixed resid others,refined liquids,share-weight,final-calibration-year,end-year,,fixed resid others,traditional biomass,share-weight,final-calibration-year,end-year,,fixed resid others,district heat,share-weight,final-calibration-year,end-year,,fixed comm heating,biomass,share-weight,final-calibration-year,end-year,,fixed comm heating,coal,share-weight,final-calibration-year,end-year,,fixed comm heating,electricity,share-weight,final-calibration-year,end-year,,fixed comm heating,gas,share-weight,final-calibration-year,end-year,,fixed comm heating,refined liquids,share-weight,final-calibration-year,end-year,,fixed comm heating,district heat,share-weight,final-calibration-year,end-year,,fixed comm cooling,electricity,share-weight,final-calibration-year,end-year,,fixed comm cooling,gas,share-weight,final-calibration-year,end-year,,fixed comm others,biomass,share-weight,final-calibration-year,end-year,,fixed comm others,coal,share-weight,final-calibration-year,end-year,,fixed comm others,electricity,share-weight,final-calibration-year,end-year,,fixed comm others,gas,share-weight,final-calibration-year,end-year,,fixed comm others,refined liquids,share-weight,final-calibration-year,end-year,,fixed comm others,district heat,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# Building default subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +resid heating,biomass,share-weight,final-calibration-year,end-year,,fixed +resid heating,coal,share-weight,final-calibration-year,end-year,,fixed +resid heating,electricity,share-weight,final-calibration-year,end-year,,fixed +resid heating,gas,share-weight,final-calibration-year,end-year,,fixed +resid heating,refined liquids,share-weight,final-calibration-year,end-year,,fixed +resid heating,traditional biomass,share-weight,final-calibration-year,end-year,,fixed +resid heating,district heat,share-weight,final-calibration-year,end-year,,fixed +resid cooling,electricity,share-weight,final-calibration-year,end-year,,fixed +resid cooling,gas,share-weight,final-calibration-year,end-year,,fixed +resid others,biomass,share-weight,final-calibration-year,end-year,,fixed +resid others,coal,share-weight,final-calibration-year,end-year,,fixed +resid others,electricity,share-weight,final-calibration-year,end-year,,fixed +resid others,gas,share-weight,final-calibration-year,end-year,,fixed +resid others,refined liquids,share-weight,final-calibration-year,end-year,,fixed +resid others,traditional biomass,share-weight,final-calibration-year,end-year,,fixed +resid others,district heat,share-weight,final-calibration-year,end-year,,fixed +comm heating,biomass,share-weight,final-calibration-year,end-year,,fixed +comm heating,coal,share-weight,final-calibration-year,end-year,,fixed +comm heating,electricity,share-weight,final-calibration-year,end-year,,fixed +comm heating,gas,share-weight,final-calibration-year,end-year,,fixed +comm heating,refined liquids,share-weight,final-calibration-year,end-year,,fixed +comm heating,district heat,share-weight,final-calibration-year,end-year,,fixed +comm cooling,electricity,share-weight,final-calibration-year,end-year,,fixed +comm cooling,gas,share-weight,final-calibration-year,end-year,,fixed +comm others,biomass,share-weight,final-calibration-year,end-year,,fixed +comm others,coal,share-weight,final-calibration-year,end-year,,fixed +comm others,electricity,share-weight,final-calibration-year,end-year,,fixed +comm others,gas,share-weight,final-calibration-year,end-year,,fixed +comm others,refined liquids,share-weight,final-calibration-year,end-year,,fixed +comm others,district heat,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A44.subsector_logit.csv index 54bf3e334c..bdcd8371a1 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.subsector_logit.csv @@ -1 +1,32 @@ -# Building default subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type resid heating,biomass,-6, resid heating,coal,-6, resid heating,electricity,-6, resid heating,gas,-6, resid heating,refined liquids,-6, resid heating,traditional biomass,-6, resid heating,district heat,-6, resid cooling,electricity,-6, resid cooling,gas,-6, resid others,biomass,-6, resid others,coal,-6, resid others,electricity,-6, resid others,gas,-6, resid others,refined liquids,-6, resid others,traditional biomass,-6, resid others,district heat,-6, comm heating,biomass,-6, comm heating,coal,-6, comm heating,electricity,-6, comm heating,gas,-6, comm heating,refined liquids,-6, comm heating,district heat,-6, comm cooling,electricity,-6, comm cooling,gas,-6, comm others,biomass,-6, comm others,coal,-6, comm others,electricity,-6, comm others,gas,-6, comm others,refined liquids,-6, comm others,district heat,-6, \ No newline at end of file +# Building default subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +resid heating,biomass,-6, +resid heating,coal,-6, +resid heating,electricity,-6, +resid heating,gas,-6, +resid heating,refined liquids,-6, +resid heating,traditional biomass,-6, +resid heating,district heat,-6, +resid cooling,electricity,-6, +resid cooling,gas,-6, +resid others,biomass,-6, +resid others,coal,-6, +resid others,electricity,-6, +resid others,gas,-6, +resid others,refined liquids,-6, +resid others,traditional biomass,-6, +resid others,district heat,-6, +comm heating,biomass,-6, +comm heating,coal,-6, +comm heating,electricity,-6, +comm heating,gas,-6, +comm heating,refined liquids,-6, +comm heating,district heat,-6, +comm cooling,electricity,-6, +comm cooling,gas,-6, +comm others,biomass,-6, +comm others,coal,-6, +comm others,electricity,-6, +comm others,gas,-6, +comm others,refined liquids,-6, +comm others,district heat,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A44.subsector_shrwt.csv index 4bdf20e777..b4d1adfd19 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.subsector_shrwt.csv @@ -1 +1,32 @@ -# Building default subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight resid heating,biomass,start-year,,1 resid heating,coal,start-year,,1 resid heating,electricity,start-year,,1 resid heating,gas,start-year,,1 resid heating,refined liquids,start-year,,1 resid heating,traditional biomass,start-year,,1 resid heating,district heat,start-year,,1 resid cooling,electricity,start-year,,1 resid cooling,gas,start-year,,1 resid others,biomass,start-year,,1 resid others,coal,start-year,,1 resid others,electricity,start-year,,1 resid others,gas,start-year,,1 resid others,refined liquids,start-year,,1 resid others,traditional biomass,start-year,,1 resid others,district heat,start-year,,1 comm heating,biomass,start-year,,1 comm heating,coal,start-year,,1 comm heating,electricity,start-year,,1 comm heating,gas,start-year,,1 comm heating,refined liquids,start-year,,1 comm heating,district heat,start-year,,1 comm cooling,electricity,start-year,,1 comm cooling,gas,start-year,,1 comm others,biomass,start-year,,1 comm others,coal,start-year,,1 comm others,electricity,start-year,,1 comm others,gas,start-year,,1 comm others,refined liquids,start-year,,1 comm others,district heat,start-year,,1 \ No newline at end of file +# Building default subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +resid heating,biomass,start-year,,1 +resid heating,coal,start-year,,1 +resid heating,electricity,start-year,,1 +resid heating,gas,start-year,,1 +resid heating,refined liquids,start-year,,1 +resid heating,traditional biomass,start-year,,1 +resid heating,district heat,start-year,,1 +resid cooling,electricity,start-year,,1 +resid cooling,gas,start-year,,1 +resid others,biomass,start-year,,1 +resid others,coal,start-year,,1 +resid others,electricity,start-year,,1 +resid others,gas,start-year,,1 +resid others,refined liquids,start-year,,1 +resid others,traditional biomass,start-year,,1 +resid others,district heat,start-year,,1 +comm heating,biomass,start-year,,1 +comm heating,coal,start-year,,1 +comm heating,electricity,start-year,,1 +comm heating,gas,start-year,,1 +comm heating,refined liquids,start-year,,1 +comm heating,district heat,start-year,,1 +comm cooling,electricity,start-year,,1 +comm cooling,gas,start-year,,1 +comm others,biomass,start-year,,1 +comm others,coal,start-year,,1 +comm others,electricity,start-year,,1 +comm others,gas,start-year,,1 +comm others,refined liquids,start-year,,1 +comm others,district heat,start-year,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A44.tech_eff_mult_RG3.csv b/input/gcam-data-system/energy-data/assumptions/A44.tech_eff_mult_RG3.csv index 62d44efc6e..f1c30485e4 100644 --- a/input/gcam-data-system/energy-data/assumptions/A44.tech_eff_mult_RG3.csv +++ b/input/gcam-data-system/energy-data/assumptions/A44.tech_eff_mult_RG3.csv @@ -1 +1,16 @@ -# Efficiency multipliers from the USA to the given GCAM 3.0 regions,,,,,,,,, region_GCAM3,1971,2005,2020,2035,2050,2065,2080,2095,2100 USA,1,1,1,1,1,1,1,1,1 Canada,0.964588851,0.969497233,0.974430592,0.978131011,0.98220829,0.986116017,0.989353551,0.992805871,0.992805871 Western Europe,0.945956574,0.952236624,0.958558368,0.965247973,0.970667124,0.976511606,0.982266375,0.987822928,0.987822928 Japan,1.005785366,1.003396058,1.001012425,1.001303295,1.001078576,1.00143712,1.000873963,1.000133949,1.000133949 Australia_NZ,0.951078916,0.959858623,0.968719378,0.973776768,0.97830615,0.982584783,0.985973684,0.990101936,0.990101936 Former Soviet Union,0.743406444,0.786207637,0.831473085,0.867368535,0.899011043,0.926614732,0.949851312,0.969730491,0.969730491 China,0.697272279,0.767763294,0.845380625,0.894302429,0.927494324,0.951272502,0.970040874,0.982923752,0.982923752 Middle East,0.811864413,0.840301751,0.869735169,0.892543136,0.912810951,0.931348623,0.949939445,0.967382009,0.967382009 Africa,0.69942082,0.734747882,0.771859279,0.803920351,0.837992727,0.876190809,0.913217197,0.94613137,0.94613137 Latin America,0.815060534,0.84107449,0.867918722,0.890088059,0.911687808,0.934016267,0.956368517,0.974362428,0.974362428 Southeast Asia,0.737520459,0.782020828,0.829206252,0.872292896,0.906717151,0.936502152,0.959076274,0.976656483,0.976656483 Eastern Europe,0.801851893,0.840005649,0.879974839,0.90818679,0.935113424,0.956245839,0.973213049,0.985566451,0.985566451 Korea,0.905096662,0.92324476,0.941756747,0.953346501,0.964614971,0.974435929,0.98235148,0.989069809,0.989069809 India,0.657756912,0.717345561,0.782332567,0.83695084,0.881235687,0.917444643,0.945587726,0.968521537,0.968521537 \ No newline at end of file +# Efficiency multipliers from the USA to the given GCAM 3.0 regions,,,,,,,,, +region_GCAM3,1971,2005,2020,2035,2050,2065,2080,2095,2100 +USA,1,1,1,1,1,1,1,1,1 +Canada,0.964588851,0.969497233,0.974430592,0.978131011,0.98220829,0.986116017,0.989353551,0.992805871,0.992805871 +Western Europe,0.945956574,0.952236624,0.958558368,0.965247973,0.970667124,0.976511606,0.982266375,0.987822928,0.987822928 +Japan,1.005785366,1.003396058,1.001012425,1.001303295,1.001078576,1.00143712,1.000873963,1.000133949,1.000133949 +Australia_NZ,0.951078916,0.959858623,0.968719378,0.973776768,0.97830615,0.982584783,0.985973684,0.990101936,0.990101936 +Former Soviet Union,0.743406444,0.786207637,0.831473085,0.867368535,0.899011043,0.926614732,0.949851312,0.969730491,0.969730491 +China,0.697272279,0.767763294,0.845380625,0.894302429,0.927494324,0.951272502,0.970040874,0.982923752,0.982923752 +Middle East,0.811864413,0.840301751,0.869735169,0.892543136,0.912810951,0.931348623,0.949939445,0.967382009,0.967382009 +Africa,0.69942082,0.734747882,0.771859279,0.803920351,0.837992727,0.876190809,0.913217197,0.94613137,0.94613137 +Latin America,0.815060534,0.84107449,0.867918722,0.890088059,0.911687808,0.934016267,0.956368517,0.974362428,0.974362428 +Southeast Asia,0.737520459,0.782020828,0.829206252,0.872292896,0.906717151,0.936502152,0.959076274,0.976656483,0.976656483 +Eastern Europe,0.801851893,0.840005649,0.879974839,0.90818679,0.935113424,0.956245839,0.973213049,0.985566451,0.985566451 +Korea,0.905096662,0.92324476,0.941756747,0.953346501,0.964614971,0.974435929,0.98235148,0.989069809,0.989069809 +India,0.657756912,0.717345561,0.782332567,0.83695084,0.881235687,0.917444643,0.945587726,0.968521537,0.968521537 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A52.demand.csv b/input/gcam-data-system/energy-data/assumptions/A52.demand.csv index 808d6f817f..aba686faa5 100644 --- a/input/gcam-data-system/energy-data/assumptions/A52.demand.csv +++ b/input/gcam-data-system/energy-data/assumptions/A52.demand.csv @@ -1 +1,3 @@ -# Aggregate transportation final demand perCapitaBased and price elasticity,, energy.final.demand,perCapitaBased,price.elasticity transportation,1,-1 \ No newline at end of file +# Aggregate transportation final demand perCapitaBased and price elasticity,, +energy.final.demand,perCapitaBased,price.elasticity +transportation,1,-1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A52.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A52.globaltech_cost.csv index 4def742987..6fcc70a402 100644 --- a/input/gcam-data-system/energy-data/assumptions/A52.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A52.globaltech_cost.csv @@ -1 +1,7 @@ -# Aggregate transportation default costs,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2100 transportation,coal,coal,non-energy,100,100 transportation,electricity,electricity,non-energy,100,100 transportation,hydrogen,hydrogen,non-energy,100,100 transportation,gas,gas,non-energy,100,100 transportation,refined liquids,refined liquids,non-energy,100,100 \ No newline at end of file +# Aggregate transportation default costs,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2100 +transportation,coal,coal,non-energy,100,100 +transportation,electricity,electricity,non-energy,100,100 +transportation,hydrogen,hydrogen,non-energy,100,100 +transportation,gas,gas,non-energy,100,100 +transportation,refined liquids,refined liquids,non-energy,100,100 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A52.globaltech_eff.csv b/input/gcam-data-system/energy-data/assumptions/A52.globaltech_eff.csv index 83c37fd0ea..0250255424 100644 --- a/input/gcam-data-system/energy-data/assumptions/A52.globaltech_eff.csv +++ b/input/gcam-data-system/energy-data/assumptions/A52.globaltech_eff.csv @@ -1 +1,7 @@ -# Aggregate transportation default efficiencies,,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2005,2100 transportation,coal,coal,delivered coal,0.05,0.05,0.05 transportation,electricity,electricity,elect_td_trn,0.48,0.51,0.65 transportation,hydrogen,hydrogen,H2 enduse,0.224,0.238,0.35 transportation,gas,gas,delivered gas,0.16,0.17,0.25 transportation,refined liquids,refined liquids,refined liquids enduse,0.16,0.17,0.25 \ No newline at end of file +# Aggregate transportation default efficiencies,,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2005,2100 +transportation,coal,coal,delivered coal,0.05,0.05,0.05 +transportation,electricity,electricity,elect_td_trn,0.48,0.51,0.65 +transportation,hydrogen,hydrogen,H2 enduse,0.224,0.238,0.35 +transportation,gas,gas,delivered gas,0.16,0.17,0.25 +transportation,refined liquids,refined liquids,refined liquids enduse,0.16,0.17,0.25 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A52.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A52.globaltech_shrwt.csv index ce1a709637..c0d3b32248 100644 --- a/input/gcam-data-system/energy-data/assumptions/A52.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A52.globaltech_shrwt.csv @@ -1 +1,7 @@ -# Aggregate transportation technology default shareweights,,,,,, supplysector,subsector,technology,1971,2019,2020,2100 transportation,coal,coal,1,1,1,1 transportation,electricity,electricity,1,1,1,1 transportation,hydrogen,hydrogen,0,0,1,1 transportation,gas,gas,1,1,1,1 transportation,refined liquids,refined liquids,1,1,1,1 \ No newline at end of file +# Aggregate transportation technology default shareweights,,,,,, +supplysector,subsector,technology,1971,2019,2020,2100 +transportation,coal,coal,1,1,1,1 +transportation,electricity,electricity,1,1,1,1 +transportation,hydrogen,hydrogen,0,0,1,1 +transportation,gas,gas,1,1,1,1 +transportation,refined liquids,refined liquids,1,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A52.sector.csv b/input/gcam-data-system/energy-data/assumptions/A52.sector.csv index 81eb7cd6c1..e21f7fcac3 100644 --- a/input/gcam-data-system/energy-data/assumptions/A52.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A52.sector.csv @@ -1 +1,3 @@ -# Aggregate transportation sector default supplysector information (units and logit exponents),,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type transportation,EJ,EJ,1975$/GJ,-1.5,transportation, \ No newline at end of file +# Aggregate transportation sector default supplysector information (units and logit exponents),,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.type +transportation,EJ,EJ,1975$/GJ,-1.5,transportation, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A52.subsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A52.subsector_interp.csv index be8441b17e..73149eb66b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A52.subsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A52.subsector_interp.csv @@ -1 +1,7 @@ -# Aggregate transportation default subsector shareweight interpolation,,,,,, supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function transportation,coal,share-weight,final-calibration-year,end-year,,fixed transportation,electricity,share-weight,final-calibration-year,end-year,,fixed transportation,hydrogen,share-weight,2020,2050,,linear transportation,gas,share-weight,final-calibration-year,end-year,,fixed transportation,refined liquids,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# Aggregate transportation default subsector shareweight interpolation,,,,,, +supplysector,subsector,apply.to,from.year,to.year,to.value,interpolation.function +transportation,coal,share-weight,final-calibration-year,end-year,,fixed +transportation,electricity,share-weight,final-calibration-year,end-year,,fixed +transportation,hydrogen,share-weight,2020,2050,,linear +transportation,gas,share-weight,final-calibration-year,end-year,,fixed +transportation,refined liquids,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A52.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A52.subsector_logit.csv index 2e8e98b827..3a709fabd0 100644 --- a/input/gcam-data-system/energy-data/assumptions/A52.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A52.subsector_logit.csv @@ -1 +1,7 @@ -# Aggregate transportation default subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type transportation,coal,-6, transportation,electricity,-6, transportation,hydrogen,-6, transportation,gas,-6, transportation,refined liquids,-6, \ No newline at end of file +# Aggregate transportation default subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +transportation,coal,-6, +transportation,electricity,-6, +transportation,hydrogen,-6, +transportation,gas,-6, +transportation,refined liquids,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A52.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A52.subsector_shrwt.csv index e3f8e292db..483ff1f669 100644 --- a/input/gcam-data-system/energy-data/assumptions/A52.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A52.subsector_shrwt.csv @@ -1 +1,8 @@ -# Aggregate transportation default subsector shareweights,,,, supplysector,subsector,year.fillout,year,share.weight transportation,coal,start-year,,1 transportation,electricity,start-year,,1 transportation,hydrogen,,2020,0.01 transportation,hydrogen,2050,,0.05 transportation,gas,start-year,,1 transportation,refined liquids,start-year,,1 \ No newline at end of file +# Aggregate transportation default subsector shareweights,,,, +supplysector,subsector,year.fillout,year,share.weight +transportation,coal,start-year,,1 +transportation,electricity,start-year,,1 +transportation,hydrogen,,2020,0.01 +transportation,hydrogen,2050,,0.05 +transportation,gas,start-year,,1 +transportation,refined liquids,start-year,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.demand.csv b/input/gcam-data-system/energy-data/assumptions/A54.demand.csv index 6299091a13..5b59fd6a30 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.demand.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.demand.csv @@ -1 +1,6 @@ -# Transportation final demand perCapitaBased / price elasticity / income elasticity,,, energy.final.demand,perCapitaBased,price.elasticity,income.elasticity trn_pass,1,-1.25,1 trn_freight,0,-0.65,0.75 trn_aviation_intl,1,-1,1 trn_shipping_intl,0,-0.65,0.4 \ No newline at end of file +# Transportation final demand perCapitaBased / price elasticity / income elasticity,,, +energy.final.demand,perCapitaBased,price.elasticity,income.elasticity +trn_pass,1,-1.25,1 +trn_freight,0,-0.65,0.75 +trn_aviation_intl,1,-1,1 +trn_shipping_intl,0,-0.65,0.4 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.globaltech_nonmotor.csv b/input/gcam-data-system/energy-data/assumptions/A54.globaltech_nonmotor.csv index 1c47578eae..ce104ae988 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.globaltech_nonmotor.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.globaltech_nonmotor.csv @@ -1 +1,4 @@ -#Table includes all parameters related to walking and cycling in each region,,,,, supplysector,tranSubsector,speed,technology,renewable.input,share.weight trn_pass,Walk,4.8,Walk,renewable,1 trn_pass,Cycle,15,Cycle,renewable,1 \ No newline at end of file +#Table includes all parameters related to walking and cycling in each region,,,,, +supplysector,tranSubsector,speed,technology,renewable.input,share.weight +trn_pass,Walk,4.8,Walk,renewable,1 +trn_pass,Cycle,15,Cycle,renewable,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.globaltech_passthru.csv b/input/gcam-data-system/energy-data/assumptions/A54.globaltech_passthru.csv index cc3eb8159b..58556d1599 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.globaltech_passthru.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.globaltech_passthru.csv @@ -1 +1,8 @@ -# Transportation technology defaults (all parameters; pass-through technologies only),,,,, supplysector,tranSubsector,technology,minicam.energy.input,coefficient,share.weight trn_pass,road,road,trn_pass_road,1,1 trn_pass_road,LDV,LDV,trn_pass_road_LDV,1,1 trn_pass_road,bus,bus,trn_pass_road_bus,1,1 trn_pass_road_LDV,4W,4W,trn_pass_road_LDV_4W,1,1 trn_pass_road_LDV,2W,2W,trn_pass_road_LDV_2W,1,1 trn_freight,road,road,trn_freight_road,1,1 \ No newline at end of file +# Transportation technology defaults (all parameters; pass-through technologies only),,,,, +supplysector,tranSubsector,technology,minicam.energy.input,coefficient,share.weight +trn_pass,road,road,trn_pass_road,1,1 +trn_pass_road,LDV,LDV,trn_pass_road_LDV,1,1 +trn_pass_road,bus,bus,trn_pass_road_bus,1,1 +trn_pass_road_LDV,4W,4W,trn_pass_road_LDV_4W,1,1 +trn_pass_road_LDV,2W,2W,trn_pass_road_LDV_2W,1,1 +trn_freight,road,road,trn_freight_road,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_interp.csv b/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_interp.csv index 95d32b8634..0edbfcc73a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_interp.csv @@ -1,121 +1,121 @@ -# Transportation technology default shareweights. Not including single-technology subsectors,,,,,, -supplysector,tranSubsector,tranTechnology,apply.to,from.year,to.year,interpolation.function -trn_freight,Freight Rail,Adv-Electric,share-weight,final-calibration-year,end-year,fixed -trn_freight,Freight Rail,Adv-Liquid,share-weight,final-calibration-year,end-year,fixed -trn_freight,Freight Rail,Coal,share-weight,final-calibration-year,2015,linear -trn_freight,Freight Rail,Electric,share-weight,final-calibration-year,end-year,fixed -trn_freight,Freight Rail,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,3W Rural,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,3W Rural,NG,share-weight,final-calibration-year,end-year,linear -trn_freight_road,Truck,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck,NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (>12t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (>12t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (>14t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (>14t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (>15t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (>15t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (>32t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (>32t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (0-1t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (0-1t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (0-2.7t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (0-2.7t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (0-2t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (0-2t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (0-3.5t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (0-3.5t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (0-4.5t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (0-4.5t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (0-6t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (0-6t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (1-6t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (1-6t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (16-32t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (16-32t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (2-5t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (2-5t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (2.7-4.5t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (2.7-4.5t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (3.5-16t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (3.5-16t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (4.5-12t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (4.5-12t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (4.5-15t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (4.5-15t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (5-9t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (5-9t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (6-14t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (6-14t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (6-15t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (6-15t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (6-30t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (6-30t),NG,share-weight,final-calibration-year,2050,linear -trn_freight_road,Truck (9-16t),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_freight_road,Truck (9-16t),NG,share-weight,final-calibration-year,2050,linear -trn_pass,Passenger Rail,Electric,share-weight,final-calibration-year,end-year,fixed -trn_pass,Passenger Rail,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass,Passenger Rail,Tech-Adv-Electric,share-weight,final-calibration-year,end-year,fixed -trn_pass,Passenger Rail,Tech-Adv-Liquid,share-weight,final-calibration-year,end-year,fixed -trn_pass_road,Bus,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road,Bus,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_bus,Heavy Bus,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_bus,Heavy Bus,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_bus,Light Bus,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_bus,Light Bus,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV,Three-Wheeler,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV,Three-Wheeler,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_2W,Moped,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_2W,Moped,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_2W,Motorcycle (>250cc),BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_2W,Motorcycle (>250cc),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_2W,Motorcycle (50-250cc),BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_2W,Motorcycle (50-250cc),LA-BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_2W,Motorcycle (50-250cc),Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_2W,Scooter,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_2W,Scooter,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Compact Car,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Compact Car,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Compact Car,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Compact Car,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_4W,Large Car,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Large Car,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Large Car,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Large Car,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_4W,Large Car and SUV,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Large Car and SUV,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Large Car and SUV,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Large Car and SUV,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_4W,Light Truck and SUV,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Light Truck and SUV,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_4W,Midsize Car,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Midsize Car,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Midsize Car,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Midsize Car,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_4W,Mini Car,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Mini Car,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Mini Car,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Mini Car,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_4W,Subcompact Car,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Subcompact Car,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Subcompact Car,Liquids,share-weight,final-calibration-year,end-year,fixed -trn_pass_road_LDV_4W,Subcompact Car,NG,share-weight,final-calibration-year,end-year,linear -trn_pass_road_LDV_4W,Van,BEV,share-weight,final-calibration-year,2050,linear -trn_pass_road_LDV_4W,Van,FCEV,share-weight,2015,end-year,linear -trn_pass_road_LDV_4W,Van,Hybrid Liquids,share-weight,final-calibration-year,2020,linear -trn_pass_road_LDV_4W,Van,Liquids,share-weight,final-calibration-year,end-year,fixed +# Transportation technology default shareweights. Not including single-technology subsectors,,,,,, +supplysector,tranSubsector,tranTechnology,apply.to,from.year,to.year,interpolation.function +trn_freight,Freight Rail,Adv-Electric,share-weight,final-calibration-year,end-year,fixed +trn_freight,Freight Rail,Adv-Liquid,share-weight,final-calibration-year,end-year,fixed +trn_freight,Freight Rail,Coal,share-weight,final-calibration-year,2015,linear +trn_freight,Freight Rail,Electric,share-weight,final-calibration-year,end-year,fixed +trn_freight,Freight Rail,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,3W Rural,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,3W Rural,NG,share-weight,final-calibration-year,end-year,linear +trn_freight_road,Truck,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck,NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (>12t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (>12t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (>14t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (>14t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (>15t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (>15t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (>32t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (>32t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-1t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-1t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-2.7t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-2.7t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-2t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-2t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-3.5t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-3.5t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-4.5t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-4.5t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (0-6t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (0-6t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (1-6t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (1-6t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (16-32t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (16-32t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (2-5t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (2-5t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (2.7-4.5t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (2.7-4.5t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (3.5-16t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (3.5-16t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (4.5-12t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (4.5-12t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (4.5-15t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (4.5-15t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (5-9t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (5-9t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (6-14t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (6-14t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (6-15t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (6-15t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (6-30t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (6-30t),NG,share-weight,final-calibration-year,2050,linear +trn_freight_road,Truck (9-16t),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_freight_road,Truck (9-16t),NG,share-weight,final-calibration-year,2050,linear +trn_pass,Passenger Rail,Electric,share-weight,final-calibration-year,end-year,fixed +trn_pass,Passenger Rail,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass,Passenger Rail,Tech-Adv-Electric,share-weight,final-calibration-year,end-year,fixed +trn_pass,Passenger Rail,Tech-Adv-Liquid,share-weight,final-calibration-year,end-year,fixed +trn_pass_road,Bus,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road,Bus,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_bus,Heavy Bus,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_bus,Heavy Bus,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_bus,Light Bus,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_bus,Light Bus,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV,Three-Wheeler,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV,Three-Wheeler,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_2W,Moped,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Moped,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_2W,Motorcycle (>250cc),BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Motorcycle (>250cc),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_2W,Motorcycle (50-250cc),BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Motorcycle (50-250cc),LA-BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Motorcycle (50-250cc),Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_2W,Scooter,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_2W,Scooter,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Compact Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Compact Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Compact Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Compact Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Large Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Large Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Large Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Large Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Large Car and SUV,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Large Car and SUV,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Large Car and SUV,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Large Car and SUV,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Light Truck and SUV,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Light Truck and SUV,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Midsize Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Midsize Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Midsize Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Midsize Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Mini Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Mini Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Mini Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Mini Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Subcompact Car,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Subcompact Car,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Subcompact Car,Liquids,share-weight,final-calibration-year,end-year,fixed +trn_pass_road_LDV_4W,Subcompact Car,NG,share-weight,final-calibration-year,end-year,linear +trn_pass_road_LDV_4W,Van,BEV,share-weight,final-calibration-year,2050,linear +trn_pass_road_LDV_4W,Van,FCEV,share-weight,2015,end-year,linear +trn_pass_road_LDV_4W,Van,Hybrid Liquids,share-weight,final-calibration-year,2020,linear +trn_pass_road_LDV_4W,Van,Liquids,share-weight,final-calibration-year,end-year,fixed trn_pass_road_LDV_4W,Van,NG,share-weight,final-calibration-year,end-year,linear \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_retire.csv b/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_retire.csv index 243090f3d2..29534a40a7 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_retire.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_retire.csv @@ -1 +1,184 @@ -# Transportation technology retirement parameters. Only applies to vintaged technologies,,,,,, supplysector,tranSubsector,tranTechnology,year,lifetime,half.life,steepness trn_freight_road,Truck,Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck,NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (>12t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (>12t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (>14t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (>14t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (>15t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (>15t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (>32t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (>32t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (0-1t),Liquids,final-calibration-year,25,11,0.23 trn_freight_road,Truck (0-1t),NG,final-calibration-year,25,11,0.23 trn_freight_road,Truck (0-2.7t),Liquids,final-calibration-year,25,11,0.23 trn_freight_road,Truck (0-2.7t),NG,final-calibration-year,25,11,0.23 trn_freight_road,Truck (0-2t),Liquids,final-calibration-year,25,11,0.23 trn_freight_road,Truck (0-2t),NG,final-calibration-year,25,11,0.23 trn_freight_road,Truck (0-3.5t),Liquids,final-calibration-year,25,11,0.23 trn_freight_road,Truck (0-3.5t),NG,final-calibration-year,25,11,0.23 trn_freight_road,Truck (0-4.5t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (0-4.5t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (0-6t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (0-6t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (1-6t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (1-6t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (16-32t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (16-32t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (2-5t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (2-5t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (2.7-4.5t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (2.7-4.5t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (3.5-16t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (3.5-16t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (4.5-12t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (4.5-12t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (4.5-15t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (4.5-15t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (5-9t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (5-9t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (6-14t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (6-14t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (6-15t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (6-15t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (6-30t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (6-30t),NG,final-calibration-year,40,25,0.124 trn_freight_road,Truck (9-16t),Liquids,final-calibration-year,40,25,0.124 trn_freight_road,Truck (9-16t),NG,final-calibration-year,40,25,0.124 trn_pass_road_LDV_4W,Compact Car,BEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Compact Car,FCEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Compact Car,Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Compact Car,NG,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Large Car,BEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Large Car,FCEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Large Car,Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Large Car,NG,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Large Car and SUV,BEV,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Large Car and SUV,FCEV,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Large Car and SUV,Liquids,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Large Car and SUV,NG,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Light Truck and SUV,BEV,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Light Truck and SUV,NG,final-calibration-year,25,11,0.23 trn_pass_road_LDV_4W,Midsize Car,BEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Midsize Car,FCEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Midsize Car,Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Midsize Car,NG,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Mini Car,BEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Mini Car,FCEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Mini Car,Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Mini Car,NG,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Subcompact Car,BEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Subcompact Car,FCEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Subcompact Car,Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Subcompact Car,NG,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Van,BEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Van,FCEV,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Van,Hybrid Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Van,Liquids,final-calibration-year,25,11,0.218 trn_pass_road_LDV_4W,Van,NG,final-calibration-year,25,11,0.218 trn_freight_road,Truck,Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck,NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (>12t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (>12t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (>14t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (>14t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (>15t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (>15t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (>32t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (>32t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (0-1t),Liquids,initial-future-year,25,12,0.193 trn_freight_road,Truck (0-1t),NG,initial-future-year,25,12,0.193 trn_freight_road,Truck (0-2.7t),Liquids,initial-future-year,25,12,0.193 trn_freight_road,Truck (0-2.7t),NG,initial-future-year,25,12,0.193 trn_freight_road,Truck (0-2t),Liquids,initial-future-year,25,12,0.193 trn_freight_road,Truck (0-2t),NG,initial-future-year,25,12,0.193 trn_freight_road,Truck (0-3.5t),Liquids,initial-future-year,25,12,0.193 trn_freight_road,Truck (0-3.5t),NG,initial-future-year,25,12,0.193 trn_freight_road,Truck (0-4.5t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (0-4.5t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (0-6t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (0-6t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (1-6t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (1-6t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (16-32t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (16-32t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (2-5t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (2-5t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (2.7-4.5t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (2.7-4.5t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (3.5-16t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (3.5-16t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (4.5-12t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (4.5-12t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (4.5-15t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (4.5-15t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (5-9t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (5-9t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (6-14t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (6-14t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (6-15t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (6-15t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (6-30t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (6-30t),NG,initial-future-year,40,20,0.122 trn_freight_road,Truck (9-16t),Liquids,initial-future-year,40,20,0.122 trn_freight_road,Truck (9-16t),NG,initial-future-year,40,20,0.122 trn_pass_road_LDV_4W,Compact Car,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Compact Car,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Compact Car,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Compact Car,NG,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car,NG,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car and SUV,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car and SUV,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car and SUV,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Large Car and SUV,NG,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Light Truck and SUV,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Light Truck and SUV,NG,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Midsize Car,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Midsize Car,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Midsize Car,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Midsize Car,NG,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Mini Car,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Mini Car,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Mini Car,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Mini Car,NG,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Subcompact Car,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Subcompact Car,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Subcompact Car,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Subcompact Car,NG,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Van,BEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Van,FCEV,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Van,Hybrid Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Van,Liquids,initial-future-year,25,12,0.193 trn_pass_road_LDV_4W,Van,NG,initial-future-year,25,12,0.193 \ No newline at end of file +# Transportation technology retirement parameters. Only applies to vintaged technologies,,,,,, +supplysector,tranSubsector,tranTechnology,year,lifetime,half.life,steepness +trn_freight_road,Truck,Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck,NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (>12t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (>12t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (>14t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (>14t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (>15t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (>15t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (>32t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (>32t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (0-1t),Liquids,final-calibration-year,25,11,0.23 +trn_freight_road,Truck (0-1t),NG,final-calibration-year,25,11,0.23 +trn_freight_road,Truck (0-2.7t),Liquids,final-calibration-year,25,11,0.23 +trn_freight_road,Truck (0-2.7t),NG,final-calibration-year,25,11,0.23 +trn_freight_road,Truck (0-2t),Liquids,final-calibration-year,25,11,0.23 +trn_freight_road,Truck (0-2t),NG,final-calibration-year,25,11,0.23 +trn_freight_road,Truck (0-3.5t),Liquids,final-calibration-year,25,11,0.23 +trn_freight_road,Truck (0-3.5t),NG,final-calibration-year,25,11,0.23 +trn_freight_road,Truck (0-4.5t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (0-4.5t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (0-6t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (0-6t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (1-6t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (1-6t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (16-32t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (16-32t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (2-5t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (2-5t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (2.7-4.5t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (2.7-4.5t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (3.5-16t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (3.5-16t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (4.5-12t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (4.5-12t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (4.5-15t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (4.5-15t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (5-9t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (5-9t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (6-14t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (6-14t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (6-15t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (6-15t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (6-30t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (6-30t),NG,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (9-16t),Liquids,final-calibration-year,40,25,0.124 +trn_freight_road,Truck (9-16t),NG,final-calibration-year,40,25,0.124 +trn_pass_road_LDV_4W,Compact Car,BEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Compact Car,FCEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Compact Car,Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Compact Car,NG,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Large Car,BEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Large Car,FCEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Large Car,Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Large Car,NG,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Large Car and SUV,BEV,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Large Car and SUV,FCEV,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Large Car and SUV,Liquids,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Large Car and SUV,NG,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Light Truck and SUV,BEV,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Light Truck and SUV,NG,final-calibration-year,25,11,0.23 +trn_pass_road_LDV_4W,Midsize Car,BEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Midsize Car,FCEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Midsize Car,Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Midsize Car,NG,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Mini Car,BEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Mini Car,FCEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Mini Car,Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Mini Car,NG,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Subcompact Car,BEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Subcompact Car,FCEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Subcompact Car,Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Subcompact Car,NG,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Van,BEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Van,FCEV,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Van,Hybrid Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Van,Liquids,final-calibration-year,25,11,0.218 +trn_pass_road_LDV_4W,Van,NG,final-calibration-year,25,11,0.218 +trn_freight_road,Truck,Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck,NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (>12t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (>12t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (>14t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (>14t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (>15t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (>15t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (>32t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (>32t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (0-1t),Liquids,initial-future-year,25,12,0.193 +trn_freight_road,Truck (0-1t),NG,initial-future-year,25,12,0.193 +trn_freight_road,Truck (0-2.7t),Liquids,initial-future-year,25,12,0.193 +trn_freight_road,Truck (0-2.7t),NG,initial-future-year,25,12,0.193 +trn_freight_road,Truck (0-2t),Liquids,initial-future-year,25,12,0.193 +trn_freight_road,Truck (0-2t),NG,initial-future-year,25,12,0.193 +trn_freight_road,Truck (0-3.5t),Liquids,initial-future-year,25,12,0.193 +trn_freight_road,Truck (0-3.5t),NG,initial-future-year,25,12,0.193 +trn_freight_road,Truck (0-4.5t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (0-4.5t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (0-6t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (0-6t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (1-6t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (1-6t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (16-32t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (16-32t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (2-5t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (2-5t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (2.7-4.5t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (2.7-4.5t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (3.5-16t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (3.5-16t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (4.5-12t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (4.5-12t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (4.5-15t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (4.5-15t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (5-9t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (5-9t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (6-14t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (6-14t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (6-15t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (6-15t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (6-30t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (6-30t),NG,initial-future-year,40,20,0.122 +trn_freight_road,Truck (9-16t),Liquids,initial-future-year,40,20,0.122 +trn_freight_road,Truck (9-16t),NG,initial-future-year,40,20,0.122 +trn_pass_road_LDV_4W,Compact Car,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Compact Car,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Compact Car,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Compact Car,NG,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car,NG,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car and SUV,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car and SUV,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car and SUV,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Large Car and SUV,NG,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Light Truck and SUV,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Light Truck and SUV,NG,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Midsize Car,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Midsize Car,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Midsize Car,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Midsize Car,NG,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Mini Car,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Mini Car,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Mini Car,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Mini Car,NG,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Subcompact Car,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Subcompact Car,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Subcompact Car,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Subcompact Car,NG,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Van,BEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Van,FCEV,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Van,Hybrid Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Van,Liquids,initial-future-year,25,12,0.193 +trn_pass_road_LDV_4W,Van,NG,initial-future-year,25,12,0.193 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_shrwt.csv index 0f874bbe49..1da490011b 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.globaltranTech_shrwt.csv @@ -1 +1,128 @@ -# Transportation technology default shareweights,,,,,,,, supplysector,tranSubsector,tranTechnology,1971,2010,2015,2020,2050,2100 trn_aviation_intl,International Aviation,Liquids,1,1,1,1,1,1 trn_freight,Domestic Ship,Liquids,1,1,1,1,1,1 trn_freight,Freight Rail,Adv-Electric,0,0,0,0,1,1 trn_freight,Freight Rail,Adv-Liquid,0,0,0,0,1,1 trn_freight,Freight Rail,Coal,1,1,0,0,0,0 trn_freight,Freight Rail,Electric,1,1,1,1,1,1 trn_freight,Freight Rail,Liquids,1,1,1,1,1,1 trn_freight_road,3W Rural,Liquids,1,1,1,1,1,1 trn_freight_road,3W Rural,NG,0,0,1,1,1,1 trn_freight_road,Truck,Liquids,1,1,1,1,1,1 trn_freight_road,Truck,NG,0,0,1,1,1,1 trn_freight_road,Truck (>12t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (>12t),NG,0,0,1,1,1,1 trn_freight_road,Truck (>14t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (>14t),NG,0,0,1,1,1,1 trn_freight_road,Truck (>15t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (>15t),NG,0,0,1,1,1,1 trn_freight_road,Truck (>32t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (>32t),NG,0,0,1,1,1,1 trn_freight_road,Truck (0-1t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (0-1t),NG,0,0,1,1,1,1 trn_freight_road,Truck (0-2.7t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (0-2.7t),NG,0,0,1,1,1,1 trn_freight_road,Truck (0-2t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (0-2t),NG,0,0,1,1,1,1 trn_freight_road,Truck (0-3.5t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (0-3.5t),NG,0,0,1,1,1,1 trn_freight_road,Truck (0-4.5t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (0-4.5t),NG,0,0,1,1,1,1 trn_freight_road,Truck (0-6t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (0-6t),NG,0,0,1,1,1,1 trn_freight_road,Truck (1-6t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (1-6t),NG,0,0,1,1,1,1 trn_freight_road,Truck (16-32t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (16-32t),NG,0,0,1,1,1,1 trn_freight_road,Truck (2-5t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (2-5t),NG,0,0,1,1,1,1 trn_freight_road,Truck (2.7-4.5t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (2.7-4.5t),NG,0,0,1,1,1,1 trn_freight_road,Truck (3.5-16t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (3.5-16t),NG,0,0,1,1,1,1 trn_freight_road,Truck (4.5-12t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (4.5-12t),NG,0,0,1,1,1,1 trn_freight_road,Truck (4.5-15t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (4.5-15t),NG,0,0,1,1,1,1 trn_freight_road,Truck (5-9t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (5-9t),NG,0,0,1,1,1,1 trn_freight_road,Truck (6-14t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (6-14t),NG,0,0,1,1,1,1 trn_freight_road,Truck (6-15t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (6-15t),NG,0,0,1,1,1,1 trn_freight_road,Truck (6-30t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (6-30t),NG,0,0,1,1,1,1 trn_freight_road,Truck (9-16t),Liquids,1,1,1,1,1,1 trn_freight_road,Truck (9-16t),NG,0,0,1,1,1,1 trn_pass,Cycle,Cycle,1,1,1,1,1,1 trn_pass,Domestic Aviation,Liquids,1,1,1,1,1,1 trn_pass,HSR,Electric,0,0,1,1,1,1 trn_pass,Passenger Rail,Electric,1,1,1,1,1,1 trn_pass,Passenger Rail,Liquids,1,1,1,1,1,1 trn_pass,Passenger Rail,Tech-Adv-Electric,0,0,0,0,1,1 trn_pass,Passenger Rail,Tech-Adv-Liquid,0,0,0,0,1,1 trn_pass,Walk,Walk,1,1,1,1,1,1 trn_pass_road,Bus,Liquids,1,1,1,1,1,1 trn_pass_road,Bus,NG,0,0,1,1,1,1 trn_pass_road_bus,Heavy Bus,Liquids,1,1,1,1,1,1 trn_pass_road_bus,Heavy Bus,NG,0,0,1,1,1,1 trn_pass_road_bus,Light Bus,Liquids,1,1,1,1,1,1 trn_pass_road_bus,Light Bus,NG,0,0,1,1,1,1 trn_pass_road_LDV,Three-Wheeler,Liquids,1,1,1,1,1,1 trn_pass_road_LDV,Three-Wheeler,NG,0,0,1,1,1,1 trn_pass_road_LDV_2W,Moped,BEV,0,0,1,1,1,1 trn_pass_road_LDV_2W,Moped,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_2W,Motorcycle (>250cc),BEV,0,0,1,1,1,1 trn_pass_road_LDV_2W,Motorcycle (>250cc),Liquids,1,1,1,1,1,1 trn_pass_road_LDV_2W,Motorcycle (50-250cc),BEV,0,0,1,1,1,1 trn_pass_road_LDV_2W,Motorcycle (50-250cc),LA-BEV,0,0,0,0,0,0 trn_pass_road_LDV_2W,Motorcycle (50-250cc),Liquids,1,1,1,1,1,1 trn_pass_road_LDV_2W,Scooter,BEV,0,0,1,1,1,1 trn_pass_road_LDV_2W,Scooter,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Compact Car,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Compact Car,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Compact Car,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Compact Car,NG,0,0,1,1,1,1 trn_pass_road_LDV_4W,Large Car,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Large Car,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Large Car,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Large Car,NG,0,0,1,1,1,1 trn_pass_road_LDV_4W,Large Car and SUV,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Large Car and SUV,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Large Car and SUV,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Large Car and SUV,NG,0,0,1,1,1,1 trn_pass_road_LDV_4W,Light Truck and SUV,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Light Truck and SUV,NG,0,0,1,1,1,1 trn_pass_road_LDV_4W,Midsize Car,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Midsize Car,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Midsize Car,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Midsize Car,NG,0,0,1,1,1,1 trn_pass_road_LDV_4W,Mini Car,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Mini Car,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Mini Car,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Mini Car,NG,0,0,1,1,1,1 trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,0,0,1,1,1,1 trn_pass_road_LDV_4W,Subcompact Car,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Subcompact Car,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Subcompact Car,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Subcompact Car,NG,0,0,1,1,1,1 trn_pass_road_LDV_4W,Van,BEV,0,0,1,1,1,1 trn_pass_road_LDV_4W,Van,FCEV,0,0,0,1,1,1 trn_pass_road_LDV_4W,Van,Hybrid Liquids,0,0,1,1,1,1 trn_pass_road_LDV_4W,Van,Liquids,1,1,1,1,1,1 trn_pass_road_LDV_4W,Van,NG,0,0,1,1,1,1 trn_shipping_intl,International Ship,Liquids,1,1,1,1,1,1 \ No newline at end of file +# Transportation technology default shareweights,,,,,,,, +supplysector,tranSubsector,tranTechnology,1971,2010,2015,2020,2050,2100 +trn_aviation_intl,International Aviation,Liquids,1,1,1,1,1,1 +trn_freight,Domestic Ship,Liquids,1,1,1,1,1,1 +trn_freight,Freight Rail,Adv-Electric,0,0,0,0,1,1 +trn_freight,Freight Rail,Adv-Liquid,0,0,0,0,1,1 +trn_freight,Freight Rail,Coal,1,1,0,0,0,0 +trn_freight,Freight Rail,Electric,1,1,1,1,1,1 +trn_freight,Freight Rail,Liquids,1,1,1,1,1,1 +trn_freight_road,3W Rural,Liquids,1,1,1,1,1,1 +trn_freight_road,3W Rural,NG,0,0,1,1,1,1 +trn_freight_road,Truck,Liquids,1,1,1,1,1,1 +trn_freight_road,Truck,NG,0,0,1,1,1,1 +trn_freight_road,Truck (>12t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (>12t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (>14t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (>14t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (>15t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (>15t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (>32t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (>32t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (0-1t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (0-1t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (0-2.7t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (0-2.7t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (0-2t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (0-2t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (0-3.5t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (0-3.5t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (0-4.5t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (0-4.5t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (0-6t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (0-6t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (1-6t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (1-6t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (16-32t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (16-32t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (2-5t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (2-5t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (2.7-4.5t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (2.7-4.5t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (3.5-16t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (3.5-16t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (4.5-12t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (4.5-12t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (4.5-15t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (4.5-15t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (5-9t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (5-9t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (6-14t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (6-14t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (6-15t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (6-15t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (6-30t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (6-30t),NG,0,0,1,1,1,1 +trn_freight_road,Truck (9-16t),Liquids,1,1,1,1,1,1 +trn_freight_road,Truck (9-16t),NG,0,0,1,1,1,1 +trn_pass,Cycle,Cycle,1,1,1,1,1,1 +trn_pass,Domestic Aviation,Liquids,1,1,1,1,1,1 +trn_pass,HSR,Electric,0,0,1,1,1,1 +trn_pass,Passenger Rail,Electric,1,1,1,1,1,1 +trn_pass,Passenger Rail,Liquids,1,1,1,1,1,1 +trn_pass,Passenger Rail,Tech-Adv-Electric,0,0,0,0,1,1 +trn_pass,Passenger Rail,Tech-Adv-Liquid,0,0,0,0,1,1 +trn_pass,Walk,Walk,1,1,1,1,1,1 +trn_pass_road,Bus,Liquids,1,1,1,1,1,1 +trn_pass_road,Bus,NG,0,0,1,1,1,1 +trn_pass_road_bus,Heavy Bus,Liquids,1,1,1,1,1,1 +trn_pass_road_bus,Heavy Bus,NG,0,0,1,1,1,1 +trn_pass_road_bus,Light Bus,Liquids,1,1,1,1,1,1 +trn_pass_road_bus,Light Bus,NG,0,0,1,1,1,1 +trn_pass_road_LDV,Three-Wheeler,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV,Three-Wheeler,NG,0,0,1,1,1,1 +trn_pass_road_LDV_2W,Moped,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_2W,Moped,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_2W,Motorcycle (>250cc),BEV,0,0,1,1,1,1 +trn_pass_road_LDV_2W,Motorcycle (>250cc),Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_2W,Motorcycle (50-250cc),BEV,0,0,1,1,1,1 +trn_pass_road_LDV_2W,Motorcycle (50-250cc),LA-BEV,0,0,0,0,0,0 +trn_pass_road_LDV_2W,Motorcycle (50-250cc),Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_2W,Scooter,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_2W,Scooter,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Compact Car,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Compact Car,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Compact Car,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Compact Car,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Compact Car,NG,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Large Car,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Large Car,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Large Car,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Large Car,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Large Car,NG,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Large Car and SUV,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Large Car and SUV,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Large Car and SUV,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Large Car and SUV,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Large Car and SUV,NG,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Light Truck and SUV,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Light Truck and SUV,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Light Truck and SUV,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Light Truck and SUV,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Light Truck and SUV,NG,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Midsize Car,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Midsize Car,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Midsize Car,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Midsize Car,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Midsize Car,NG,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Mini Car,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Mini Car,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Mini Car,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Mini Car,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Mini Car,NG,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Multipurpose Vehicle,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Multipurpose Vehicle,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Multipurpose Vehicle,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Multipurpose Vehicle,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Multipurpose Vehicle,NG,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Subcompact Car,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Subcompact Car,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Subcompact Car,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Subcompact Car,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Subcompact Car,NG,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Van,BEV,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Van,FCEV,0,0,0,1,1,1 +trn_pass_road_LDV_4W,Van,Hybrid Liquids,0,0,1,1,1,1 +trn_pass_road_LDV_4W,Van,Liquids,1,1,1,1,1,1 +trn_pass_road_LDV_4W,Van,NG,0,0,1,1,1,1 +trn_shipping_intl,International Ship,Liquids,1,1,1,1,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.incelas_R.csv b/input/gcam-data-system/energy-data/assumptions/A54.incelas_R.csv index eaef23b3f0..35340d7157 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.incelas_R.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.incelas_R.csv @@ -1 +1,18 @@ -"# modifications to default demand assumptions, by region",,,,, region_GCAM3,energy.final.demand,X1971,X2020,X2050,X2100 Former Soviet Union,trn_pass,0.8,0.8,0.8,0.8 Africa,trn_aviation_intl,1,1,1,1 Australia_NZ,trn_aviation_intl,0.5,0.5,0.5,0.5 Brazil,trn_aviation_intl,1,1,1,1 Canada,trn_aviation_intl,1.25,1.25,1.25,1.25 China,trn_aviation_intl,1.25,1.25,1.25,1.25 Eastern Europe,trn_aviation_intl,1.1,1.1,1.1,1.1 Former Soviet Union,trn_aviation_intl,0.75,0.75,0.75,0.75 India,trn_aviation_intl,1.25,1.25,1.25,1.25 Japan,trn_aviation_intl,1.25,1.25,1.25,1.25 Korea,trn_aviation_intl,2,2,2,2 Latin America,trn_aviation_intl,1,1,1,1 Middle East,trn_aviation_intl,0.5,0.5,0.5,0.5 Southeast Asia,trn_aviation_intl,0.75,0.75,0.75,0.75 USA,trn_aviation_intl,1,1,1,1 Western Europe,trn_aviation_intl,0.8,0.8,0.8,0.8 \ No newline at end of file +"# modifications to default demand assumptions, by region",,,,, +region_GCAM3,energy.final.demand,X1971,X2020,X2050,X2100 +Former Soviet Union,trn_pass,0.8,0.8,0.8,0.8 +Africa,trn_aviation_intl,1,1,1,1 +Australia_NZ,trn_aviation_intl,0.5,0.5,0.5,0.5 +Brazil,trn_aviation_intl,1,1,1,1 +Canada,trn_aviation_intl,1.25,1.25,1.25,1.25 +China,trn_aviation_intl,1.25,1.25,1.25,1.25 +Eastern Europe,trn_aviation_intl,1.1,1.1,1.1,1.1 +Former Soviet Union,trn_aviation_intl,0.75,0.75,0.75,0.75 +India,trn_aviation_intl,1.25,1.25,1.25,1.25 +Japan,trn_aviation_intl,1.25,1.25,1.25,1.25 +Korea,trn_aviation_intl,2,2,2,2 +Latin America,trn_aviation_intl,1,1,1,1 +Middle East,trn_aviation_intl,0.5,0.5,0.5,0.5 +Southeast Asia,trn_aviation_intl,0.75,0.75,0.75,0.75 +USA,trn_aviation_intl,1,1,1,1 +Western Europe,trn_aviation_intl,0.8,0.8,0.8,0.8 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.sector.csv b/input/gcam-data-system/energy-data/assumptions/A54.sector.csv index 722589d0aa..43c43b91ce 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.sector.csv @@ -1,12 +1,12 @@ -# Transportation sector default supplysector information (units and logit exponents),,,,,,,, -supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.factor,energy.final.demand,logit.type -trn_aviation_intl,million pass-km,EJ,1990$/pass-km,-3,transportation,,trn_aviation_intl, -trn_freight,million ton-km,EJ,1990$/ton-km,-2,transportation,road / rail / air / ship,trn_freight, -trn_freight_road,million ton-km,EJ,1990$/ton-km,-1,transportation,truck size classes,trn_freight, -trn_pass,million pass-km,EJ,1990$/pass-km,-2,transportation,ldv / bus,trn_pass, -trn_pass_road,million pass-km,EJ,1990$/pass-km,-4,transportation,light bus / heavy bus,trn_pass, -trn_pass_road_bus,million pass-km,EJ,1990$/pass-km,-4,transportation,2W / 3W / 4W,trn_pass, -trn_pass_road_LDV,million pass-km,EJ,1990$/pass-km,-4,transportation,moped / motorcycle size classes,trn_pass, -trn_pass_road_LDV_2W,million pass-km,EJ,1990$/pass-km,-6,transportation,car / light truck size classes,trn_pass, -trn_pass_road_LDV_4W,million pass-km,EJ,1990$/pass-km,-6,transportation,rail / air / road / hsr,trn_pass,absolute-cost-logit +# Transportation sector default supplysector information (units and logit exponents),,,,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,final.energy,logit.factor,energy.final.demand,logit.type +trn_aviation_intl,million pass-km,EJ,1990$/pass-km,-3,transportation,,trn_aviation_intl, +trn_freight,million ton-km,EJ,1990$/ton-km,-2,transportation,road / rail / air / ship,trn_freight, +trn_freight_road,million ton-km,EJ,1990$/ton-km,-1,transportation,truck size classes,trn_freight, +trn_pass,million pass-km,EJ,1990$/pass-km,-2,transportation,ldv / bus,trn_pass, +trn_pass_road,million pass-km,EJ,1990$/pass-km,-4,transportation,light bus / heavy bus,trn_pass, +trn_pass_road_bus,million pass-km,EJ,1990$/pass-km,-4,transportation,2W / 3W / 4W,trn_pass, +trn_pass_road_LDV,million pass-km,EJ,1990$/pass-km,-4,transportation,moped / motorcycle size classes,trn_pass, +trn_pass_road_LDV_2W,million pass-km,EJ,1990$/pass-km,-6,transportation,car / light truck size classes,trn_pass, +trn_pass_road_LDV_4W,million pass-km,EJ,1990$/pass-km,-6,transportation,rail / air / road / hsr,trn_pass,absolute-cost-logit trn_shipping_intl,million ton-km,EJ,1990$/ton-km,-3,transportation,,trn_shipping_intl, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_VOTT.csv b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_VOTT.csv index bb08ae5d87..c700f64e41 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_VOTT.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_VOTT.csv @@ -1 +1,32 @@ -# Transportation default subsector value of time in transit multipliers (VOTT = wage rate * this factor),,,,,,,, supplysector,tranSubsector,in.vehicle.VOTT,wait.walk.vott,wait.walk.share,time.value.multiplier,addTimeValue,speed.source,fuelprefElasticity trn_aviation_intl,International Aviation,1.45,1.066,0.415,1.291,1,,0 trn_pass,Cycle,1.066,1.066,0,1.066,1,,0 trn_pass,Domestic Aviation,1.45,1.066,0.537,1.244,1,,0 trn_pass,HSR,0.77,1.066,0.102,0.800,1,,0 trn_pass,Passenger Rail,0.77,1.066,0.102,0.800,1,,0 trn_pass,Walk,1.066,1.066,0,1.066,1,,0 trn_pass_road,Bus,0.77,1.066,0.128,0.808,1,,0 trn_pass_road_bus,Heavy Bus,0.77,1.066,0.128,0.808,1,,0 trn_pass_road_bus,Light Bus,0.77,1.066,0.128,0.808,1,,0 trn_pass_road_LDV,Three-Wheeler,0.82,1.066,0,0.820,1,,0 trn_pass_road_LDV_2W,Moped,0.82,1.066,0,0.820,1,,0 trn_pass_road_LDV_2W,Motorcycle (>250cc),0.82,1.066,0,0.820,1,,0 trn_pass_road_LDV_2W,Motorcycle (50-250cc),0.82,1.066,0,0.820,1,,0 trn_pass_road_LDV_2W,Motorcycle (50-250cc),0.82,1.066,0,0.820,1,,0 trn_pass_road_LDV_2W,Scooter,0.82,1.066,0,0.820,1,,0 trn_pass_road_LDV_4W,Compact Car,0.82,1.066,0,0.820,0,,0 trn_pass_road_LDV_4W,Large Car,0.82,1.066,0,0.820,0,,0.1 trn_pass_road_LDV_4W,Large Car and SUV,0.82,1.066,0,0.820,0,,0.2 trn_pass_road_LDV_4W,Light Truck and SUV,0.82,1.066,0,0.820,0,,0.2 trn_pass_road_LDV_4W,Midsize Car,0.82,1.066,0,0.820,0,,0 trn_pass_road_LDV_4W,Mini Car,0.82,1.066,0,0.820,0,,-0.2 trn_pass_road_LDV_4W,Multipurpose Vehicle,0.82,1.066,0,0.820,0,,0.2 trn_pass_road_LDV_4W,Subcompact Car,0.82,1.066,0,0.820,0,,-0.1 trn_pass_road_LDV_4W,Van,0.82,1.066,0,0.820,0,,0 # Pass-through tranSubsectors,,,,,,,, trn_pass,road,,,,1,0,,0 trn_pass_road,LDV,,,,1,0,,0 trn_pass_road,bus,0.77,1.066,0.128,0.808,0,,0 trn_pass_road_LDV,4W,0.82,1.066,0,0.820,1,trn_pass_road_LDV_4W,0 trn_pass_road_LDV,2W,,,,1,0,,0 \ No newline at end of file +# Transportation default subsector value of time in transit multipliers (VOTT = wage rate * this factor),,,,,,,, +supplysector,tranSubsector,in.vehicle.VOTT,wait.walk.vott,wait.walk.share,time.value.multiplier,addTimeValue,speed.source,fuelprefElasticity +trn_aviation_intl,International Aviation,1.45,1.066,0.415,1.291,1,,0 +trn_pass,Cycle,1.066,1.066,0,1.066,1,,0 +trn_pass,Domestic Aviation,1.45,1.066,0.537,1.244,1,,0 +trn_pass,HSR,0.77,1.066,0.102,0.800,1,,0 +trn_pass,Passenger Rail,0.77,1.066,0.102,0.800,1,,0 +trn_pass,Walk,1.066,1.066,0,1.066,1,,0 +trn_pass_road,Bus,0.77,1.066,0.128,0.808,1,,0 +trn_pass_road_bus,Heavy Bus,0.77,1.066,0.128,0.808,1,,0 +trn_pass_road_bus,Light Bus,0.77,1.066,0.128,0.808,1,,0 +trn_pass_road_LDV,Three-Wheeler,0.82,1.066,0,0.820,1,,0 +trn_pass_road_LDV_2W,Moped,0.82,1.066,0,0.820,1,,0 +trn_pass_road_LDV_2W,Motorcycle (>250cc),0.82,1.066,0,0.820,1,,0 +trn_pass_road_LDV_2W,Motorcycle (50-250cc),0.82,1.066,0,0.820,1,,0 +trn_pass_road_LDV_2W,Motorcycle (50-250cc),0.82,1.066,0,0.820,1,,0 +trn_pass_road_LDV_2W,Scooter,0.82,1.066,0,0.820,1,,0 +trn_pass_road_LDV_4W,Compact Car,0.82,1.066,0,0.820,0,,0 +trn_pass_road_LDV_4W,Large Car,0.82,1.066,0,0.820,0,,0.1 +trn_pass_road_LDV_4W,Large Car and SUV,0.82,1.066,0,0.820,0,,0.2 +trn_pass_road_LDV_4W,Light Truck and SUV,0.82,1.066,0,0.820,0,,0.2 +trn_pass_road_LDV_4W,Midsize Car,0.82,1.066,0,0.820,0,,0 +trn_pass_road_LDV_4W,Mini Car,0.82,1.066,0,0.820,0,,-0.2 +trn_pass_road_LDV_4W,Multipurpose Vehicle,0.82,1.066,0,0.820,0,,0.2 +trn_pass_road_LDV_4W,Subcompact Car,0.82,1.066,0,0.820,0,,-0.1 +trn_pass_road_LDV_4W,Van,0.82,1.066,0,0.820,0,,0 +# Pass-through tranSubsectors,,,,,,,, +trn_pass,road,,,,1,0,,0 +trn_pass_road,LDV,,,,1,0,,0 +trn_pass_road,bus,0.77,1.066,0.128,0.808,0,,0 +trn_pass_road_LDV,4W,0.82,1.066,0,0.820,1,trn_pass_road_LDV_4W,0 +trn_pass_road_LDV,2W,,,,1,0,,0 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_interp.csv b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_interp.csv index 65f943271c..dad7b8ead2 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_interp.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_interp.csv @@ -1 +1,59 @@ -# Transportation default subsector shareweight interpolation,,,,,, supplysector,tranSubsector,apply.to,from.year,to.year,to.value,interpolation.function trn_aviation_intl,International Aviation,share-weight,final-calibration-year,end-year,,fixed trn_freight,Domestic Ship,share-weight,final-calibration-year,end-year,,fixed trn_freight,Freight Rail,share-weight,final-calibration-year,end-year,,fixed trn_freight_road,3W Rural,share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck,share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (>12t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (>14t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (>15t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (>32t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (0-1t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (0-2.7t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (0-2t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (0-3.5t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (0-4.5t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (0-6t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (1-6t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (16-32t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (2-5t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (2.7-4.5t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (3.5-16t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (4.5-12t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (4.5-15t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (5-9t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (6-14t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (6-15t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (6-30t),share-weight,final-calibration-year,end-year,,fixed trn_freight_road,Truck (9-16t),share-weight,final-calibration-year,end-year,,fixed trn_pass,Cycle,share-weight,final-calibration-year,end-year,,fixed trn_pass,Domestic Aviation,share-weight,final-calibration-year,end-year,,fixed trn_pass,HSR,share-weight,final-calibration-year,end-year,,linear trn_pass,Passenger Rail,share-weight,final-calibration-year,end-year,,fixed trn_pass,Walk,share-weight,final-calibration-year,end-year,,fixed trn_pass_road,Bus,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_bus,Heavy Bus,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_bus,Light Bus,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV,Three-Wheeler,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_2W,Moped,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_2W,Motorcycle (>250cc),share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_2W,Motorcycle (50-250cc),share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_2W,Motorcycle (50-250cc),share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_2W,Scooter,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Compact Car,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Large Car,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Large Car and SUV,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Light Truck and SUV,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Midsize Car,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Mini Car,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Multipurpose Vehicle,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Subcompact Car,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV_4W,Van,share-weight,final-calibration-year,end-year,,fixed trn_shipping_intl,International Ship,share-weight,final-calibration-year,end-year,,fixed trn_pass,road,share-weight,final-calibration-year,end-year,,fixed trn_pass_road,LDV,share-weight,final-calibration-year,end-year,,fixed trn_pass_road,bus,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV,4W,share-weight,final-calibration-year,end-year,,fixed trn_pass_road_LDV,2W,share-weight,final-calibration-year,end-year,,fixed trn_freight,road,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file +# Transportation default subsector shareweight interpolation,,,,,, +supplysector,tranSubsector,apply.to,from.year,to.year,to.value,interpolation.function +trn_aviation_intl,International Aviation,share-weight,final-calibration-year,end-year,,fixed +trn_freight,Domestic Ship,share-weight,final-calibration-year,end-year,,fixed +trn_freight,Freight Rail,share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,3W Rural,share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck,share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (>12t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (>14t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (>15t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (>32t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (0-1t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (0-2.7t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (0-2t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (0-3.5t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (0-4.5t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (0-6t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (1-6t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (16-32t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (2-5t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (2.7-4.5t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (3.5-16t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (4.5-12t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (4.5-15t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (5-9t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (6-14t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (6-15t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (6-30t),share-weight,final-calibration-year,end-year,,fixed +trn_freight_road,Truck (9-16t),share-weight,final-calibration-year,end-year,,fixed +trn_pass,Cycle,share-weight,final-calibration-year,end-year,,fixed +trn_pass,Domestic Aviation,share-weight,final-calibration-year,end-year,,fixed +trn_pass,HSR,share-weight,final-calibration-year,end-year,,linear +trn_pass,Passenger Rail,share-weight,final-calibration-year,end-year,,fixed +trn_pass,Walk,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road,Bus,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_bus,Heavy Bus,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_bus,Light Bus,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV,Three-Wheeler,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_2W,Moped,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_2W,Motorcycle (>250cc),share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_2W,Motorcycle (50-250cc),share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_2W,Motorcycle (50-250cc),share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_2W,Scooter,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Compact Car,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Large Car,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Large Car and SUV,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Light Truck and SUV,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Midsize Car,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Mini Car,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Multipurpose Vehicle,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Subcompact Car,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV_4W,Van,share-weight,final-calibration-year,end-year,,fixed +trn_shipping_intl,International Ship,share-weight,final-calibration-year,end-year,,fixed +trn_pass,road,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road,LDV,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road,bus,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV,4W,share-weight,final-calibration-year,end-year,,fixed +trn_pass_road_LDV,2W,share-weight,final-calibration-year,end-year,,fixed +trn_freight,road,share-weight,final-calibration-year,end-year,,fixed \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_logit.csv index 86cf868333..691b89fb01 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_logit.csv @@ -1,60 +1,60 @@ -# Transportation default subsector logit exponents,,,, -supplysector,tranSubsector,logit.exponent,logit.factor,logit.type -trn_aviation_intl,International Aviation,-6,,absolute-cost-logit -trn_freight,Domestic Ship,-6,,absolute-cost-logit -trn_freight,Freight Rail,-1,Fuel types and efficiency levels,absolute-cost-logit -trn_freight_road,3W Rural,-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck,-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (>12t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (>14t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (>15t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (>32t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (0-1t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (0-2.7t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (0-2t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (0-3.5t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (0-4.5t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (0-6t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (1-6t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (16-32t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (2-5t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (2.7-4.5t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (3.5-16t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (4.5-12t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (4.5-15t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (5-9t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (6-14t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (6-15t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (6-30t),-8,Fuel types,absolute-cost-logit -trn_freight_road,Truck (9-16t),-8,Fuel types,absolute-cost-logit -trn_pass,Cycle,-6,,absolute-cost-logit -trn_pass,Domestic Aviation,-6,,absolute-cost-logit -trn_pass,HSR,-6,,absolute-cost-logit -trn_pass,Passenger Rail,-1,Fuel types and efficiency levels,absolute-cost-logit -trn_pass,Walk,-6,,absolute-cost-logit -trn_pass_road,Bus,-3,Fuel types,absolute-cost-logit -trn_pass_road_bus,Heavy Bus,-3,Fuel types,absolute-cost-logit -trn_pass_road_bus,Light Bus,-3,Fuel types,absolute-cost-logit -trn_pass_road_LDV,Three-Wheeler,-8,Fuel types,absolute-cost-logit -trn_pass_road_LDV_2W,Moped,-8,Fuel types,absolute-cost-logit -trn_pass_road_LDV_2W,Motorcycle (>250cc),-8,Fuel types,absolute-cost-logit -trn_pass_road_LDV_2W,Motorcycle (50-250cc),-8,Fuel types,absolute-cost-logit -trn_pass_road_LDV_2W,Motorcycle (50-250cc),-8,Fuel types,absolute-cost-logit -trn_pass_road_LDV_2W,Scooter,-8,Fuel types,absolute-cost-logit -trn_pass_road_LDV_4W,Compact Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_pass_road_LDV_4W,Large Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_pass_road_LDV_4W,Large Car and SUV,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_pass_road_LDV_4W,Light Truck and SUV,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_pass_road_LDV_4W,Midsize Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_pass_road_LDV_4W,Mini Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_pass_road_LDV_4W,Multipurpose Vehicle,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_pass_road_LDV_4W,Subcompact Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_pass_road_LDV_4W,Van,-8,Fuel types and ICE efficiency levels,absolute-cost-logit -trn_shipping_intl,International Ship,-6,,absolute-cost-logit -# Passthrough tranSubsectors are listed below,,,,absolute-cost-logit -trn_pass,road,-6,,absolute-cost-logit -trn_pass_road,LDV,-6,,absolute-cost-logit -trn_pass_road,bus,-6,,absolute-cost-logit -trn_pass_road_LDV,4W,-6,,absolute-cost-logit -trn_pass_road_LDV,2W,-6,,absolute-cost-logit +# Transportation default subsector logit exponents,,,, +supplysector,tranSubsector,logit.exponent,logit.factor,logit.type +trn_aviation_intl,International Aviation,-6,,absolute-cost-logit +trn_freight,Domestic Ship,-6,,absolute-cost-logit +trn_freight,Freight Rail,-1,Fuel types and efficiency levels,absolute-cost-logit +trn_freight_road,3W Rural,-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck,-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (>12t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (>14t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (>15t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (>32t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-1t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-2.7t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-2t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-3.5t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-4.5t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (0-6t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (1-6t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (16-32t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (2-5t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (2.7-4.5t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (3.5-16t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (4.5-12t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (4.5-15t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (5-9t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (6-14t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (6-15t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (6-30t),-8,Fuel types,absolute-cost-logit +trn_freight_road,Truck (9-16t),-8,Fuel types,absolute-cost-logit +trn_pass,Cycle,-6,,absolute-cost-logit +trn_pass,Domestic Aviation,-6,,absolute-cost-logit +trn_pass,HSR,-6,,absolute-cost-logit +trn_pass,Passenger Rail,-1,Fuel types and efficiency levels,absolute-cost-logit +trn_pass,Walk,-6,,absolute-cost-logit +trn_pass_road,Bus,-3,Fuel types,absolute-cost-logit +trn_pass_road_bus,Heavy Bus,-3,Fuel types,absolute-cost-logit +trn_pass_road_bus,Light Bus,-3,Fuel types,absolute-cost-logit +trn_pass_road_LDV,Three-Wheeler,-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Moped,-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Motorcycle (>250cc),-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Motorcycle (50-250cc),-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Motorcycle (50-250cc),-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_2W,Scooter,-8,Fuel types,absolute-cost-logit +trn_pass_road_LDV_4W,Compact Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Large Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Large Car and SUV,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Light Truck and SUV,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Midsize Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Mini Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Multipurpose Vehicle,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Subcompact Car,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_pass_road_LDV_4W,Van,-8,Fuel types and ICE efficiency levels,absolute-cost-logit +trn_shipping_intl,International Ship,-6,,absolute-cost-logit +# Passthrough tranSubsectors are listed below,,,,absolute-cost-logit +trn_pass,road,-6,,absolute-cost-logit +trn_pass_road,LDV,-6,,absolute-cost-logit +trn_pass_road,bus,-6,,absolute-cost-logit +trn_pass_road_LDV,4W,-6,,absolute-cost-logit +trn_pass_road_LDV,2W,-6,,absolute-cost-logit trn_freight,road,-6,,absolute-cost-logit \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_shrwt.csv index 3879d8f1d9..9cb6935220 100644 --- a/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A54.tranSubsector_shrwt.csv @@ -1 +1,61 @@ -# Transportation default subsector shareweights,,,, supplysector,tranSubsector,year.fillout,year,share.weight trn_aviation_intl,International Aviation,start-year,,1 trn_freight,Domestic Ship,start-year,,1 trn_freight,Freight Rail,start-year,,1 trn_freight_road,3W Rural,start-year,,1 trn_freight_road,Truck,start-year,,1 trn_freight_road,Truck (>12t),start-year,,1 trn_freight_road,Truck (>14t),start-year,,1 trn_freight_road,Truck (>15t),start-year,,1 trn_freight_road,Truck (>32t),start-year,,1 trn_freight_road,Truck (0-1t),start-year,,1 trn_freight_road,Truck (0-2.7t),start-year,,1 trn_freight_road,Truck (0-2t),start-year,,1 trn_freight_road,Truck (0-3.5t),start-year,,1 trn_freight_road,Truck (0-4.5t),start-year,,1 trn_freight_road,Truck (0-6t),start-year,,1 trn_freight_road,Truck (1-6t),start-year,,1 trn_freight_road,Truck (16-32t),start-year,,1 trn_freight_road,Truck (2-5t),start-year,,1 trn_freight_road,Truck (2.7-4.5t),start-year,,1 trn_freight_road,Truck (3.5-16t),start-year,,1 trn_freight_road,Truck (4.5-12t),start-year,,1 trn_freight_road,Truck (4.5-15t),start-year,,1 trn_freight_road,Truck (5-9t),start-year,,1 trn_freight_road,Truck (6-14t),start-year,,1 trn_freight_road,Truck (6-15t),start-year,,1 trn_freight_road,Truck (6-30t),start-year,,1 trn_freight_road,Truck (9-16t),start-year,,1 trn_pass,Cycle,start-year,,1 trn_pass,Domestic Aviation,start-year,,1 trn_pass,HSR,,final-calibration-year,0 trn_pass,HSR,initial-future-year,,0.001 trn_pass,Passenger Rail,start-year,,1 trn_pass,Walk,start-year,,1 trn_pass_road,Bus,start-year,,1 trn_pass_road_bus,Heavy Bus,start-year,,1 trn_pass_road_bus,Light Bus,start-year,,1 trn_pass_road_LDV,Three-Wheeler,start-year,,1 trn_pass_road_LDV_2W,Moped,start-year,,1 trn_pass_road_LDV_2W,Motorcycle (>250cc),start-year,,1 trn_pass_road_LDV_2W,Motorcycle (50-250cc),start-year,,1 trn_pass_road_LDV_2W,Motorcycle (50-250cc),start-year,,1 trn_pass_road_LDV_2W,Scooter,start-year,,1 trn_pass_road_LDV_4W,Compact Car,start-year,,1 trn_pass_road_LDV_4W,Large Car,start-year,,1 trn_pass_road_LDV_4W,Large Car and SUV,start-year,,1 trn_pass_road_LDV_4W,Light Truck and SUV,start-year,,1 trn_pass_road_LDV_4W,Midsize Car,start-year,,1 trn_pass_road_LDV_4W,Mini Car,start-year,,1 trn_pass_road_LDV_4W,Multipurpose Vehicle,start-year,,1 trn_pass_road_LDV_4W,Subcompact Car,start-year,,1 trn_pass_road_LDV_4W,Van,start-year,,1 trn_shipping_intl,International Ship,start-year,,1 # Passthrough tranSubsectors are listed below,,,, trn_pass,road,start-year,,1 trn_pass_road,LDV,start-year,,1 trn_pass_road,bus,start-year,,1 trn_pass_road_LDV,4W,start-year,,1 trn_pass_road_LDV,2W,start-year,,1 trn_freight,road,start-year,,1 \ No newline at end of file +# Transportation default subsector shareweights,,,, +supplysector,tranSubsector,year.fillout,year,share.weight +trn_aviation_intl,International Aviation,start-year,,1 +trn_freight,Domestic Ship,start-year,,1 +trn_freight,Freight Rail,start-year,,1 +trn_freight_road,3W Rural,start-year,,1 +trn_freight_road,Truck,start-year,,1 +trn_freight_road,Truck (>12t),start-year,,1 +trn_freight_road,Truck (>14t),start-year,,1 +trn_freight_road,Truck (>15t),start-year,,1 +trn_freight_road,Truck (>32t),start-year,,1 +trn_freight_road,Truck (0-1t),start-year,,1 +trn_freight_road,Truck (0-2.7t),start-year,,1 +trn_freight_road,Truck (0-2t),start-year,,1 +trn_freight_road,Truck (0-3.5t),start-year,,1 +trn_freight_road,Truck (0-4.5t),start-year,,1 +trn_freight_road,Truck (0-6t),start-year,,1 +trn_freight_road,Truck (1-6t),start-year,,1 +trn_freight_road,Truck (16-32t),start-year,,1 +trn_freight_road,Truck (2-5t),start-year,,1 +trn_freight_road,Truck (2.7-4.5t),start-year,,1 +trn_freight_road,Truck (3.5-16t),start-year,,1 +trn_freight_road,Truck (4.5-12t),start-year,,1 +trn_freight_road,Truck (4.5-15t),start-year,,1 +trn_freight_road,Truck (5-9t),start-year,,1 +trn_freight_road,Truck (6-14t),start-year,,1 +trn_freight_road,Truck (6-15t),start-year,,1 +trn_freight_road,Truck (6-30t),start-year,,1 +trn_freight_road,Truck (9-16t),start-year,,1 +trn_pass,Cycle,start-year,,1 +trn_pass,Domestic Aviation,start-year,,1 +trn_pass,HSR,,final-calibration-year,0 +trn_pass,HSR,initial-future-year,,0.001 +trn_pass,Passenger Rail,start-year,,1 +trn_pass,Walk,start-year,,1 +trn_pass_road,Bus,start-year,,1 +trn_pass_road_bus,Heavy Bus,start-year,,1 +trn_pass_road_bus,Light Bus,start-year,,1 +trn_pass_road_LDV,Three-Wheeler,start-year,,1 +trn_pass_road_LDV_2W,Moped,start-year,,1 +trn_pass_road_LDV_2W,Motorcycle (>250cc),start-year,,1 +trn_pass_road_LDV_2W,Motorcycle (50-250cc),start-year,,1 +trn_pass_road_LDV_2W,Motorcycle (50-250cc),start-year,,1 +trn_pass_road_LDV_2W,Scooter,start-year,,1 +trn_pass_road_LDV_4W,Compact Car,start-year,,1 +trn_pass_road_LDV_4W,Large Car,start-year,,1 +trn_pass_road_LDV_4W,Large Car and SUV,start-year,,1 +trn_pass_road_LDV_4W,Light Truck and SUV,start-year,,1 +trn_pass_road_LDV_4W,Midsize Car,start-year,,1 +trn_pass_road_LDV_4W,Mini Car,start-year,,1 +trn_pass_road_LDV_4W,Multipurpose Vehicle,start-year,,1 +trn_pass_road_LDV_4W,Subcompact Car,start-year,,1 +trn_pass_road_LDV_4W,Van,start-year,,1 +trn_shipping_intl,International Ship,start-year,,1 +# Passthrough tranSubsectors are listed below,,,, +trn_pass,road,start-year,,1 +trn_pass_road,LDV,start-year,,1 +trn_pass_road,bus,start-year,,1 +trn_pass_road_LDV,4W,start-year,,1 +trn_pass_road_LDV,2W,start-year,,1 +trn_freight,road,start-year,,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A61.Cstorage_curves.csv b/input/gcam-data-system/energy-data/assumptions/A61.Cstorage_curves.csv index 3ee18c6df0..e06f8223e0 100644 --- a/input/gcam-data-system/energy-data/assumptions/A61.Cstorage_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A61.Cstorage_curves.csv @@ -1 +1,8 @@ -# Carbon storage resource supply curve points,,,, resource,subresource,grade,fraction,cost_2005USDtCO2 onshore carbon-storage,onshore carbon-storage,grade 1,0,0 onshore carbon-storage,onshore carbon-storage,grade 2,0.005,0.1 onshore carbon-storage,onshore carbon-storage,grade 3,0.1,5 onshore carbon-storage,onshore carbon-storage,grade 4,0.6,10 onshore carbon-storage,onshore carbon-storage,grade 5,0.295,75 onshore carbon-storage,onshore carbon-storage,grade 6,0,3500 \ No newline at end of file +# Carbon storage resource supply curve points,,,, +resource,subresource,grade,fraction,cost_2005USDtCO2 +onshore carbon-storage,onshore carbon-storage,grade 1,0,0 +onshore carbon-storage,onshore carbon-storage,grade 2,0.005,0.1 +onshore carbon-storage,onshore carbon-storage,grade 3,0.1,5 +onshore carbon-storage,onshore carbon-storage,grade 4,0.6,10 +onshore carbon-storage,onshore carbon-storage,grade 5,0.295,75 +onshore carbon-storage,onshore carbon-storage,grade 6,0,3500 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A61.globaltech_coef.csv b/input/gcam-data-system/energy-data/assumptions/A61.globaltech_coef.csv index bca644d730..5590990612 100644 --- a/input/gcam-data-system/energy-data/assumptions/A61.globaltech_coef.csv +++ b/input/gcam-data-system/energy-data/assumptions/A61.globaltech_coef.csv @@ -1 +1,4 @@ -# Carbon storage global technology coefficient,,,,, supplysector,subsector,technology,minicam.energy.input,1971,2100 carbon-storage,onshore carbon-storage,onshore carbon-storage,onshore carbon-storage,1,1 carbon-storage,offshore carbon-storage,offshore carbon-storage,offshore carbon-storage,1,1 \ No newline at end of file +# Carbon storage global technology coefficient,,,,, +supplysector,subsector,technology,minicam.energy.input,1971,2100 +carbon-storage,onshore carbon-storage,onshore carbon-storage,onshore carbon-storage,1,1 +carbon-storage,offshore carbon-storage,offshore carbon-storage,offshore carbon-storage,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A61.globaltech_cost.csv b/input/gcam-data-system/energy-data/assumptions/A61.globaltech_cost.csv index 1daacd135b..a45d3a928d 100644 --- a/input/gcam-data-system/energy-data/assumptions/A61.globaltech_cost.csv +++ b/input/gcam-data-system/energy-data/assumptions/A61.globaltech_cost.csv @@ -1 +1,4 @@ -# Carbon storage offshore storage cost,,,,, #Source: Decarre 2010. $32/tCO2. Converted to 1975$ and multiplied by 3 to be conservative and then by 0.8 to scale back,,,,, supplysector,subsector,technology,minicam.non.energy.input,1971,2100 carbon-storage,offshore carbon-storage,offshore carbon-storage,non-energy,211,211 \ No newline at end of file +# Carbon storage offshore storage cost,,,,, +#Source: Decarre 2010. $32/tCO2. Converted to 1975$ and multiplied by 3 to be conservative and then by 0.8 to scale back,,,,, +supplysector,subsector,technology,minicam.non.energy.input,1971,2100 +carbon-storage,offshore carbon-storage,offshore carbon-storage,non-energy,211,211 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A61.globaltech_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A61.globaltech_shrwt.csv index a1938632e3..296abba70a 100644 --- a/input/gcam-data-system/energy-data/assumptions/A61.globaltech_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A61.globaltech_shrwt.csv @@ -1 +1,4 @@ -# Carbon storage technology shareweight,,,, supplysector,subsector,technology,1971,2100 carbon-storage,onshore carbon-storage,onshore carbon-storage,1,1 carbon-storage,offshore carbon-storage,offshore carbon-storage,1,1 \ No newline at end of file +# Carbon storage technology shareweight,,,, +supplysector,subsector,technology,1971,2100 +carbon-storage,onshore carbon-storage,onshore carbon-storage,1,1 +carbon-storage,offshore carbon-storage,offshore carbon-storage,1,1 \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A61.rsrc_info.csv b/input/gcam-data-system/energy-data/assumptions/A61.rsrc_info.csv index dfb88ed909..a6f87f0998 100644 --- a/input/gcam-data-system/energy-data/assumptions/A61.rsrc_info.csv +++ b/input/gcam-data-system/energy-data/assumptions/A61.rsrc_info.csv @@ -1 +1,4 @@ -# Carbon storage resource info,,,,,, resource,resource_type,market,output-unit,price-unit,capacity.factor,subresource offshore carbon-storage,unlimited-resource,global,MtC,1990$/tC,0, onshore carbon-storage,depresource,regional,MtC,1990$/tC,,onshore carbon-storage \ No newline at end of file +# Carbon storage resource info,,,,,, +resource,resource_type,market,output-unit,price-unit,capacity.factor,subresource +offshore carbon-storage,unlimited-resource,global,MtC,1990$/tC,0, +onshore carbon-storage,depresource,regional,MtC,1990$/tC,,onshore carbon-storage \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A61.sector.csv b/input/gcam-data-system/energy-data/assumptions/A61.sector.csv index 9959d38770..9479a623ff 100644 --- a/input/gcam-data-system/energy-data/assumptions/A61.sector.csv +++ b/input/gcam-data-system/energy-data/assumptions/A61.sector.csv @@ -1 +1,3 @@ -# Carbon storage supplysector info,,,,, supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type carbon-storage,MtC,MtC,1990$/tC,-6, \ No newline at end of file +# Carbon storage supplysector info,,,,, +supplysector,output.unit,input.unit,price.unit,logit.exponent,logit.type +carbon-storage,MtC,MtC,1990$/tC,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A61.subsector_logit.csv b/input/gcam-data-system/energy-data/assumptions/A61.subsector_logit.csv index c138ef8fa2..baf75937ce 100644 --- a/input/gcam-data-system/energy-data/assumptions/A61.subsector_logit.csv +++ b/input/gcam-data-system/energy-data/assumptions/A61.subsector_logit.csv @@ -1 +1,4 @@ -# Carbon storage subsector logit exponents,,, supplysector,subsector,logit.exponent,logit.type carbon-storage,onshore carbon-storage,-6, carbon-storage,offshore carbon-storage,-6, \ No newline at end of file +# Carbon storage subsector logit exponents,,, +supplysector,subsector,logit.exponent,logit.type +carbon-storage,onshore carbon-storage,-6, +carbon-storage,offshore carbon-storage,-6, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A61.subsector_shrwt.csv b/input/gcam-data-system/energy-data/assumptions/A61.subsector_shrwt.csv index a901238ca0..e8752accf6 100644 --- a/input/gcam-data-system/energy-data/assumptions/A61.subsector_shrwt.csv +++ b/input/gcam-data-system/energy-data/assumptions/A61.subsector_shrwt.csv @@ -1 +1,4 @@ -# Carbon storage subsector shareweights,,,, supplysector,subsector,year.fillout,share.weight,logit.type carbon-storage,onshore carbon-storage,start-year,1, carbon-storage,offshore carbon-storage,start-year,1, \ No newline at end of file +# Carbon storage subsector shareweights,,,, +supplysector,subsector,year.fillout,share.weight,logit.type +carbon-storage,onshore carbon-storage,start-year,1, +carbon-storage,offshore carbon-storage,start-year,1, \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A_regions.csv b/input/gcam-data-system/energy-data/assumptions/A_regions.csv index 68826509c6..11c35cd425 100644 --- a/input/gcam-data-system/energy-data/assumptions/A_regions.csv +++ b/input/gcam-data-system/energy-data/assumptions/A_regions.csv @@ -1 +1,34 @@ -# Description: Specifies region-specific assumptions in the energy system,,,,,,,, GCAM_region_ID,region,tradbio_region,ethanol,biodiesel,biomassOil_tech,elect_td_techchange,heat,region.class 1,USA,0,corn ethanol,biodiesel,OilCrop,0.0001,0,A 2,Africa_Eastern,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 3,Africa_Northern,1,cellulosic ethanol,FT biofuels,biomassOil,0.00025,0,E 4,Africa_Southern,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 5,Africa_Western,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 6,Australia_NZ,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,B 7,Brazil,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D 8,Canada,0,corn ethanol,biodiesel,OilCrop,0.0001,0,B 9,Central America and Caribbean,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D 10,Central Asia,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D 11,China,1,corn ethanol,biodiesel,OilCrop,0.0001,1,D 12,EU-12,0,corn ethanol,biodiesel,OilCrop,0.0001,1,C 13,EU-15,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C 14,Europe_Eastern,0,corn ethanol,biodiesel,OilCrop,0.0002,1,D 15,Europe_Non_EU,0,corn ethanol,biodiesel,OilCrop,0.0002,1,C 16,European Free Trade Association,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C 17,India,1,cellulosic ethanol,FT biofuels,biomassOil,0.002,0,E 18,Indonesia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E 19,Japan,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D 20,Mexico,1,cellulosic ethanol,biodiesel,OilCrop,0.00075,0,D 21,Middle East,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,0,D 22,Pakistan,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 23,Russia,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,1,D 24,South Africa,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 25,South America_Northern,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D 26,South America_Southern,1,corn ethanol,biodiesel,OilCrop,0.00075,0,D 27,South Asia,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 28,South Korea,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,D 29,Southeast Asia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E 30,Taiwan,0,cellulosic ethanol,FT biofuels,,0.0001,0,D 31,Argentina,1,corn ethanol,biodiesel,OilCrop,0.00075,0,D 32,Colombia,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D \ No newline at end of file +# Description: Specifies region-specific assumptions in the energy system,,,,,,,, +GCAM_region_ID,region,tradbio_region,ethanol,biodiesel,biomassOil_tech,elect_td_techchange,heat,region.class +1,USA,0,corn ethanol,biodiesel,OilCrop,0.0001,0,A +2,Africa_Eastern,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +3,Africa_Northern,1,cellulosic ethanol,FT biofuels,biomassOil,0.00025,0,E +4,Africa_Southern,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +5,Africa_Western,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +6,Australia_NZ,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,B +7,Brazil,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D +8,Canada,0,corn ethanol,biodiesel,OilCrop,0.0001,0,B +9,Central America and Caribbean,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D +10,Central Asia,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D +11,China,1,corn ethanol,biodiesel,OilCrop,0.0001,1,D +12,EU-12,0,corn ethanol,biodiesel,OilCrop,0.0001,1,C +13,EU-15,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C +14,Europe_Eastern,0,corn ethanol,biodiesel,OilCrop,0.0002,1,D +15,Europe_Non_EU,0,corn ethanol,biodiesel,OilCrop,0.0002,1,C +16,European Free Trade Association,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C +17,India,1,cellulosic ethanol,FT biofuels,biomassOil,0.002,0,E +18,Indonesia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E +19,Japan,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D +20,Mexico,1,cellulosic ethanol,biodiesel,OilCrop,0.00075,0,D +21,Middle East,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,0,D +22,Pakistan,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +23,Russia,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,1,D +24,South Africa,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +25,South America_Northern,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D +26,South America_Southern,1,corn ethanol,biodiesel,OilCrop,0.00075,0,D +27,South Asia,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +28,South Korea,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,D +29,Southeast Asia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E +30,Taiwan,0,cellulosic ethanol,FT biofuels,,0.0001,0,D +31,Argentina,1,corn ethanol,biodiesel,OilCrop,0.00075,0,D +32,Colombia,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A_regions_14reg.csv b/input/gcam-data-system/energy-data/assumptions/A_regions_14reg.csv index c075f3e06d..da84f8cdb3 100644 --- a/input/gcam-data-system/energy-data/assumptions/A_regions_14reg.csv +++ b/input/gcam-data-system/energy-data/assumptions/A_regions_14reg.csv @@ -1 +1,16 @@ -# Description: Specifies region-specific assumptions in the energy system,,,,,,,, GCAM_region_ID,region,tradbio_region,ethanol,biodiesel,biomassOil_tech,elect_td_techchange,heat,region.class 1,USA,0,corn ethanol,biodiesel,OilCrop,0.0001,0,A 2,Canada,0,corn ethanol,biodiesel,OilCrop,0.0001,0,B 3,Western Europe,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C 4,Japan,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D 5,Australia_NZ,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,B 6,Former Soviet Union,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,1,D 7,China,1,corn ethanol,biodiesel,OilCrop,0.0001,1,D 8,Middle East,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,0,D 9,Africa,1,cellulosic ethanol,FT biofuels,biomassOil,0.00025,0,E 10,Latin America,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D 11,Southeast Asia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E 12,Eastern Europe,0,corn ethanol,biodiesel,OilCrop,0.0002,1,D 13,Korea,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,D 14,India,1,cellulosic ethanol,FT biofuels,biomassOil,0.002,0,E \ No newline at end of file +# Description: Specifies region-specific assumptions in the energy system,,,,,,,, +GCAM_region_ID,region,tradbio_region,ethanol,biodiesel,biomassOil_tech,elect_td_techchange,heat,region.class +1,USA,0,corn ethanol,biodiesel,OilCrop,0.0001,0,A +2,Canada,0,corn ethanol,biodiesel,OilCrop,0.0001,0,B +3,Western Europe,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C +4,Japan,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D +5,Australia_NZ,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,B +6,Former Soviet Union,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,1,D +7,China,1,corn ethanol,biodiesel,OilCrop,0.0001,1,D +8,Middle East,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,0,D +9,Africa,1,cellulosic ethanol,FT biofuels,biomassOil,0.00025,0,E +10,Latin America,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D +11,Southeast Asia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E +12,Eastern Europe,0,corn ethanol,biodiesel,OilCrop,0.0002,1,D +13,Korea,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,D +14,India,1,cellulosic ethanol,FT biofuels,biomassOil,0.002,0,E \ No newline at end of file diff --git a/input/gcam-data-system/energy-data/assumptions/A_regions_32reg.csv b/input/gcam-data-system/energy-data/assumptions/A_regions_32reg.csv index 68826509c6..11c35cd425 100644 --- a/input/gcam-data-system/energy-data/assumptions/A_regions_32reg.csv +++ b/input/gcam-data-system/energy-data/assumptions/A_regions_32reg.csv @@ -1 +1,34 @@ -# Description: Specifies region-specific assumptions in the energy system,,,,,,,, GCAM_region_ID,region,tradbio_region,ethanol,biodiesel,biomassOil_tech,elect_td_techchange,heat,region.class 1,USA,0,corn ethanol,biodiesel,OilCrop,0.0001,0,A 2,Africa_Eastern,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 3,Africa_Northern,1,cellulosic ethanol,FT biofuels,biomassOil,0.00025,0,E 4,Africa_Southern,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 5,Africa_Western,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 6,Australia_NZ,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,B 7,Brazil,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D 8,Canada,0,corn ethanol,biodiesel,OilCrop,0.0001,0,B 9,Central America and Caribbean,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D 10,Central Asia,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D 11,China,1,corn ethanol,biodiesel,OilCrop,0.0001,1,D 12,EU-12,0,corn ethanol,biodiesel,OilCrop,0.0001,1,C 13,EU-15,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C 14,Europe_Eastern,0,corn ethanol,biodiesel,OilCrop,0.0002,1,D 15,Europe_Non_EU,0,corn ethanol,biodiesel,OilCrop,0.0002,1,C 16,European Free Trade Association,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C 17,India,1,cellulosic ethanol,FT biofuels,biomassOil,0.002,0,E 18,Indonesia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E 19,Japan,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D 20,Mexico,1,cellulosic ethanol,biodiesel,OilCrop,0.00075,0,D 21,Middle East,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,0,D 22,Pakistan,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 23,Russia,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,1,D 24,South Africa,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 25,South America_Northern,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D 26,South America_Southern,1,corn ethanol,biodiesel,OilCrop,0.00075,0,D 27,South Asia,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E 28,South Korea,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,D 29,Southeast Asia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E 30,Taiwan,0,cellulosic ethanol,FT biofuels,,0.0001,0,D 31,Argentina,1,corn ethanol,biodiesel,OilCrop,0.00075,0,D 32,Colombia,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D \ No newline at end of file +# Description: Specifies region-specific assumptions in the energy system,,,,,,,, +GCAM_region_ID,region,tradbio_region,ethanol,biodiesel,biomassOil_tech,elect_td_techchange,heat,region.class +1,USA,0,corn ethanol,biodiesel,OilCrop,0.0001,0,A +2,Africa_Eastern,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +3,Africa_Northern,1,cellulosic ethanol,FT biofuels,biomassOil,0.00025,0,E +4,Africa_Southern,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +5,Africa_Western,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +6,Australia_NZ,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,B +7,Brazil,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D +8,Canada,0,corn ethanol,biodiesel,OilCrop,0.0001,0,B +9,Central America and Caribbean,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D +10,Central Asia,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D +11,China,1,corn ethanol,biodiesel,OilCrop,0.0001,1,D +12,EU-12,0,corn ethanol,biodiesel,OilCrop,0.0001,1,C +13,EU-15,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C +14,Europe_Eastern,0,corn ethanol,biodiesel,OilCrop,0.0002,1,D +15,Europe_Non_EU,0,corn ethanol,biodiesel,OilCrop,0.0002,1,C +16,European Free Trade Association,0,corn ethanol,biodiesel,OilCrop,0.0001,0,C +17,India,1,cellulosic ethanol,FT biofuels,biomassOil,0.002,0,E +18,Indonesia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E +19,Japan,0,cellulosic ethanol,FT biofuels,OilCrop,0.0001,0,D +20,Mexico,1,cellulosic ethanol,biodiesel,OilCrop,0.00075,0,D +21,Middle East,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,0,D +22,Pakistan,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +23,Russia,0,cellulosic ethanol,FT biofuels,OilCrop,0.0004,1,D +24,South Africa,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +25,South America_Northern,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D +26,South America_Southern,1,corn ethanol,biodiesel,OilCrop,0.00075,0,D +27,South Asia,1,cellulosic ethanol,FT biofuels,OilCrop,0.00025,0,E +28,South Korea,0,cellulosic ethanol,biodiesel,OilCrop,0.0001,0,D +29,Southeast Asia,1,sugar cane ethanol,biodiesel,PalmFruit,0.00025,0,E +30,Taiwan,0,cellulosic ethanol,FT biofuels,,0.0001,0,D +31,Argentina,1,corn ethanol,biodiesel,OilCrop,0.00075,0,D +32,Colombia,1,sugar cane ethanol,biodiesel,OilCrop,0.00075,0,D \ No newline at end of file From 28021bb420154b2cb11f503c958197030c001cb3 Mon Sep 17 00:00:00 2001 From: Robert Link Date: Thu, 5 Oct 2017 13:52:53 -0700 Subject: [PATCH 11/22] Expand the range of price in unconventional oil supply curves. The old curves had a massive amount of unconventional oil coming online in a very small price range. Apart from causing solution problems, this also didn't seem very realistic. We've left the bottom of the supply curve the same as it was, but we've expanded the range by a factor of 5, which should result in smoother introduction of unconventional oil into the scenario and fewer solution problems. --- .../assumptions/A11.fos_curves.csv | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/input/gcam-data-system/energy-data/assumptions/A11.fos_curves.csv b/input/gcam-data-system/energy-data/assumptions/A11.fos_curves.csv index ed3b9772cd..9ea85051f9 100644 --- a/input/gcam-data-system/energy-data/assumptions/A11.fos_curves.csv +++ b/input/gcam-data-system/energy-data/assumptions/A11.fos_curves.csv @@ -309,58 +309,58 @@ Western Europe,natural gas,natural gas,grade 6,714,3.7 Western Europe,natural gas,natural gas,grade 7,8560,6.5 Western Europe,natural gas,natural gas,grade 8,0,6.6 Africa,unconventional oil,unconventional oil,grade 1,503,1.8 -Africa,unconventional oil,unconventional oil,grade 2,983,2.1 -Africa,unconventional oil,unconventional oil,grade 3,267.48,3.6 -Africa,unconventional oil,unconventional oil,grade 4,0,4.7 +Africa,unconventional oil,unconventional oil,grade 2,983,3.3 +Africa,unconventional oil,unconventional oil,grade 3,267.48,10.8 +Africa,unconventional oil,unconventional oil,grade 4,0,16.3 Australia_NZ,unconventional oil,unconventional oil,grade 1,1320,1.8 -Australia_NZ,unconventional oil,unconventional oil,grade 2,2578,2.1 -Australia_NZ,unconventional oil,unconventional oil,grade 3,701.64,3.6 -Australia_NZ,unconventional oil,unconventional oil,grade 4,0,4.7 +Australia_NZ,unconventional oil,unconventional oil,grade 2,2578,3.3 +Australia_NZ,unconventional oil,unconventional oil,grade 3,701.64,10.8 +Australia_NZ,unconventional oil,unconventional oil,grade 4,0,16.3 Canada,unconventional oil,unconventional oil,grade 1,803,1.8 -Canada,unconventional oil,unconventional oil,grade 2,1570,2.1 -Canada,unconventional oil,unconventional oil,grade 3,427.14,3.6 -Canada,unconventional oil,unconventional oil,grade 4,0,4.7 +Canada,unconventional oil,unconventional oil,grade 2,1570,3.3 +Canada,unconventional oil,unconventional oil,grade 3,427.14,10.8 +Canada,unconventional oil,unconventional oil,grade 4,0,16.3 China,unconventional oil,unconventional oil,grade 1,2012,1.8 -China,unconventional oil,unconventional oil,grade 2,3933,2.1 -China,unconventional oil,unconventional oil,grade 3,1070.1,3.6 -China,unconventional oil,unconventional oil,grade 4,0,4.7 +China,unconventional oil,unconventional oil,grade 2,3933,3.3 +China,unconventional oil,unconventional oil,grade 3,1070.1,10.8 +China,unconventional oil,unconventional oil,grade 4,0,16.3 Eastern Europe,unconventional oil,unconventional oil,grade 1,151,1.8 -Eastern Europe,unconventional oil,unconventional oil,grade 2,295,2.1 -Eastern Europe,unconventional oil,unconventional oil,grade 3,80.28,3.6 -Eastern Europe,unconventional oil,unconventional oil,grade 4,0,4.7 +Eastern Europe,unconventional oil,unconventional oil,grade 2,295,3.3 +Eastern Europe,unconventional oil,unconventional oil,grade 3,80.28,10.8 +Eastern Europe,unconventional oil,unconventional oil,grade 4,0,16.3 Former Soviet Union,unconventional oil,unconventional oil,grade 1,3874,1.8 -Former Soviet Union,unconventional oil,unconventional oil,grade 2,7575,2.1 -Former Soviet Union,unconventional oil,unconventional oil,grade 3,2060.82,3.6 -Former Soviet Union,unconventional oil,unconventional oil,grade 4,0,4.7 +Former Soviet Union,unconventional oil,unconventional oil,grade 2,7575,3.3 +Former Soviet Union,unconventional oil,unconventional oil,grade 3,2060.82,10.8 +Former Soviet Union,unconventional oil,unconventional oil,grade 4,0,16.3 India,unconventional oil,unconventional oil,grade 1,1509,1.8 -India,unconventional oil,unconventional oil,grade 2,2950,2.1 -India,unconventional oil,unconventional oil,grade 3,802.62,3.6 -India,unconventional oil,unconventional oil,grade 4,0,4.7 +India,unconventional oil,unconventional oil,grade 2,2950,3.3 +India,unconventional oil,unconventional oil,grade 3,802.62,10.8 +India,unconventional oil,unconventional oil,grade 4,0,16.3 Japan,unconventional oil,unconventional oil,grade 1,146,1.8 -Japan,unconventional oil,unconventional oil,grade 2,287,2.1 -Japan,unconventional oil,unconventional oil,grade 3,77.94,3.6 -Japan,unconventional oil,unconventional oil,grade 4,0,4.7 +Japan,unconventional oil,unconventional oil,grade 2,287,3.3 +Japan,unconventional oil,unconventional oil,grade 3,77.94,10.8 +Japan,unconventional oil,unconventional oil,grade 4,0,16.3 Korea,unconventional oil,unconventional oil,grade 1,0,1.8 -Korea,unconventional oil,unconventional oil,grade 2,0,2.1 -Korea,unconventional oil,unconventional oil,grade 3,0,3.6 -Korea,unconventional oil,unconventional oil,grade 4,0,4.7 +Korea,unconventional oil,unconventional oil,grade 2,0,3.3 +Korea,unconventional oil,unconventional oil,grade 3,0,10.8 +Korea,unconventional oil,unconventional oil,grade 4,0,16.3 Latin America,unconventional oil,unconventional oil,grade 1,3004,1.8 -Latin America,unconventional oil,unconventional oil,grade 2,5873,2.1 -Latin America,unconventional oil,unconventional oil,grade 3,1597.86,3.6 -Latin America,unconventional oil,unconventional oil,grade 4,0,4.7 +Latin America,unconventional oil,unconventional oil,grade 2,5873,3.3 +Latin America,unconventional oil,unconventional oil,grade 3,1597.86,10.8 +Latin America,unconventional oil,unconventional oil,grade 4,0,16.3 Middle East,unconventional oil,unconventional oil,grade 1,6009,1.8 -Middle East,unconventional oil,unconventional oil,grade 2,11745,2.1 -Middle East,unconventional oil,unconventional oil,grade 3,3195.72,3.6 -Middle East,unconventional oil,unconventional oil,grade 4,0,4.7 +Middle East,unconventional oil,unconventional oil,grade 2,11745,3.3 +Middle East,unconventional oil,unconventional oil,grade 3,3195.72,10.8 +Middle East,unconventional oil,unconventional oil,grade 4,0,16.3 Southeast Asia,unconventional oil,unconventional oil,grade 1,1509,1.8 -Southeast Asia,unconventional oil,unconventional oil,grade 2,2950,2.1 -Southeast Asia,unconventional oil,unconventional oil,grade 3,802.62,3.6 -Southeast Asia,unconventional oil,unconventional oil,grade 4,0,4.7 +Southeast Asia,unconventional oil,unconventional oil,grade 2,2950,3.3 +Southeast Asia,unconventional oil,unconventional oil,grade 3,802.62,10.8 +Southeast Asia,unconventional oil,unconventional oil,grade 4,0,16.3 USA,unconventional oil,unconventional oil,grade 1,4397,1.8 -USA,unconventional oil,unconventional oil,grade 2,8594,2.1 -USA,unconventional oil,unconventional oil,grade 3,2338.38,3.6 -USA,unconventional oil,unconventional oil,grade 4,0,4.7 +USA,unconventional oil,unconventional oil,grade 2,8594,3.3 +USA,unconventional oil,unconventional oil,grade 3,2338.38,10.8 +USA,unconventional oil,unconventional oil,grade 4,0,16.3 Western Europe,unconventional oil,unconventional oil,grade 1,1204,1.8 -Western Europe,unconventional oil,unconventional oil,grade 2,2355,2.1 -Western Europe,unconventional oil,unconventional oil,grade 3,640.62,3.6 -Western Europe,unconventional oil,unconventional oil,grade 4,0,4.7 \ No newline at end of file +Western Europe,unconventional oil,unconventional oil,grade 2,2355,3.3 +Western Europe,unconventional oil,unconventional oil,grade 3,640.62,10.8 +Western Europe,unconventional oil,unconventional oil,grade 4,0,16.3 From 1285b9321c8f5e59cc581e5a76abdeaf9f158071 Mon Sep 17 00:00:00 2001 From: Robert Link Date: Fri, 6 Oct 2017 05:34:38 -0700 Subject: [PATCH 12/22] Adjust solver config and remove obsolete config file. --- input/solution/cal_broyden_config.xml | 8 +- .../cal_solver_nrbacktrack_config.xml | 103 ------------------ 2 files changed, 4 insertions(+), 107 deletions(-) delete mode 100644 input/solution/cal_solver_nrbacktrack_config.xml diff --git a/input/solution/cal_broyden_config.xml b/input/solution/cal_broyden_config.xml index 4561f3fd9a..3a201054fe 100644 --- a/input/solution/cal_broyden_config.xml +++ b/input/solution/cal_broyden_config.xml @@ -65,20 +65,20 @@ - 0.001 + 0.01 0.0001 0.01 - 2500 + 5000 solvable && unsolved - 1.0e-4 + 1.0e-2 2 20 - 1.0e-4 + 5.0e-3 solvable-nr || (market-type="Tax" && solvable) diff --git a/input/solution/cal_solver_nrbacktrack_config.xml b/input/solution/cal_solver_nrbacktrack_config.xml deleted file mode 100644 index 4eac845b7a..0000000000 --- a/input/solution/cal_solver_nrbacktrack_config.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - 0.001 - 0.0001 - 0.01 - 500 - - 1.0 - 40 - 30 - unsolved && solvable && !(has-market-flag="fully-calibrated") - - - 50 - 1.0e-3 - solvable-nr && !(has-market-flag="fully-calibrated") - - - - 0.001 - 0.0001 - 0.01 - 2500 - - 1.0 - 40 - 30 - market-name="globalCO2" && solvable - - - 1.0 - 20 - 15 - unsolved && solvable - - - 25 - 1.0e-3 - - solvable-nr || (market-type="Tax" && solvable) - - - - - - 10 - - From f286fc5e9e410ade3ce40e840dd60363ef47219a Mon Sep 17 00:00:00 2001 From: Pralit Patel Date: Mon, 9 Oct 2017 17:28:02 -0400 Subject: [PATCH 13/22] Changes to help the negative net emissions contraints solve better --- cvs/objects/functions/include/ctax_input.h | 162 ++++++++++ cvs/objects/functions/include/input_tax.h | 4 - cvs/objects/functions/source/ctax_input.cpp | 281 ++++++++++++++++++ cvs/objects/functions/source/input_tax.cpp | 49 ++- .../marketplace/source/marketplace.cpp | 3 + .../include/policy_portfolio_standard.h | 5 +- .../source/policy_portfolio_standard.cpp | 18 +- .../negative_emissions_final_demand.cpp | 2 +- .../solvers/source/preconditioner.cpp | 26 ++ .../technologies/source/input_factory.cpp | 7 + .../source/standard_capture_component.cpp | 2 +- input/solution/cal_broyden_config.xml | 17 +- 12 files changed, 532 insertions(+), 44 deletions(-) create mode 100644 cvs/objects/functions/include/ctax_input.h create mode 100644 cvs/objects/functions/source/ctax_input.cpp diff --git a/cvs/objects/functions/include/ctax_input.h b/cvs/objects/functions/include/ctax_input.h new file mode 100644 index 0000000000..c752e63df6 --- /dev/null +++ b/cvs/objects/functions/include/ctax_input.h @@ -0,0 +1,162 @@ +#ifndef _CTAX_INPUT_H_ +#define _CTAX_INPUT_H_ +#if defined(_MSC_VER) +#pragma once +#endif + +/* +* LEGAL NOTICE +* This computer software was prepared by Battelle Memorial Institute, +* hereinafter the Contractor, under Contract No. DE-AC05-76RL0 1830 +* with the Department of Energy (DOE). NEITHER THE GOVERNMENT NOR THE +* CONTRACTOR MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY +* LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this +* sentence must appear on any copies of this computer software. +* +* EXPORT CONTROL +* User agrees that the Software will not be shipped, transferred or +* exported into any country or used in any manner prohibited by the +* United States Export Administration Act or any other applicable +* export laws, restrictions or regulations (collectively the "Export Laws"). +* Export of the Software may require some form of license or other +* authority from the U.S. Government, and failure to obtain such +* export control license may result in criminal liability under +* U.S. laws. In addition, if the Software is identified as export controlled +* items under the Export Laws, User represents and warrants that User +* is not a citizen, or otherwise located within, an embargoed nation +* (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) +* and that User is not otherwise prohibited +* under the Export Laws from receiving the Software. +* +* Copyright 2011 Battelle Memorial Institute. All Rights Reserved. +* Distributed as open-source under the terms of the Educational Community +* License version 2.0 (ECL 2.0). http://www.opensource.org/licenses/ecl2.php +* +* For further details, see: http://www.globalchange.umd.edu/models/gcam/ +* +*/ + + +/*! + * \file ctax_input.h + * \ingroup Objects + * \brief CTaxInput class header file. + * \author Pralit Patel + */ + +#include +#include +#include "functions/include/minicam_input.h" +#include + +class Tabs; + +/*! + * \ingroup Objects + * \brief Defines a tax input which is applied relative to a carbon price. + * \details This class only applies some price of a policy that is related + * to the carbon price. It does not add to the supply or demand of + * any constraint. The intended use would be from something such as + * a constraint on net negative emisssions. + * + * XML specification for CTaxInput + * - XML name: \c ctax-input + * - Contained by: Technology + * - Parsing inherited from class: MiniCAMInput + * - Attributes: + * - \c name MiniCAMInput::mName + * - Elements: + * - \c mFuelName String indicating the name of the fuel to look up the + * carbon coefficient of. Generally the same as the fuel + * name of the primary input to the containing technology. + * + * \author Pralit Patel + */ +class CTaxInput: public MiniCAMInput +{ + friend class InputFactory; +public: + + CTaxInput(); + + virtual ~CTaxInput(); + + virtual CTaxInput* clone() const; + + static const std::string& getXMLNameStatic(); + + virtual const std::string& getXMLReportingName() const; + + virtual void XMLParse( const xercesc::DOMNode* aNode ); + + virtual bool isSameType( const std::string& aType ) const; + + virtual void toInputXML( std::ostream& aOut, + Tabs* aTabs ) const; + + virtual void toDebugXML( const int aPeriod, + std::ostream& aOut, + Tabs* aTabs ) const; + + virtual void copyParam( const IInput* aInput, + const int aPeriod ); + + virtual void completeInit( const std::string& aRegionName, + const std::string& aSectorName, + const std::string& aSubsectorName, + const std::string& aTechName, + const IInfo* aTechInfo ); + + virtual void initCalc( const std::string& aRegionName, + const std::string& aSectorName, + const bool aIsNewInvestmentPeriod, + const bool aIsTrade, + const IInfo* aTechInfo, + const int aPeriod ); + + virtual double getCO2EmissionsCoefficient( const std::string& aGHGName, + const int aPeriod ) const; + + virtual double getPhysicalDemand( const int aPeriod ) const; + + virtual double getCarbonContent( const int aPeriod ) const; + + virtual double getPrice( const std::string& aRegionName, + const int aPeriod ) const; + + virtual void setPrice( const std::string& aRegionName, + const double aPrice, + const int aPeriod ); + + virtual void setPhysicalDemand( const double aPhysicalDemand, + const std::string& aRegionName, + const int aPeriod ); + + virtual double getCoefficient( const int aPeriod ) const; + + virtual void setCoefficient( const double aCoefficient, + const int aPeriod ); + + virtual double getCalibrationQuantity( const int aPeriod ) const; + + virtual bool hasTypeFlag( const int aTypeFlag ) const; + + virtual double getIncomeElasticity( const int aPeriod ) const; + + virtual double getPriceElasticity( const int aPeriod ) const; + + virtual double getTechChange( const int aPeriod ) const; + +protected: + CTaxInput( const CTaxInput& aOther ); + + //! The name of the fuel to use to look up the C coef + //! typically the name of the primary input into the + //! containing technology + std::string mFuelName; + + //! The C coef associated with mFuelName + double mCachedCCoef; +}; + +#endif // _CTAX_INPUT_H_ diff --git a/cvs/objects/functions/include/input_tax.h b/cvs/objects/functions/include/input_tax.h index 1b25e3b7bc..8d512d360d 100644 --- a/cvs/objects/functions/include/input_tax.h +++ b/cvs/objects/functions/include/input_tax.h @@ -168,10 +168,6 @@ class InputTax: public MiniCAMInput //! State value necessary to use Marketpalce::addToDemand double mLastCalcValue; - - //! Boolean indicating whether we should add to demand. - bool mAddToDemand; - private: const static std::string XML_REPORTING_NAME; //!< tag name for reporting xml db diff --git a/cvs/objects/functions/source/ctax_input.cpp b/cvs/objects/functions/source/ctax_input.cpp new file mode 100644 index 0000000000..5948552afd --- /dev/null +++ b/cvs/objects/functions/source/ctax_input.cpp @@ -0,0 +1,281 @@ +/* +* LEGAL NOTICE +* This computer software was prepared by Battelle Memorial Institute, +* hereinafter the Contractor, under Contract No. DE-AC05-76RL0 1830 +* with the Department of Energy (DOE). NEITHER THE GOVERNMENT NOR THE +* CONTRACTOR MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY +* LIABILITY FOR THE USE OF THIS SOFTWARE. This notice including this +* sentence must appear on any copies of this computer software. +* +* EXPORT CONTROL +* User agrees that the Software will not be shipped, transferred or +* exported into any country or used in any manner prohibited by the +* United States Export Administration Act or any other applicable +* export laws, restrictions or regulations (collectively the "Export Laws"). +* Export of the Software may require some form of license or other +* authority from the U.S. Government, and failure to obtain such +* export control license may result in criminal liability under +* U.S. laws. In addition, if the Software is identified as export controlled +* items under the Export Laws, User represents and warrants that User +* is not a citizen, or otherwise located within, an embargoed nation +* (including without limitation Iran, Syria, Sudan, Cuba, and North Korea) +* and that User is not otherwise prohibited +* under the Export Laws from receiving the Software. +* +* Copyright 2011 Battelle Memorial Institute. All Rights Reserved. +* Distributed as open-source under the terms of the Educational Community +* License version 2.0 (ECL 2.0). http://www.opensource.org/licenses/ecl2.php +* +* For further details, see: http://www.globalchange.umd.edu/models/gcam/ +* +*/ + + +/*! + * \file ctax_input.cpp + * \ingroup Objects + * \brief The CTaxInput class source file. + * \author Pralit Patel + */ + +#include "util/base/include/definitions.h" +#include +#include +#include +#include + +#include "functions/include/ctax_input.h" +#include "containers/include/scenario.h" +#include "marketplace/include/marketplace.h" +#include "util/base/include/xml_helper.h" +#include "containers/include/market_dependency_finder.h" +#include "containers/include/iinfo.h" +#include "functions/include/function_utils.h" +#include "util/logger/include/ilogger.h" + +using namespace std; +using namespace xercesc; + +extern Scenario* scenario; + +/*! \brief Get the XML node name in static form for comparison when parsing XML. +* +* This public function accesses the private constant string, XML_NAME. This way +* the tag is always consistent for both read-in and output and can be easily +* changed. The "==" operator that is used when parsing, required this second +* function to return static. +* \note A function cannot be static and virtual. +* \author Sonny Kim +* \return The constant XML_NAME as a static. +*/ +const string& CTaxInput::getXMLNameStatic() { + const static string XML_NAME = "ctax-input"; + return XML_NAME; +} + +/*! \brief Get the XML name for reporting to XML file. +* +* This public function accesses the private constant string, XML_NAME. This way +* the tag is always consistent for reporting outputs and can be easily +* changed. +* \author Sonny Kim +* \return The constant XML_NAME. +*/ +const string& CTaxInput::getXMLReportingName() const{ + return getXMLNameStatic(); +} + +//! Constructor +CTaxInput::CTaxInput() +: mCachedCCoef( 0.0 ) +{ +} + +/*! + * \brief Destructor. + * \note An explicit constructor must be defined to avoid the compiler inlining + * it in the header file before the header file for the type contained in + * the auto_ptr is included. + */ +CTaxInput::~CTaxInput() { +} + +/*! + * \brief Copy constructor. + * \note This class requires a copy constructor because it has dynamically + * allocated memory. + * \param aOther tax input from which to copy. + */ +CTaxInput::CTaxInput( const CTaxInput& aOther ){ + mName = aOther.mName; + mFuelName = aOther.mFuelName; + mCachedCCoef = aOther.mCachedCCoef; +} + +CTaxInput* CTaxInput::clone() const { + return new CTaxInput( *this ); +} + +bool CTaxInput::isSameType( const string& aType ) const { + return aType == getXMLNameStatic(); +} + +void CTaxInput::XMLParse( const xercesc::DOMNode* aNode ) { + // TODO: Replace this with the restructured XMLParse. + // Make sure we were passed a valid node. + assert( aNode ); + + // get the name attribute. + mName = XMLHelper::getAttr( aNode, "name" ); + + // get all child nodes. + const DOMNodeList* nodeList = aNode->getChildNodes(); + + // loop through the child nodes. + for( unsigned int i = 0; i < nodeList->getLength(); i++ ){ + const DOMNode* curr = nodeList->item( i ); + if( curr->getNodeType() == DOMNode::TEXT_NODE ){ + continue; + } + + const string nodeName = XMLHelper::safeTranscode( curr->getNodeName() ); + + if( nodeName == "fuel-name" ){ + mFuelName = XMLHelper::getValue( curr ); + } + else { + ILogger& mainLog = ILogger::getLogger( "main_log" ); + mainLog.setLevel( ILogger::WARNING ); + mainLog << "Unrecognized text string: " << nodeName << " found while parsing " + << getXMLNameStatic() << "." << endl; + } + } +} + +void CTaxInput::toInputXML( ostream& aOut, + Tabs* aTabs ) const +{ + XMLWriteOpeningTag( getXMLNameStatic(), aOut, aTabs, mName ); + XMLWriteElement( mFuelName, "fuel-name", aOut, aTabs ); + XMLWriteClosingTag( getXMLNameStatic(), aOut, aTabs ); +} + +void CTaxInput::toDebugXML( const int aPeriod, + ostream& aOut, + Tabs* aTabs ) const +{ + XMLWriteOpeningTag ( getXMLNameStatic(), aOut, aTabs, mName ); + XMLWriteElement( mFuelName, "fuel-name", aOut, aTabs ); + XMLWriteElement( mCachedCCoef, "fuel-C-coef", aOut, aTabs ); + XMLWriteClosingTag( getXMLNameStatic(), aOut, aTabs ); +} + +void CTaxInput::completeInit( const string& aRegionName, + const string& aSectorName, + const string& aSubsectorName, + const string& aTechName, + const IInfo* aTechInfo ) +{ + + // Add the input dependency to the dependency finder. + scenario->getMarketplace()->getDependencyFinder()->addDependency( aSectorName, + aRegionName, + getName(), + aRegionName ); +} + +void CTaxInput::initCalc( const string& aRegionName, + const string& aSectorName, + const bool aIsNewInvestmentPeriod, + const bool aIsTrade, + const IInfo* aTechInfo, + const int aPeriod ) +{ + // There must be a valid region name. + assert( !aRegionName.empty() ); + mCachedCCoef = FunctionUtils::getCO2Coef( aRegionName, mFuelName, aPeriod ); +} + +void CTaxInput::copyParam( const IInput* aInput, + const int aPeriod ) +{ +} + +double CTaxInput::getCO2EmissionsCoefficient( const string& aGHGName, + const int aPeriod ) const +{ + // do not double account taxes on mFuelName + return 0; +} + +double CTaxInput::getPhysicalDemand( const int aPeriod ) const { + return 0; +} + +double CTaxInput::getCarbonContent( const int aPeriod ) const { + return 0; +} + +void CTaxInput::setPhysicalDemand( double aPhysicalDemand, + const string& aRegionName, + const int aPeriod ) +{ + // this input is used in conjunction with a negative emissions + // final demand to calculate the constraint demands +} + +double CTaxInput::getCoefficient( const int aPeriod ) const { + return 1.0; +} + +void CTaxInput::setCoefficient( const double aCoefficient, + const int aPeriod ) +{ + // Do nothing. +} + +double CTaxInput::getPrice( const string& aRegionName, + const int aPeriod ) const +{ + // Constants + const double CVRT90 = 2.212; // 1975 $ to 1990 $ + // Conversion from teragrams of carbon per EJ to metric tons of carbon per GJ + const double CVRT_TG_MT = 1e-3; + // A high tax decreases demand. + const Marketplace* marketplace = scenario->getMarketplace(); + double tax = marketplace->getPrice( mName, aRegionName, aPeriod, true ); + double ctax = marketplace->getPrice( "CO2", aRegionName, aPeriod, true ); + + // note we need to perform some unit conversions since C prices and technology + // costs in different units + return tax == Marketplace::NO_MARKET_PRICE ? 0.0 : tax * ctax * mCachedCCoef / CVRT90 * CVRT_TG_MT; +} + +void CTaxInput::setPrice( const string& aRegionName, + const double aPrice, + const int aPeriod ) +{ +} + +double CTaxInput::getCalibrationQuantity( const int aPeriod ) const +{ + return -1; +} + +bool CTaxInput::hasTypeFlag( const int aTypeFlag ) const { + return ( ( aTypeFlag & ~IInput::TAX ) == 0 ); +} + +double CTaxInput::getIncomeElasticity( const int aPeriod ) const { + return 0; +} + +double CTaxInput::getPriceElasticity( const int aPeriod ) const { + return 0; +} + +double CTaxInput::getTechChange( const int aPeriod ) const +{ + return 0; +} + diff --git a/cvs/objects/functions/source/input_tax.cpp b/cvs/objects/functions/source/input_tax.cpp index 4bc381c31b..3957c1e1b3 100644 --- a/cvs/objects/functions/source/input_tax.cpp +++ b/cvs/objects/functions/source/input_tax.cpp @@ -95,8 +95,7 @@ const string& InputTax::getXMLReportingName() const{ //! Constructor InputTax::InputTax() : mPhysicalDemand( scenario->getModeltime()->getmaxper() ), - mAdjustedCoefficients( scenario->getModeltime()->getmaxper(), 1.0 ), - mAddToDemand(true) + mAdjustedCoefficients( scenario->getModeltime()->getmaxper(), 1.0 ) { } @@ -167,9 +166,6 @@ void InputTax::XMLParse( const xercesc::DOMNode* node ) { XMLHelper::safeTranscode( attrTemp->getNodeValue() ); } } - else if( nodeName == "add-to-demand" ){ - mAddToDemand = XMLHelper::getValue( curr ); - } else { ILogger& mainLog = ILogger::getLogger( "main_log" ); mainLog.setLevel( ILogger::WARNING ); @@ -259,24 +255,25 @@ void InputTax::setPhysicalDemand( double aPhysicalDemand, const string& aRegionName, const int aPeriod ) { - if ( mAddToDemand ) { - Marketplace* marketplace = scenario->getMarketplace(); - IInfo* marketInfo = marketplace->getMarketInfo( mName, aRegionName, 0, true ); - - // If tax is shared based, then divide by sector output. - // Check if marketInfo exists and has the "isShareBased" boolean. - if( marketInfo && marketInfo->hasValue( "isShareBased" ) ){ - if( marketInfo->getBoolean( "isShareBased", true ) ){ - // Each share is additive - aPhysicalDemand/= marketplace->getDemand( mSectorName, aRegionName, aPeriod ); - } + + Marketplace* marketplace = scenario->getMarketplace(); + IInfo* marketInfo = marketplace->getMarketInfo( mName, aRegionName, 0, true ); + + // If tax is shared based, then divide by sector output. + // Check if marketInfo exists and has the "isShareBased" boolean. + if( marketInfo && marketInfo->hasValue( "isShareBased" ) ){ + if( marketInfo->getBoolean( "isShareBased", true ) ){ + // Each share is additive + aPhysicalDemand/= marketplace->getDemand( mSectorName, aRegionName, aPeriod ); } - // mPhysicalDemand can be a share if tax is share based. - mPhysicalDemand[ aPeriod ].set( aPhysicalDemand ); - // Each technology share is additive. - mLastCalcValue = marketplace->addToDemand( mName, aRegionName, mPhysicalDemand[ aPeriod ], - mLastCalcValue, aPeriod, true ); } + // mPhysicalDemand can be a share if tax is share based. + mPhysicalDemand[ aPeriod ].set( aPhysicalDemand ); + // Each technology share is additive. + mLastCalcValue = marketplace->addToDemand( mName, aRegionName, mPhysicalDemand[ aPeriod ], + mLastCalcValue, aPeriod, true ); + ILogger& mainLog = ILogger::getLogger( "main_log" ); + mainLog.setLevel( ILogger::NOTICE ); } double InputTax::getCoefficient( const int aPeriod ) const { @@ -296,15 +293,7 @@ double InputTax::getPrice( const string& aRegionName, const int aPeriod ) const { // A high tax decreases demand. - double tax = scenario->getMarketplace()->getPrice( mName, aRegionName, aPeriod, true ) / 1000.0; - - // For negative emissions constraints, we want to multiply by carbon price - // so that the constraint price is in a reasonable range - if( !mAddToDemand ) { -// tax *= scenario->getMarketplace()->getPrice( "CO2", aRegionName, aPeriod, true ); - } - - return tax; + return scenario->getMarketplace()->getPrice( mName, aRegionName, aPeriod, true ); } void InputTax::setPrice( const string& aRegionName, diff --git a/cvs/objects/marketplace/source/marketplace.cpp b/cvs/objects/marketplace/source/marketplace.cpp index 56e0f4c1ac..1aab9f5086 100644 --- a/cvs/objects/marketplace/source/marketplace.cpp +++ b/cvs/objects/marketplace/source/marketplace.cpp @@ -1183,6 +1183,9 @@ double Marketplace::forecastPrice( const std::vector& aMarketHistory, c { double forecastedPrice = extrapolate( aMarketHistory, aPeriod, &Market::getRawPrice ); + if( aMarketHistory[ aPeriod ]->getType() == IMarketType::TAX && aMarketHistory[ aPeriod ]->isSolvable() ) { + forecastedPrice = 1.0; + } aMarketHistory[ aPeriod ]->setForecastPrice( forecastedPrice ); return forecastedPrice; diff --git a/cvs/objects/policy/include/policy_portfolio_standard.h b/cvs/objects/policy/include/policy_portfolio_standard.h index 3bf1856ee8..3795888888 100644 --- a/cvs/objects/policy/include/policy_portfolio_standard.h +++ b/cvs/objects/policy/include/policy_portfolio_standard.h @@ -83,8 +83,11 @@ class PolicyPortfolioStandard: public IRoundTrippable { std::vector mConstraint; //!< Quantity constraint by year std::vector mFixedTax; //!< Fixed tax on Fuel by year($/GJ) std::vector mShareOfSectorOutput; //!< Share of total or sectoral output - //!< The minimum price below which the constraint is considered non-binding. + //! The minimum price below which the constraint is considered non-binding. std::vector mMinPrice; + //! A price if known above which this policy will have effectively to behavior + //! note this value will only be used as a hint to the solver. + std::vector mMaxPrice; }; #endif // _POLICY_PORTFOLIO_STANDARD_H_ diff --git a/cvs/objects/policy/source/policy_portfolio_standard.cpp b/cvs/objects/policy/source/policy_portfolio_standard.cpp index ac9df9e11d..9a7ae9ba8d 100644 --- a/cvs/objects/policy/source/policy_portfolio_standard.cpp +++ b/cvs/objects/policy/source/policy_portfolio_standard.cpp @@ -70,7 +70,8 @@ PolicyPortfolioStandard::PolicyPortfolioStandard(): mConstraint( scenario->getModeltime()->getmaxper(), -1.0 ), mFixedTax( scenario->getModeltime()->getmaxper(), -1 ), mShareOfSectorOutput( scenario->getModeltime()->getmaxper(), -1.0 ), - mMinPrice( scenario->getModeltime()->getmaxper(), 0.0000001 ) + mMinPrice( scenario->getModeltime()->getmaxper(), 0.0 ), + mMaxPrice( scenario->getModeltime()->getmaxper(), util::getLargeNumber() ) { } @@ -86,7 +87,8 @@ PolicyPortfolioStandard::PolicyPortfolioStandard( const string aName, const stri mConstraint( scenario->getModeltime()->getmaxper(), -1.0 ), mFixedTax( scenario->getModeltime()->getmaxper(), -1 ), mShareOfSectorOutput( scenario->getModeltime()->getmaxper(), -1.0 ), - mMinPrice( scenario->getModeltime()->getmaxper(), 0.0 ) + mMinPrice( scenario->getModeltime()->getmaxper(), 0.0 ), + mMaxPrice( scenario->getModeltime()->getmaxper(), util::getLargeNumber() ) { } @@ -100,7 +102,8 @@ PolicyPortfolioStandard::PolicyPortfolioStandard( const string aName, const stri mIsShareBased( true ), mConstraint( scenario->getModeltime()->getmaxper(), -1.0 ), mShareOfSectorOutput( aShareOfTotal ), - mMinPrice( scenario->getModeltime()->getmaxper(), 0.0 ) + mMinPrice( scenario->getModeltime()->getmaxper(), 0.0 ), + mMaxPrice( scenario->getModeltime()->getmaxper(), util::getLargeNumber() ) { // Ensure that the share vector passed in is the right size. assert( aShareOfTotal.size() == mConstraint.size() ); @@ -195,6 +198,9 @@ void PolicyPortfolioStandard::XMLParse( const DOMNode* node ){ else if( nodeName == "min-price" ){ XMLHelper::insertValueIntoVector( curr, mMinPrice, modeltime ); } + else if( nodeName == "max-price" ){ + XMLHelper::insertValueIntoVector( curr, mMaxPrice, modeltime ); + } else { ILogger& mainLog = ILogger::getLogger( "main_log" ); mainLog.setLevel( ILogger::WARNING ); @@ -220,6 +226,7 @@ void PolicyPortfolioStandard::toInputXML( ostream& out, Tabs* tabs ) const { } XMLWriteVector( mFixedTax, "fixedTax", out, tabs, modeltime, 0.0 ); XMLWriteVector( mMinPrice, "min-price", out, tabs, modeltime, 0.0 ); + XMLWriteVector( mMaxPrice, "max-price", out, tabs, modeltime, 0.0 ); for( int per = 0; per < modeltime->getmaxper(); ++per ){ XMLWriteElementCheckDefault( mShareOfSectorOutput[ per ], "share-of-sector-output", out, tabs, -1.0 ); @@ -256,6 +263,7 @@ void PolicyPortfolioStandard::toDebugXML( const int period, ostream& out, Tabs* XMLWriteElement( mShareOfSectorOutput[ period ], "share-of-sector-output", out, tabs ); XMLWriteElement( mMinPrice[ period ], "min-price", out, tabs ); + XMLWriteElement( mMaxPrice[ period ], "max-price", out, tabs ); // finished writing xml for the class members. XMLWriteClosingTag( getXMLName(), out, tabs ); @@ -353,7 +361,9 @@ void PolicyPortfolioStandard::completeInit( const string& aRegionName ) { // Constraint policies must have a price >= mMinPrice. It may be the case that the constraint is // non-binding at the minimum price in which case the solver can use this information to // make a supply currection to still ensure equality. - SectorUtils::setSupplyBehaviorBounds( mName, aRegionName, mMinPrice[ per ], util::getLargeNumber(), per ); + // Also set a maximum price in which case this value is only used as a hint to the solver to keep + // the solver on track. + SectorUtils::setSupplyBehaviorBounds( mName, aRegionName, mMinPrice[ per ], mMaxPrice[ per ], per ); } } } diff --git a/cvs/objects/sectors/source/negative_emissions_final_demand.cpp b/cvs/objects/sectors/source/negative_emissions_final_demand.cpp index d8dd5c5043..f5678f850b 100644 --- a/cvs/objects/sectors/source/negative_emissions_final_demand.cpp +++ b/cvs/objects/sectors/source/negative_emissions_final_demand.cpp @@ -189,7 +189,7 @@ void NegativeEmissionsFinalDemand::setFinalDemand( const string& aRegionName, return; } double regionalCO2Emiss = marketplace->getDemand( mName, aRegionName, aPeriod ); - regionalCO2Emiss = std::max( -1.0 * regionalCO2Emiss, 0.0 ); + regionalCO2Emiss = /*std::max(*/ -1.0 * regionalCO2Emiss/*, 0.0 )*/; double negativeEmissValue = regionalCO2Emiss * co2Price; mLastCalcValue = marketplace->addToDemand( mPolicyName, aRegionName, negativeEmissValue, mLastCalcValue, aPeriod ); } diff --git a/cvs/objects/solution/solvers/source/preconditioner.cpp b/cvs/objects/solution/solvers/source/preconditioner.cpp index c1e300286e..a76f3a2a58 100644 --- a/cvs/objects/solution/solvers/source/preconditioner.cpp +++ b/cvs/objects/solution/solvers/source/preconditioner.cpp @@ -327,10 +327,36 @@ SolverComponent::ReturnCode Preconditioner::solve( SolutionInfoSet& aSolutionSet solvable[i].setPrice(newprice); chg = true; ++nchg; + } else if(oldprice <= 0.0 && olddmnd > 0.0) { + newprice = olddmnd; + solvable[i].setPrice(newprice); + chg = true; + ++nchg; } } break; + case IMarketType::TAX: + lb = solvable[i].getLowerBoundSupplyPrice(); + ub = solvable[i].getUpperBoundSupplyPrice(); + if(olddmnd <= 0.0 && olddmnd < oldsply && oldprice > ub ) { + newprice = lb - 0.1; + solvable[i].setPrice(newprice); + chg = true; + ++nchg; + } else if(olddmnd > 0 && oldprice < lb ) { + newprice = lb + 0.1; + solvable[i].setPrice(newprice); + chg = true; + ++nchg; + } else if(oldprice > ub && olddmnd < oldsply) { + newprice = ub - 0.1; + solvable[i].setPrice(newprice); + chg = true; + ++nchg; + } + break; + default: // no action for tax markets, etc. chg = false; diff --git a/cvs/objects/technologies/source/input_factory.cpp b/cvs/objects/technologies/source/input_factory.cpp index cb4191f64f..19b142e2cd 100644 --- a/cvs/objects/technologies/source/input_factory.cpp +++ b/cvs/objects/technologies/source/input_factory.cpp @@ -54,6 +54,7 @@ #include "functions/include/input_subsidy.h" #include "functions/include/input_tax.h" #include "functions/include/good_value_input.h" +#include "functions/include/ctax_input.h" using namespace std; @@ -91,6 +92,9 @@ bool InputFactory::isOfType( const std::string& aType ) { if( aType == GoodValueInput::getXMLNameStatic() ) { return true; } + if( aType == CTaxInput::getXMLNameStatic() ) { + return true; + } return false; } @@ -128,6 +132,9 @@ auto_ptr InputFactory::create( const std::string& aType ) { if( aType == GoodValueInput::getXMLNameStatic() ){ return auto_ptr( new GoodValueInput ); } + if( aType == CTaxInput::getXMLNameStatic() ){ + return auto_ptr( new CTaxInput ); + } // Check for consistency. assert( !isOfType( aType ) ); diff --git a/cvs/objects/technologies/source/standard_capture_component.cpp b/cvs/objects/technologies/source/standard_capture_component.cpp index 6d0c28f59f..502b9734f0 100644 --- a/cvs/objects/technologies/source/standard_capture_component.cpp +++ b/cvs/objects/technologies/source/standard_capture_component.cpp @@ -241,7 +241,7 @@ double StandardCaptureComponent::getStorageCost( const string& aRegionName, // Use the market cost. storageCost = storageMarketPrice; } - return storageCost + negEmissPenalty; + return storageCost + negEmissPenalty * carbonMarketPrice; } /** diff --git a/input/solution/cal_broyden_config.xml b/input/solution/cal_broyden_config.xml index 3a201054fe..6b359ed946 100644 --- a/input/solution/cal_broyden_config.xml +++ b/input/solution/cal_broyden_config.xml @@ -68,7 +68,7 @@ 0.01 0.0001 0.01 - 5000 + 2500 solvable && unsolved @@ -77,7 +77,18 @@ - 20 + 10 + 5.0e-3 + + solvable-nr || (market-type="Tax" && solvable) + + + solvable && unsolved + 1.0e-2 + 2 + + + 10 5.0e-3 solvable-nr || (market-type="Tax" && solvable) @@ -87,7 +98,7 @@ 0.05 20 10 - unsolved && solvable + unsolved && solvable && !(market-type="Tax") - 4999 + 7999 diff --git a/input/policy/forcing_target_3p7.xml b/input/policy/forcing_target_3p7.xml index 97b57d8b4c..8d2e7ad3ae 100644 --- a/input/policy/forcing_target_3p7.xml +++ b/input/policy/forcing_target_3p7.xml @@ -53,5 +53,5 @@ the max-tax. If the actual solution price lies above max-tax the algorithm will fail. --> - 4999 + 7999 diff --git a/input/policy/forcing_target_4p5.xml b/input/policy/forcing_target_4p5.xml index c3085895a6..de17b799ba 100644 --- a/input/policy/forcing_target_4p5.xml +++ b/input/policy/forcing_target_4p5.xml @@ -53,5 +53,5 @@ the max-tax. If the actual solution price lies above max-tax the algorithm will fail. --> - 4999 + 7999 From dba790805772d3e28ff8941df7555863a78cc660 Mon Sep 17 00:00:00 2001 From: Pralit Patel Date: Mon, 30 Oct 2017 15:54:55 -0400 Subject: [PATCH 19/22] Reduce the forcing target tolerance as in practice it leads to 2-3 extra model runs for very little gain. --- input/policy/forcing_target_2p6_overshoot.xml | 2 +- input/policy/forcing_target_3p7.xml | 2 +- input/policy/forcing_target_4p5.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/input/policy/forcing_target_2p6_overshoot.xml b/input/policy/forcing_target_2p6_overshoot.xml index 8de07f4fff..5b942c8e23 100644 --- a/input/policy/forcing_target_2p6_overshoot.xml +++ b/input/policy/forcing_target_2p6_overshoot.xml @@ -7,7 +7,7 @@ --> 2.6 - 0.005 + 0.05 0.05 3.7 - 0.005 + 0.05 0.05 4.5 - 0.005 + 0.05 0.05