From 228712a168aa5802be4fe7ce72e713bba4c4caed Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 3 Jul 2024 16:44:02 +0100 Subject: [PATCH 1/2] Change column titles and order --- .../default_new_input/agent_objectives.csv | 2 +- .../example/default_new_input/agent_pairs.csv | 2 +- .../default_new_input/agent_regions.csv | 2 +- .../data/example/default_new_input/agents.csv | 2 +- .../data/example/default_new_input/assets.csv | 16 +-- .../example/default_new_input/commodities.csv | 2 +- .../default_new_input/commodity_costs.csv | 116 +++++++++--------- .../default_new_input/commodity_trade.csv | 2 +- .../data/example/default_new_input/demand.csv | 6 +- .../default_new_input/demand_slicing.csv | 14 +-- .../process_availabilities.csv | 12 +- .../default_new_input/process_flows.csv | 24 ++-- .../default_new_input/process_parameters.csv | 12 +- .../default_new_input/process_regions.csv | 2 +- .../example/default_new_input/processes.csv | 12 +- .../example/default_new_input/regions.csv | 2 +- .../example/default_new_input/sectors.csv | 2 +- 17 files changed, 115 insertions(+), 115 deletions(-) diff --git a/src/muse/data/example/default_new_input/agent_objectives.csv b/src/muse/data/example/default_new_input/agent_objectives.csv index c14612aaa..331c649c9 100644 --- a/src/muse/data/example/default_new_input/agent_objectives.csv +++ b/src/muse/data/example/default_new_input/agent_objectives.csv @@ -1,3 +1,3 @@ -agent,objective,objective_data,objective_sort +agent_id,objective,objective_data,objective_sort Agent1,LCOE,1,TRUE Agent2,LCOE,1,TRUE diff --git a/src/muse/data/example/default_new_input/agent_pairs.csv b/src/muse/data/example/default_new_input/agent_pairs.csv index 72e306f93..172632275 100644 --- a/src/muse/data/example/default_new_input/agent_pairs.csv +++ b/src/muse/data/example/default_new_input/agent_pairs.csv @@ -1,2 +1,2 @@ -name,new_agent,retrofit_agent,quantity +id,new_agent_id,retrofit_agent_id,quantity A1,Agent1,Agent2,1 diff --git a/src/muse/data/example/default_new_input/agent_regions.csv b/src/muse/data/example/default_new_input/agent_regions.csv index 257b59615..6a39852ea 100644 --- a/src/muse/data/example/default_new_input/agent_regions.csv +++ b/src/muse/data/example/default_new_input/agent_regions.csv @@ -1,2 +1,2 @@ -agent_pair,region +agent_pair_id,region_id A1,R1 diff --git a/src/muse/data/example/default_new_input/agents.csv b/src/muse/data/example/default_new_input/agents.csv index 2d1261bde..652e2d978 100644 --- a/src/muse/data/example/default_new_input/agents.csv +++ b/src/muse/data/example/default_new_input/agents.csv @@ -1,3 +1,3 @@ -agent,description,type,maturity_threshold,annual_cost_limit,search_rule,decision_rule +agent_id,description,type,maturity_threshold,annual_cost_limit,search_rule,decision_rule Agent1,New agent for A1,new,-1,inf,all,single Agent2,Retrofit agent for A1,retrofit,-1,inf,all,single diff --git a/src/muse/data/example/default_new_input/assets.csv b/src/muse/data/example/default_new_input/assets.csv index c30df1a13..8648bb891 100644 --- a/src/muse/data/example/default_new_input/assets.csv +++ b/src/muse/data/example/default_new_input/assets.csv @@ -1,8 +1,8 @@ -process_name,region,agent,capacity,year -gassupply1,R1,Agent2,15,2020 -gassupply1,R1,Agent2,15,2025 -gassupply1,R1,Agent2,7.5,2030 -gasCCGT,R1,Agent2,1,2020 -gasCCGT,R1,Agent2,1,2025 -gasboiler,R1,Agent2,10,2020 -gasboiler,R1,Agent2,5,2025 +agent_id,process_id,region_id,year,capacity +Agent2,gassupply1,R1,2020,15 +Agent2,gassupply1,R1,2025,15 +Agent2,gassupply1,R1,2030,7.5 +Agent2,gasCCGT,R1,2020,1 +Agent2,gasCCGT,R1,2025,1 +Agent2,gasboiler,R1,2020,10 +Agent2,gasboiler,R1,2025,5 diff --git a/src/muse/data/example/default_new_input/commodities.csv b/src/muse/data/example/default_new_input/commodities.csv index cec5cbf65..ac830346a 100644 --- a/src/muse/data/example/default_new_input/commodities.csv +++ b/src/muse/data/example/default_new_input/commodities.csv @@ -1,4 +1,4 @@ -commodity_name,description,type,unit +commodity_id,description,type,unit electricity,Electricity,energy,PJ gas,Gas,energy,PJ heat,Heat,energy,PJ diff --git a/src/muse/data/example/default_new_input/commodity_costs.csv b/src/muse/data/example/default_new_input/commodity_costs.csv index 85309f435..0a64542b3 100644 --- a/src/muse/data/example/default_new_input/commodity_costs.csv +++ b/src/muse/data/example/default_new_input/commodity_costs.csv @@ -1,58 +1,58 @@ -year,region,commodity_name,value -2010,R1,electricity,14.81481472 -2015,R1,electricity,17.89814806 -2020,R1,electricity,19.5 -2025,R1,electricity,21.93518528 -2030,R1,electricity,26.50925917 -2035,R1,electricity,26.51851861 -2040,R1,electricity,23.85185194 -2045,R1,electricity,23.97222222 -2050,R1,electricity,24.06481472 -2055,R1,electricity,25.3425925 -2060,R1,electricity,25.53703694 -2065,R1,electricity,25.32407417 -2070,R1,electricity,23.36111111 -2075,R1,electricity,22.27777778 -2080,R1,electricity,22.25925917 -2085,R1,electricity,22.17592583 -2090,R1,electricity,22.03703694 -2095,R1,electricity,21.94444444 -2100,R1,electricity,21.39814806 -2010,R1,gas,6.6759 -2015,R1,gas,6.914325 -2020,R1,gas,7.15275 -2025,R1,gas,8.10645 -2030,R1,gas,9.06015 -2035,R1,gas,9.2191 -2040,R1,gas,9.37805 -2045,R1,gas,9.193829337 -2050,R1,gas,9.009608674 -2055,R1,gas,8.832625604 -2060,R1,gas,8.655642534 -2065,R1,gas,8.485612708 -2070,R1,gas,8.315582883 -2075,R1,gas,8.152233126 -2080,R1,gas,7.988883368 -2085,R1,gas,7.831951236 -2090,R1,gas,7.675019103 -2095,R1,gas,7.524252461 -2100,R1,gas,7.373485819 -2010,R1,CO2f,0 -2015,R1,CO2f,0.052913851 -2020,R1,CO2f,0.08314119 -2025,R1,CO2f,0.120069795 -2030,R1,CO2f,0.156998399 -2035,R1,CO2f,0.214877567 -2040,R1,CO2f,0.272756734 -2045,R1,CO2f,0.35394801 -2050,R1,CO2f,0.435139285 -2055,R1,CO2f,0.542365578 -2060,R1,CO2f,0.649591871 -2065,R1,CO2f,0.780892624 -2070,R1,CO2f,0.912193378 -2075,R1,CO2f,1.078321687 -2080,R1,CO2f,1.244449995 -2085,R1,CO2f,1.4253503 -2090,R1,CO2f,1.606250604 -2095,R1,CO2f,1.73877515 -2100,R1,CO2f,1.871299697 +commodity_id,region_id,year,value +electricity,R1,2010,14.81481472 +electricity,R1,2015,17.89814806 +electricity,R1,2020,19.5 +electricity,R1,2025,21.93518528 +electricity,R1,2030,26.50925917 +electricity,R1,2035,26.51851861 +electricity,R1,2040,23.85185194 +electricity,R1,2045,23.97222222 +electricity,R1,2050,24.06481472 +electricity,R1,2055,25.3425925 +electricity,R1,2060,25.53703694 +electricity,R1,2065,25.32407417 +electricity,R1,2070,23.36111111 +electricity,R1,2075,22.27777778 +electricity,R1,2080,22.25925917 +electricity,R1,2085,22.17592583 +electricity,R1,2090,22.03703694 +electricity,R1,2095,21.94444444 +electricity,R1,2100,21.39814806 +gas,R1,2010,6.6759 +gas,R1,2015,6.914325 +gas,R1,2020,7.15275 +gas,R1,2025,8.10645 +gas,R1,2030,9.06015 +gas,R1,2035,9.2191 +gas,R1,2040,9.37805 +gas,R1,2045,9.193829337 +gas,R1,2050,9.009608674 +gas,R1,2055,8.832625604 +gas,R1,2060,8.655642534 +gas,R1,2065,8.485612708 +gas,R1,2070,8.315582883 +gas,R1,2075,8.152233126 +gas,R1,2080,7.988883368 +gas,R1,2085,7.831951236 +gas,R1,2090,7.675019103 +gas,R1,2095,7.524252461 +gas,R1,2100,7.373485819 +CO2f,R1,2010,0 +CO2f,R1,2015,0.052913851 +CO2f,R1,2020,0.08314119 +CO2f,R1,2025,0.120069795 +CO2f,R1,2030,0.156998399 +CO2f,R1,2035,0.214877567 +CO2f,R1,2040,0.272756734 +CO2f,R1,2045,0.35394801 +CO2f,R1,2050,0.435139285 +CO2f,R1,2055,0.542365578 +CO2f,R1,2060,0.649591871 +CO2f,R1,2065,0.780892624 +CO2f,R1,2070,0.912193378 +CO2f,R1,2075,1.078321687 +CO2f,R1,2080,1.244449995 +CO2f,R1,2085,1.4253503 +CO2f,R1,2090,1.606250604 +CO2f,R1,2095,1.73877515 +CO2f,R1,2100,1.871299697 diff --git a/src/muse/data/example/default_new_input/commodity_trade.csv b/src/muse/data/example/default_new_input/commodity_trade.csv index eb23c4b6c..092dd1559 100644 --- a/src/muse/data/example/default_new_input/commodity_trade.csv +++ b/src/muse/data/example/default_new_input/commodity_trade.csv @@ -1 +1 @@ -commodity,region,net_import,year +commodity_id,region_id,year,import,export diff --git a/src/muse/data/example/default_new_input/demand.csv b/src/muse/data/example/default_new_input/demand.csv index 13c64fe8c..b26c1b54d 100644 --- a/src/muse/data/example/default_new_input/demand.csv +++ b/src/muse/data/example/default_new_input/demand.csv @@ -1,3 +1,3 @@ -year,commodity_name,region,demand -2020,heat,R1,10 -2050,heat,R1,30 +commodity_id,region_id,year,demand +heat,R1,2020,10 +heat,R1,2050,30 diff --git a/src/muse/data/example/default_new_input/demand_slicing.csv b/src/muse/data/example/default_new_input/demand_slicing.csv index 10d4693c2..6877d5663 100644 --- a/src/muse/data/example/default_new_input/demand_slicing.csv +++ b/src/muse/data/example/default_new_input/demand_slicing.csv @@ -1,7 +1,7 @@ -commodity,region,timeslice,fraction,year -heat,R1,night,0.1, -heat,R1,morning,0.15, -heat,R1,afternoon,0.1, -heat,R1,early-peak,0.15, -heat,R1,late-peak,0.3, -heat,R1,evening,0.2, +commodity_id,region_id,year,timeslice,fraction +heat,R1,,night,0.1 +heat,R1,,morning,0.15 +heat,R1,,afternoon,0.1 +heat,R1,,early-peak,0.15 +heat,R1,,late-peak,0.3 +heat,R1,,evening,0.2 diff --git a/src/muse/data/example/default_new_input/process_availabilities.csv b/src/muse/data/example/default_new_input/process_availabilities.csv index 300a11407..1386d9db6 100644 --- a/src/muse/data/example/default_new_input/process_availabilities.csv +++ b/src/muse/data/example/default_new_input/process_availabilities.csv @@ -1,6 +1,6 @@ -process_name,timeslice,lim_type,value,year,region -gassupply1,ALL,UP,0.9,, -gasCCGT,ALL,UP,0.9,, -windturbine,ALL,UP,0.4,, -gasboiler,ALL,UP,1,, -heatpump,ALL,UP,1,, +process_id,region_id,year,timeslice,lim_type,value +gassupply1,,,ALL,UP,0.9 +gasCCGT,,,ALL,UP,0.9 +windturbine,,,ALL,UP,0.4 +gasboiler,,,ALL,UP,1 +heatpump,,,ALL,UP,1 diff --git a/src/muse/data/example/default_new_input/process_flows.csv b/src/muse/data/example/default_new_input/process_flows.csv index e6e72c67d..1c602f2d1 100644 --- a/src/muse/data/example/default_new_input/process_flows.csv +++ b/src/muse/data/example/default_new_input/process_flows.csv @@ -1,12 +1,12 @@ -process_name,commodity_name,flow,year,region -gassupply1,gas,1,, -gasCCGT,gas,-1.67,, -gasCCGT,electricity,1,, -gasCCGT,CO2f,91.67,, -windturbine,wind,-1,, -windturbine,electricity,1,, -gasboiler,gas,-1.16,, -gasboiler,heat,1,, -gasboiler,CO2f,64.71,, -heatpump,electricity,-0.4,, -heatpump,heat,1,, +process_id,commodity_id,region_id,year,flow +gassupply1,gas,,,1 +gasCCGT,gas,,,-1.67 +gasCCGT,electricity,,,1 +gasCCGT,CO2f,,,91.67 +windturbine,wind,,,-1 +windturbine,electricity,,,1 +gasboiler,gas,,,-1.16 +gasboiler,heat,,,1 +gasboiler,CO2f,,,64.71 +heatpump,electricity,,,-0.4 +heatpump,heat,,,1 diff --git a/src/muse/data/example/default_new_input/process_parameters.csv b/src/muse/data/example/default_new_input/process_parameters.csv index 00bb38bb7..5f162962a 100644 --- a/src/muse/data/example/default_new_input/process_parameters.csv +++ b/src/muse/data/example/default_new_input/process_parameters.csv @@ -1,6 +1,6 @@ -process,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,max_capacity_addition,max_capacity_growth,total_capacity_limit,life,scaling_size,efficiency,discount_rate,year,region -gassupply1,0,1,0,1,2.55,1,5,1,60,35,0.00000189,86,0.1,, -gasCCGT,23.78234399,1,0,1,0,1,2,1,60,35,0.00000189,86,0.1,, -windturbine,36.30771182,1,0,1,0,1,2,1,60,25,0.00000189,86,0.1,, -gasboiler,3.8,1,0,1,0,1,10,0.02,60,10,0.00000189,86,0.1,, -heatpump,8.866667,1,0,1,0,1,10,0.02,60,10,0.00000189,86,0.1,, +process_id,region_id,year,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,max_capacity_addition,max_capacity_growth,total_capacity_limit,life,scaling_size,efficiency,discount_rate +gassupply1,,,0,1,0,1,2.55,1,5,1,60,35,0.00000189,86,0.1 +gasCCGT,,,23.78234399,1,0,1,0,1,2,1,60,35,0.00000189,86,0.1 +windturbine,,,36.30771182,1,0,1,0,1,2,1,60,25,0.00000189,86,0.1 +gasboiler,,,3.8,1,0,1,0,1,10,0.02,60,10,0.00000189,86,0.1 +heatpump,,,8.866667,1,0,1,0,1,10,0.02,60,10,0.00000189,86,0.1 diff --git a/src/muse/data/example/default_new_input/process_regions.csv b/src/muse/data/example/default_new_input/process_regions.csv index e7ca8286c..8700ece5a 100644 --- a/src/muse/data/example/default_new_input/process_regions.csv +++ b/src/muse/data/example/default_new_input/process_regions.csv @@ -1,4 +1,4 @@ -process,region +process_id,region_id gassupply1,R1 gasCCGT,R1 windturbine,R1 diff --git a/src/muse/data/example/default_new_input/processes.csv b/src/muse/data/example/default_new_input/processes.csv index 7c4b9f818..e653e3ed6 100644 --- a/src/muse/data/example/default_new_input/processes.csv +++ b/src/muse/data/example/default_new_input/processes.csv @@ -1,6 +1,6 @@ -name,type,fuel,end_use,level,sector -gassupply1,energy,gas,gas,fixed,gas -gasCCGT,energy,gas,electricity,fixed,power -windturbine,energy,wind,electricity,fixed,power -gasboiler,energy,gas,heat,fixed,residential -heatpump,energy,electricity,heat,fixed,residential +id,sector_id,type,fuel,end_use,level +gassupply1,gas,energy,gas,gas,fixed +gasCCGT,power,energy,gas,electricity,fixed +windturbine,power,energy,wind,electricity,fixed +gasboiler,residential,energy,gas,heat,fixed +heatpump,residential,energy,electricity,heat,fixed diff --git a/src/muse/data/example/default_new_input/regions.csv b/src/muse/data/example/default_new_input/regions.csv index 1583e5334..1ce17d1ce 100644 --- a/src/muse/data/example/default_new_input/regions.csv +++ b/src/muse/data/example/default_new_input/regions.csv @@ -1,2 +1,2 @@ -name,description +id,description R1,Region 1 diff --git a/src/muse/data/example/default_new_input/sectors.csv b/src/muse/data/example/default_new_input/sectors.csv index a841328b6..7488adac9 100644 --- a/src/muse/data/example/default_new_input/sectors.csv +++ b/src/muse/data/example/default_new_input/sectors.csv @@ -1,4 +1,4 @@ -name,description +id,description gas,Gas sector power,Power sector residential,Residential sector From cf47582f996b5e90408ca31ef576dabc6057b539 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 3 Jul 2024 17:20:04 +0100 Subject: [PATCH 2/2] Correct id columns --- src/muse/data/example/default_new_input/agents.csv | 2 +- src/muse/data/example/default_new_input/commodities.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/muse/data/example/default_new_input/agents.csv b/src/muse/data/example/default_new_input/agents.csv index 652e2d978..a95e5b9dd 100644 --- a/src/muse/data/example/default_new_input/agents.csv +++ b/src/muse/data/example/default_new_input/agents.csv @@ -1,3 +1,3 @@ -agent_id,description,type,maturity_threshold,annual_cost_limit,search_rule,decision_rule +id,description,type,maturity_threshold,annual_cost_limit,search_rule,decision_rule Agent1,New agent for A1,new,-1,inf,all,single Agent2,Retrofit agent for A1,retrofit,-1,inf,all,single diff --git a/src/muse/data/example/default_new_input/commodities.csv b/src/muse/data/example/default_new_input/commodities.csv index ac830346a..5d87b119e 100644 --- a/src/muse/data/example/default_new_input/commodities.csv +++ b/src/muse/data/example/default_new_input/commodities.csv @@ -1,4 +1,4 @@ -commodity_id,description,type,unit +id,description,type,unit electricity,Electricity,energy,PJ gas,Gas,energy,PJ heat,Heat,energy,PJ