Skip to content

Commit

Permalink
Remove unneccessary duplicated data (#834)
Browse files Browse the repository at this point in the history
  • Loading branch information
gnawin authored Sep 30, 2024
1 parent 3598d66 commit 685ac83
Show file tree
Hide file tree
Showing 15 changed files with 883 additions and 884 deletions.
634 changes: 317 additions & 317 deletions benchmark/EU/assets-data.csv

Large diffs are not rendered by default.

792 changes: 396 additions & 396 deletions benchmark/EU/flows-data.csv

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/input-schemas.jl
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ const schemas = (
:investable => "BOOLEAN", # Whether able to invest
:investment_integer => "BOOLEAN", # Whether investment is integer or continuous
:variable_cost => "DOUBLE", # kEUR/MWh
:investment_cost => "DOUBLE", # kEUR/MW/year
:investment_limit => "DOUBLE", # MW
:initial_export_units => "DOUBLE", # MW
:initial_import_units => "DOUBLE", # MW
Expand Down
44 changes: 22 additions & 22 deletions test/inputs/Multi-year Investments/assets-data.csv
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
ocgt,true,2030,2030,true,true,25,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ccgt,true,2030,2028,false,false,40,20,10000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ccgt,true,2030,2030,true,true,40,20,10000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
battery,true,2030,2020,false,false,70,20,,0.07,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
battery,true,2030,2030,true,true,70,20,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
wind,true,2030,2020,false,false,70,20,,0.07,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
wind,true,2030,2030,true,true,70,20,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
solar,true,2030,2030,true,true,50,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ens,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
demand,true,2030,2030,false,false,0,20,,0,1115,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ocgt,true,2050,2050,true,true,25,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ccgt,true,2050,2028,false,false,40,20,10000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ccgt,true,2050,2050,false,false,40,20,10000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
battery,true,2050,2030,false,false,70,20,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
battery,true,2050,2050,true,true,70,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
wind,true,2050,2030,false,false,70,20,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
wind,true,2050,2050,true,true,70,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
solar,true,2050,2050,true,true,50,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ens,true,2050,2050,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
demand,false,2050,2050,false,false,0,20,,0,1115,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
,{true;false},,,{true;false},{true;false},MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
name,active,year,commission_year,investable,investment_integer,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
ocgt,true,2030,2030,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ccgt,true,2030,2028,false,false,10000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ccgt,true,2030,2030,true,true,10000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
battery,true,2030,2020,false,false,,0.07,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
battery,true,2030,2030,true,true,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
wind,true,2030,2020,false,false,,0.07,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
wind,true,2030,2030,true,true,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
solar,true,2030,2030,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ens,true,2030,2030,false,false,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
demand,true,2030,2030,false,false,,0,1115,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ocgt,true,2050,2050,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ccgt,true,2050,2028,false,false,10000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ccgt,true,2050,2050,false,false,10000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
battery,true,2050,2030,false,false,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
battery,true,2050,2050,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
wind,true,2050,2030,false,false,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
wind,true,2050,2050,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
solar,true,2050,2050,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
ens,true,2050,2050,false,false,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
demand,false,2050,2050,false,false,,0,1115,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
34 changes: 17 additions & 17 deletions test/inputs/Multi-year Investments/flows-data.csv
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
asset_name,asset_name,{true;false},,year,{true;false},{true;false},kEUR/MWh,kEUR/MW/year,kEUR/MW/year,MW,units,units,p.u.
from_asset,to_asset,active,year,commission_year,investable,investment_integer,variable_cost,investment_cost,fixed_cost,investment_limit,initial_export_units,initial_import_units,efficiency
ocgt,demand,true,2030,2030,false,false,0.07,0,0.1,,0,0,0
ccgt,demand,true,2030,2028,false,false,0.05,0,0.1,,1,1,0
ccgt,demand,true,2030,2030,true,false,0.05,0,0.1,100,0,0,0
battery,demand,true,2030,2030,false,false,0,0,0.1,,0,0,0.95
demand,battery,true,2030,2030,false,false,0,0,0.1,,0,0,0.95
wind,demand,true,2030,2030,false,false,0.001,0,0.1,,0,0,0
solar,demand,true,2030,2030,false,false,0,0,0.1,,0,0,0
ens,demand,true,2030,2030,false,false,0.18,0,0.1,,0,0,0
ocgt,demand,true,2050,2030,false,false,0.07,0,0.1,,0,0,0
ccgt,demand,true,2050,2050,true,false,0.05,0,0.1,100,0,0,0
battery,demand,true,2050,2030,false,false,0,0,0.1,,0,0,0.95
demand,battery,true,2050,2030,false,false,0,0,0.1,,0,0,0.95
wind,demand,true,2050,2030,false,false,0.001,0,0.1,,0,0,0
solar,demand,true,2050,2030,false,false,0,0,0.1,,0,0,0
ens,demand,false,2050,2030,false,false,0.18,0,0.1,,0,0,0
asset_name,asset_name,{true;false},,year,{true;false},{true;false},kEUR/MWh,MW,units,units,p.u.
from_asset,to_asset,active,year,commission_year,investable,investment_integer,variable_cost,investment_limit,initial_export_units,initial_import_units,efficiency
ocgt,demand,true,2030,2030,false,false,0.07,,0,0,0
ccgt,demand,true,2030,2028,false,false,0.05,,1,1,0
ccgt,demand,true,2030,2030,true,false,0.05,100,0,0,0
battery,demand,true,2030,2030,false,false,0,,0,0,0.95
demand,battery,true,2030,2030,false,false,0,,0,0,0.95
wind,demand,true,2030,2030,false,false,0.001,,0,0,0
solar,demand,true,2030,2030,false,false,0,,0,0,0
ens,demand,true,2030,2030,false,false,0.18,,0,0,0
ocgt,demand,true,2050,2030,false,false,0.07,,0,0,0
ccgt,demand,true,2050,2050,true,false,0.05,100,0,0,0
battery,demand,true,2050,2030,false,false,0,,0,0,0.95
demand,battery,true,2050,2030,false,false,0,,0,0,0.95
wind,demand,true,2050,2030,false,false,0.001,,0,0,0
solar,demand,true,2050,2030,false,false,0,,0,0,0
ens,demand,false,2050,2030,false,false,0.18,,0,0,0
50 changes: 25 additions & 25 deletions test/inputs/Norse/assets-data.csv
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
Asgard_Battery,true,2030,2030,true,true,300,0,25000,7.25,0,,false,0,0,,100,true,30,5,1000,true,binary,,,false,,,false,,false,,
Asgard_Solar,true,2030,2030,true,true,350,0,50000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Asgard_E_demand,true,2030,2030,false,false,0,0,0,0,65787.17792,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Asgard_CCGT,true,2030,2030,true,true,650,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,0.97,false,0.25,true,0.5,0.3
G_imports,true,2030,2030,false,false,0,0,0,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Midgard_Wind,true,2030,2030,true,true,1300,0,80000,0,0,,true,0,0,0,0,false,0,5,,false,,4.5e6,,false,,,false,,false,,
Midgard_Hydro,true,2030,2030,false,false,1600,0,0,1,0,,true,10000,1,25000,0,false,0,5,,false,relaxed_binary,,,false,,,false,,false,,
Midgard_PHS,true,2030,2030,true,true,800,0,5000,1.75,0,,false,0,0,,1,true,500,5,1000,false,,,,false,,,false,,false,,
Midgard_Nuclear_SMR,true,2030,2030,true,false,6000,0,,6.6666667,0,,true,0,0,0,0,false,0,5,,false,,,4.5e3,false,,,false,,true,0.75,0.65
Midgard_E_imports,true,2030,2030,false,false,0,0,0,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Midgard_CCGT,true,2030,2030,false,false,650,0,,5,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,,true,0.4,false,,
Midgard_E_demand,true,2030,2030,false,false,0,0,0,0,19604.76443,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_H2_generator,true,2030,2030,true,true,479,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_H2_storage,true,2030,2030,true,true,0.1,0,,0,0,,true,0,0,,10000,false,10,5,,true,,,,false,,,false,,false,,
Valhalla_H2_demand,true,2030,2030,false,false,0,0,0,0,745.735,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Electrolyser,true,2030,2030,true,true,1260,0,,5,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_E_balance,true,2030,2030,false,false,0,0,0,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_E_exports,true,2030,2030,false,false,0,0,0,0,50,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Fuel_cell,true,2030,2030,true,true,800,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Heat_pump,true,2030,2030,true,true,300,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Waste_heat,true,2030,2030,false,false,1450,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Heat_demand,true,2030,2030,false,false,0,0,0,0,3548.42445,>=,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_GT,true,2030,2030,true,true,400,0,100000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
,{true;false},,,{true;false},{true;false},MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
name,active,year,commission_year,investable,investment_integer,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
Asgard_Battery,true,2030,2030,true,true,25000,7.25,0,,false,0,0,,100,true,30,5,1000,true,binary,,,false,,,false,,false,,
Asgard_Solar,true,2030,2030,true,true,50000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Asgard_E_demand,true,2030,2030,false,false,0,0,65787.17792,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Asgard_CCGT,true,2030,2030,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,0.97,false,0.25,true,0.5,0.3
G_imports,true,2030,2030,false,false,0,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Midgard_Wind,true,2030,2030,true,true,80000,0,0,,true,0,0,0,0,false,0,5,,false,,4.5e6,,false,,,false,,false,,
Midgard_Hydro,true,2030,2030,false,false,0,1,0,,true,10000,1,25000,0,false,0,5,,false,relaxed_binary,,,false,,,false,,false,,
Midgard_PHS,true,2030,2030,true,true,5000,1.75,0,,false,0,0,,1,true,500,5,1000,false,,,,false,,,false,,false,,
Midgard_Nuclear_SMR,true,2030,2030,true,false,,6.6666667,0,,true,0,0,0,0,false,0,5,,false,,,4.5e3,false,,,false,,true,0.75,0.65
Midgard_E_imports,true,2030,2030,false,false,0,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Midgard_CCGT,true,2030,2030,false,false,,5,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,,true,0.4,false,,
Midgard_E_demand,true,2030,2030,false,false,0,0,19604.76443,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_H2_generator,true,2030,2030,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_H2_storage,true,2030,2030,true,true,,0,0,,true,0,0,,10000,false,10,5,,true,,,,false,,,false,,false,,
Valhalla_H2_demand,true,2030,2030,false,false,0,0,745.735,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Electrolyser,true,2030,2030,true,true,,5,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_E_balance,true,2030,2030,false,false,0,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_E_exports,true,2030,2030,false,false,0,0,50,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Fuel_cell,true,2030,2030,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Heat_pump,true,2030,2030,true,true,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Waste_heat,true,2030,2030,false,false,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_Heat_demand,true,2030,2030,false,false,0,0,3548.42445,>=,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Valhalla_GT,true,2030,2030,true,true,100000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
Loading

0 comments on commit 685ac83

Please sign in to comment.