Skip to content

Commit

Permalink
Remove active parameter (#1027)
Browse files Browse the repository at this point in the history
  • Loading branch information
@datejada
datejada authored Feb 18, 2025
1 parent e36a2c0 commit 347a493
Show file tree
Hide file tree
Showing 18 changed files with 1,038 additions and 1,049 deletions.
784 changes: 392 additions & 392 deletions benchmark/EU/asset-both.csv
View file

Large diffs are not rendered by default.

1,004 changes: 502 additions & 502 deletions benchmark/EU/flow-both.csv
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/input-schemas.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ const schemas = (
:asset => "VARCHAR", # Name of Asset (geographical?)
:milestone_year => "INTEGER", # Year
:commission_year => "INTEGER", # Year of commissioning
:active => "BOOLEAN", # Active or decomissioned
:decommissionable => "BOOLEAN",
:initial_units => "DOUBLE", # units
:initial_storage_units => "DOUBLE", # units
Expand Down Expand Up @@ -140,7 +139,6 @@ const schemas = (
:to_asset => "VARCHAR", # Name of Asset
:milestone_year => "INTEGER",
:commission_year => "INTEGER", # Year of commissioning
:active => "BOOLEAN", # Active or decomissioned
:decommissionable => "BOOLEAN",
:initial_export_units => "DOUBLE", # MW
:initial_import_units => "DOUBLE", # MW
Expand Down
9 changes: 0 additions & 9 deletions src/tmp.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,12 @@ function tmp_create_partition_tables(connection)
SELECT
asset,
milestone_year,
MIN(active) AS active,
FROM asset_both
GROUP BY
asset, milestone_year
) AS t
ON asset.asset = t.asset
AND rep_periods_data.year = t.milestone_year
WHERE
t.active = true
ORDER BY rep_periods_data.year, rep_periods_data.rep_period
",
)
Expand Down Expand Up @@ -107,16 +104,13 @@ function tmp_create_partition_tables(connection)
from_asset,
to_asset,
milestone_year,
MIN(active) AS active,
FROM flow_both
GROUP BY
from_asset, to_asset, milestone_year
) AS t
ON flow.from_asset = t.from_asset
AND flow.to_asset = t.to_asset
AND rep_periods_data.year = t.milestone_year
WHERE
t.active = true
ORDER BY rep_periods_data.year, rep_periods_data.rep_period
",
)
Expand Down Expand Up @@ -402,7 +396,6 @@ function tmp_create_lowest_resolution_table(connection)
ON asset_both.asset = t_union.asset
AND asset_both.milestone_year = t_union.year
AND asset_both.commission_year = t_union.year
WHERE asset_both.active = true
ORDER BY
t_union.asset,
t_union.year,
Expand Down Expand Up @@ -449,7 +442,6 @@ function tmp_create_highest_resolution_table(connection)
# - keep all unique time_block_start
# - create corresponing time_block_end

# filtering by active
for union_table in
("t_union_" * x for x in ("in_flows", "out_flows", "assets_and_out_flows", "all_flows"))
table_name = replace(union_table, "t_union" => "t_highest")
Expand All @@ -475,7 +467,6 @@ function tmp_create_highest_resolution_table(connection)
LEFT JOIN rep_periods_data
ON t_union.year = rep_periods_data.year
AND t_union.rep_period = rep_periods_data.rep_period
WHERE asset_both.active = true
ORDER BY t_union.asset, t_union.year, t_union.rep_period, time_block_start
",
)
Expand Down
2 changes: 1 addition & 1 deletion test/inputs/Multi-year Investments/asset-both.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ wind,2050,2030,true,true,0.02,0.0
wind,2050,2050,true,false,0.0,0.0
solar,2050,2050,true,false,0.0,0.0
ens,2050,2050,true,false,1.0,0.0
demand,2050,2050,false,true,0.0,0.0
demand,2050,2050,false,false,0.0,0.0
32 changes: 16 additions & 16 deletions test/inputs/Multi-year Investments/flow-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
from_asset,to_asset,milestone_year,commission_year,active,decommissionable,initial_export_units,initial_import_units
ocgt,demand,2030,2030,true,true,0.0,0.0
ccgt,demand,2030,2028,true,true,1.0,1.0
ccgt,demand,2030,2030,true,false,0.0,0.0
battery,demand,2030,2030,true,true,0.0,0.0
demand,battery,2030,2030,true,true,0.0,0.0
wind,demand,2030,2030,true,true,0.0,0.0
solar,demand,2030,2030,true,true,0.0,0.0
ens,demand,2030,2030,true,true,0.0,0.0
ocgt,demand,2050,2030,true,true,0.0,0.0
ccgt,demand,2050,2050,true,false,0.0,0.0
battery,demand,2050,2030,true,true,0.0,0.0
demand,battery,2050,2030,true,true,0.0,0.0
wind,demand,2050,2030,true,true,0.0,0.0
solar,demand,2050,2030,true,true,0.0,0.0
ens,demand,2050,2030,false,true,0.0,0.0
from_asset,to_asset,milestone_year,commission_year,decommissionable,initial_export_units,initial_import_units
ocgt,demand,2030,2030,true,0.0,0.0
ccgt,demand,2030,2028,true,1.0,1.0
ccgt,demand,2030,2030,false,0.0,0.0
battery,demand,2030,2030,true,0.0,0.0
demand,battery,2030,2030,true,0.0,0.0
wind,demand,2030,2030,true,0.0,0.0
solar,demand,2030,2030,true,0.0,0.0
ens,demand,2030,2030,true,0.0,0.0
ocgt,demand,2050,2030,true,0.0,0.0
ccgt,demand,2050,2050,false,0.0,0.0
battery,demand,2050,2030,true,0.0,0.0
demand,battery,2050,2030,true,0.0,0.0
wind,demand,2050,2030,true,0.0,0.0
solar,demand,2050,2030,true,0.0,0.0
ens,demand,2050,2030,false,0.0,0.0
10 changes: 5 additions & 5 deletions test/inputs/Multi-year Investments/initial-assets-data.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name,active,year,commission_year,investable,investment_integer,investment_cost,investment_limit,capacity,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,investment_limit_storage_energy,capacity_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
wind,true,2020,2020,false,false,0,,50,0.07,0,,false,0,0,0,0,false,0,,0,false,,,,false,,,false,,false,,
wind,true,2030,2030,false,false,70,,50,0.02,0,,false,0,0,0,0,false,0,,0,false,,,,false,,,false,,false,,
wind,true,2035,2020,false,false,0,,50,-0.02,0,,false,0,0,0,0,false,0,,0,false,,,,false,,,false,,false,,
ccgt,true,2028,2028,false,false,0,,400,1,0,,false,0,0,0,0,false,0,,0,false,,,,false,,,false,,false,,
name,year,commission_year,investable,investment_integer,investment_cost,investment_limit,capacity,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,investment_limit_storage_energy,capacity_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
wind,2020,2020,false,false,0,,50,0.07,0,,false,0,0,0,0,false,0,,0,false,,,,false,,,false,,false,,
wind,2030,2030,false,false,70,,50,0.02,0,,false,0,0,0,0,false,0,,0,false,,,,false,,,false,,false,,
wind,2035,2020,false,false,0,,50,-0.02,0,,false,0,0,0,0,false,0,,0,false,,,,false,,,false,,false,,
ccgt,2028,2028,false,false,0,,400,1,0,,false,0,0,0,0,false,0,,0,false,,,,false,,,false,,false,,
48 changes: 24 additions & 24 deletions test/inputs/Norse/asset-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
asset,milestone_year,commission_year,active,decommissionable,initial_units,initial_storage_units
Asgard_Battery,2030,2030,true,false,7.25,0.0
Asgard_Solar,2030,2030,true,false,0.0,0.0
Asgard_E_demand,2030,2030,true,true,0.0,0.0
Asgard_CCGT,2030,2030,true,false,0.0,0.0
G_imports,2030,2030,true,true,1.0,0.0
Midgard_Wind,2030,2030,true,false,0.0,0.0
Midgard_Hydro,2030,2030,true,true,1.0,1.0
Midgard_PHS,2030,2030,true,false,1.75,0.0
Midgard_Nuclear_SMR,2030,2030,true,false,6.6666667,0.0
Midgard_E_imports,2030,2030,true,true,1.0,0.0
Midgard_CCGT,2030,2030,true,true,5.0,0.0
Midgard_E_demand,2030,2030,true,true,0.0,0.0
Valhalla_H2_generator,2030,2030,true,false,0.0,0.0
Valhalla_H2_storage,2030,2030,true,false,0.0,0.0
Valhalla_H2_demand,2030,2030,true,true,0.0,0.0
Valhalla_Electrolyser,2030,2030,true,false,5.0,0.0
Valhalla_E_balance,2030,2030,true,true,0.0,0.0
Valhalla_E_exports,2030,2030,true,true,0.0,0.0
Valhalla_Fuel_cell,2030,2030,true,false,0.0,0.0
Valhalla_Heat_pump,2030,2030,true,false,0.0,0.0
Valhalla_Waste_heat,2030,2030,true,true,0.0,0.0
Valhalla_Heat_demand,2030,2030,true,true,0.0,0.0
Valhalla_GT,2030,2030,true,false,0.0,0.0
asset,milestone_year,commission_year,decommissionable,initial_units,initial_storage_units
Asgard_Battery,2030,2030,false,7.25,0.0
Asgard_Solar,2030,2030,false,0.0,0.0
Asgard_E_demand,2030,2030,true,0.0,0.0
Asgard_CCGT,2030,2030,false,0.0,0.0
G_imports,2030,2030,true,1.0,0.0
Midgard_Wind,2030,2030,false,0.0,0.0
Midgard_Hydro,2030,2030,true,1.0,1.0
Midgard_PHS,2030,2030,false,1.75,0.0
Midgard_Nuclear_SMR,2030,2030,false,6.6666667,0.0
Midgard_E_imports,2030,2030,true,1.0,0.0
Midgard_CCGT,2030,2030,true,5.0,0.0
Midgard_E_demand,2030,2030,true,0.0,0.0
Valhalla_H2_generator,2030,2030,false,0.0,0.0
Valhalla_H2_storage,2030,2030,false,0.0,0.0
Valhalla_H2_demand,2030,2030,true,0.0,0.0
Valhalla_Electrolyser,2030,2030,false,5.0,0.0
Valhalla_E_balance,2030,2030,true,0.0,0.0
Valhalla_E_exports,2030,2030,true,0.0,0.0
Valhalla_Fuel_cell,2030,2030,false,0.0,0.0
Valhalla_Heat_pump,2030,2030,false,0.0,0.0
Valhalla_Waste_heat,2030,2030,true,0.0,0.0
Valhalla_Heat_demand,2030,2030,true,0.0,0.0
Valhalla_GT,2030,2030,false,0.0,0.0
66 changes: 33 additions & 33 deletions test/inputs/Norse/flow-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
from_asset,to_asset,milestone_year,commission_year,active,decommissionable,initial_export_units,initial_import_units
Asgard_Battery,Asgard_E_demand,2030,2030,true,true,0.0,0.0
Asgard_Solar,Asgard_Battery,2030,2030,true,true,0.0,0.0
Asgard_Solar,Asgard_E_demand,2030,2030,true,true,0.0,0.0
Asgard_CCGT,Asgard_E_demand,2030,2030,true,true,0.0,0.0
G_imports,Asgard_CCGT,2030,2030,true,true,0.0,0.0
G_imports,Midgard_CCGT,2030,2030,true,true,0.0,0.0
G_imports,Valhalla_GT,2030,2030,true,true,0.0,0.0
G_imports,Valhalla_H2_generator,2030,2030,true,true,0.0,0.0
Asgard_E_demand,Midgard_E_demand,2030,2030,true,false,0.0,0.0
Asgard_E_demand,Valhalla_E_balance,2030,2030,true,false,1.0,1.0
Midgard_E_demand,Valhalla_E_balance,2030,2030,true,false,0.0,0.0
Midgard_Wind,Midgard_E_demand,2030,2030,true,true,0.0,0.0
Midgard_Nuclear_SMR,Midgard_E_demand,2030,2030,true,true,0.0,0.0
Midgard_E_imports,Midgard_E_demand,2030,2030,true,true,0.0,0.0
Midgard_CCGT,Midgard_E_demand,2030,2030,true,true,0.0,0.0
Midgard_Hydro,Midgard_E_demand,2030,2030,true,true,0.0,0.0
Midgard_E_demand,Midgard_Hydro,2030,2030,true,true,0.0,0.0
Midgard_PHS,Midgard_E_demand,2030,2030,true,true,0.0,0.0
Midgard_E_demand,Midgard_PHS,2030,2030,true,true,0.0,0.0
Valhalla_GT,Valhalla_E_balance,2030,2030,true,true,0.0,0.0
Valhalla_Fuel_cell,Valhalla_E_balance,2030,2030,true,true,0.0,0.0
Valhalla_E_balance,Valhalla_E_exports,2030,2030,true,true,0.0,0.0
Valhalla_E_balance,Valhalla_Electrolyser,2030,2030,true,true,0.0,0.0
Valhalla_E_balance,Valhalla_Heat_pump,2030,2030,true,true,0.0,0.0
Valhalla_Waste_heat,Valhalla_Heat_pump,2030,2030,true,true,0.0,0.0
Valhalla_Heat_pump,Valhalla_Heat_demand,2030,2030,true,true,0.0,0.0
Valhalla_Fuel_cell,Valhalla_Heat_demand,2030,2030,true,true,0.0,0.0
Valhalla_H2_demand,Valhalla_Fuel_cell,2030,2030,true,true,0.0,0.0
Valhalla_Electrolyser,Valhalla_H2_demand,2030,2030,true,true,0.0,0.0
Valhalla_H2_storage,Valhalla_H2_demand,2030,2030,true,true,0.0,0.0
Valhalla_H2_demand,Valhalla_H2_storage,2030,2030,true,true,0.0,0.0
Valhalla_H2_generator,Valhalla_H2_demand,2030,2030,true,true,0.0,0.0
from_asset,to_asset,milestone_year,commission_year,decommissionable,initial_export_units,initial_import_units
Asgard_Battery,Asgard_E_demand,2030,2030,true,0.0,0.0
Asgard_Solar,Asgard_Battery,2030,2030,true,0.0,0.0
Asgard_Solar,Asgard_E_demand,2030,2030,true,0.0,0.0
Asgard_CCGT,Asgard_E_demand,2030,2030,true,0.0,0.0
G_imports,Asgard_CCGT,2030,2030,true,0.0,0.0
G_imports,Midgard_CCGT,2030,2030,true,0.0,0.0
G_imports,Valhalla_GT,2030,2030,true,0.0,0.0
G_imports,Valhalla_H2_generator,2030,2030,true,0.0,0.0
Asgard_E_demand,Midgard_E_demand,2030,2030,false,0.0,0.0
Asgard_E_demand,Valhalla_E_balance,2030,2030,false,1.0,1.0
Midgard_E_demand,Valhalla_E_balance,2030,2030,false,0.0,0.0
Midgard_Wind,Midgard_E_demand,2030,2030,true,0.0,0.0
Midgard_Nuclear_SMR,Midgard_E_demand,2030,2030,true,0.0,0.0
Midgard_E_imports,Midgard_E_demand,2030,2030,true,0.0,0.0
Midgard_CCGT,Midgard_E_demand,2030,2030,true,0.0,0.0
Midgard_Hydro,Midgard_E_demand,2030,2030,true,0.0,0.0
Midgard_E_demand,Midgard_Hydro,2030,2030,true,0.0,0.0
Midgard_PHS,Midgard_E_demand,2030,2030,true,0.0,0.0
Midgard_E_demand,Midgard_PHS,2030,2030,true,0.0,0.0
Valhalla_GT,Valhalla_E_balance,2030,2030,true,0.0,0.0
Valhalla_Fuel_cell,Valhalla_E_balance,2030,2030,true,0.0,0.0
Valhalla_E_balance,Valhalla_E_exports,2030,2030,true,0.0,0.0
Valhalla_E_balance,Valhalla_Electrolyser,2030,2030,true,0.0,0.0
Valhalla_E_balance,Valhalla_Heat_pump,2030,2030,true,0.0,0.0
Valhalla_Waste_heat,Valhalla_Heat_pump,2030,2030,true,0.0,0.0
Valhalla_Heat_pump,Valhalla_Heat_demand,2030,2030,true,0.0,0.0
Valhalla_Fuel_cell,Valhalla_Heat_demand,2030,2030,true,0.0,0.0
Valhalla_H2_demand,Valhalla_Fuel_cell,2030,2030,true,0.0,0.0
Valhalla_Electrolyser,Valhalla_H2_demand,2030,2030,true,0.0,0.0
Valhalla_H2_storage,Valhalla_H2_demand,2030,2030,true,0.0,0.0
Valhalla_H2_demand,Valhalla_H2_storage,2030,2030,true,0.0,0.0
Valhalla_H2_generator,Valhalla_H2_demand,2030,2030,true,0.0,0.0
18 changes: 9 additions & 9 deletions test/inputs/Storage/asset-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
asset,milestone_year,commission_year,active,decommissionable,initial_units,initial_storage_units
ocgt,2030,2030,true,true,1.0,0.0
ccgt,2030,2030,true,true,2.0,0.0
wind,2030,2030,true,true,35.0,0.0
solar,2030,2030,true,true,45.0,0.0
ens,2030,2030,true,true,1.0,0.0
battery,2030,2030,true,true,1.0,1.0
phs,2030,2030,true,true,1.0,1.0
demand,2030,2030,true,true,0.0,0.0
asset,milestone_year,commission_year,decommissionable,initial_units,initial_storage_units
ocgt,2030,2030,true,1.0,0.0
ccgt,2030,2030,true,2.0,0.0
wind,2030,2030,true,35.0,0.0
solar,2030,2030,true,45.0,0.0
ens,2030,2030,true,1.0,0.0
battery,2030,2030,true,1.0,1.0
phs,2030,2030,true,1.0,1.0
demand,2030,2030,true,0.0,0.0
20 changes: 10 additions & 10 deletions test/inputs/Storage/flow-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from_asset,to_asset,milestone_year,commission_year,active,decommissionable,initial_export_units,initial_import_units
ocgt,demand,2030,2030,true,true,0.0,0.0
ccgt,demand,2030,2030,true,true,0.0,0.0
wind,demand,2030,2030,true,true,0.0,0.0
solar,demand,2030,2030,true,true,0.0,0.0
ens,demand,2030,2030,true,true,0.0,0.0
battery,demand,2030,2030,true,true,0.0,0.0
demand,battery,2030,2030,true,true,0.0,0.0
phs,demand,2030,2030,true,true,0.0,0.0
demand,phs,2030,2030,true,true,0.0,0.0
from_asset,to_asset,milestone_year,commission_year,decommissionable,initial_export_units,initial_import_units
ocgt,demand,2030,2030,true,0.0,0.0
ccgt,demand,2030,2030,true,0.0,0.0
wind,demand,2030,2030,true,0.0,0.0
solar,demand,2030,2030,true,0.0,0.0
ens,demand,2030,2030,true,0.0,0.0
battery,demand,2030,2030,true,0.0,0.0
demand,battery,2030,2030,true,0.0,0.0
phs,demand,2030,2030,true,0.0,0.0
demand,phs,2030,2030,true,0.0,0.0
14 changes: 7 additions & 7 deletions test/inputs/Tiny/asset-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
asset,milestone_year,commission_year,active,decommissionable,initial_units,initial_storage_units
ocgt,2030,2030,true,false,0.0,0.0
ccgt,2030,2030,true,false,0.0,0.0
wind,2030,2030,true,false,0.0,0.0
solar,2030,2030,true,false,0.0,0.0
ens,2030,2030,true,true,1.0,0.0
demand,2030,2030,true,true,0.0,0.0
asset,milestone_year,commission_year,decommissionable,initial_units,initial_storage_units
ocgt,2030,2030,false,0.0,0.0
ccgt,2030,2030,false,0.0,0.0
wind,2030,2030,false,0.0,0.0
solar,2030,2030,false,0.0,0.0
ens,2030,2030,true,1.0,0.0
demand,2030,2030,true,0.0,0.0
12 changes: 6 additions & 6 deletions test/inputs/Tiny/flow-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from_asset,to_asset,milestone_year,commission_year,active,decommissionable,initial_export_units,initial_import_units
ocgt,demand,2030,2030,true,true,0.0,0.0
ccgt,demand,2030,2030,true,true,0.0,0.0
wind,demand,2030,2030,true,true,0.0,0.0
solar,demand,2030,2030,true,true,0.0,0.0
ens,demand,2030,2030,true,true,0.0,0.0
from_asset,to_asset,milestone_year,commission_year,decommissionable,initial_export_units,initial_import_units
ocgt,demand,2030,2030,true,0.0,0.0
ccgt,demand,2030,2030,true,0.0,0.0
wind,demand,2030,2030,true,0.0,0.0
solar,demand,2030,2030,true,0.0,0.0
ens,demand,2030,2030,true,0.0,0.0
18 changes: 9 additions & 9 deletions test/inputs/UC-ramping/asset-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
asset,milestone_year,commission_year,active,decommissionable,initial_units,initial_storage_units
gas,2030,2030,true,true,1.0,0.0
ocgt,2030,2030,true,false,0.0,0.0
ccgt,2030,2030,true,false,1.0,0.0
smr,2030,2030,true,true,1.0,0.0
wind,2030,2030,true,false,0.0,0.0
solar,2030,2030,true,false,0.0,0.0
ens,2030,2030,true,true,1.0,0.0
demand,2030,2030,true,true,0.0,0.0
asset,milestone_year,commission_year,decommissionable,initial_units,initial_storage_units
gas,2030,2030,true,1.0,0.0
ocgt,2030,2030,false,0.0,0.0
ccgt,2030,2030,false,1.0,0.0
smr,2030,2030,true,1.0,0.0
wind,2030,2030,false,0.0,0.0
solar,2030,2030,false,0.0,0.0
ens,2030,2030,true,1.0,0.0
demand,2030,2030,true,0.0,0.0
18 changes: 9 additions & 9 deletions test/inputs/UC-ramping/flow-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from_asset,to_asset,milestone_year,commission_year,active,decommissionable,initial_export_units,initial_import_units
gas,ocgt,2030,2030,true,true,0.0,0.0
gas,ccgt,2030,2030,true,true,0.0,0.0
ocgt,demand,2030,2030,true,true,0.0,0.0
ccgt,demand,2030,2030,true,true,0.0,0.0
smr,demand,2030,2030,true,true,0.0,0.0
wind,demand,2030,2030,true,true,0.0,0.0
solar,demand,2030,2030,true,true,0.0,0.0
ens,demand,2030,2030,true,true,0.0,0.0
from_asset,to_asset,milestone_year,commission_year,decommissionable,initial_export_units,initial_import_units
gas,ocgt,2030,2030,true,0.0,0.0
gas,ccgt,2030,2030,true,0.0,0.0
ocgt,demand,2030,2030,true,0.0,0.0
ccgt,demand,2030,2030,true,0.0,0.0
smr,demand,2030,2030,true,0.0,0.0
wind,demand,2030,2030,true,0.0,0.0
solar,demand,2030,2030,true,0.0,0.0
ens,demand,2030,2030,true,0.0,0.0
14 changes: 7 additions & 7 deletions test/inputs/Variable Resolution/asset-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
asset,milestone_year,commission_year,active,decommissionable,initial_units,initial_storage_units
H2,2030,2030,true,true,1.0,0.0
ccgt,2030,2030,true,true,1.0,0.0
wind,2030,2030,true,true,2.0,0.0
phs,2030,2030,true,true,1.0,1.0
demand,2030,2030,true,true,0.0,0.0
balance,2030,2030,true,true,0.0,0.0
asset,milestone_year,commission_year,decommissionable,initial_units,initial_storage_units
H2,2030,2030,true,1.0,0.0
ccgt,2030,2030,true,1.0,0.0
wind,2030,2030,true,2.0,0.0
phs,2030,2030,true,1.0,1.0
demand,2030,2030,true,0.0,0.0
balance,2030,2030,true,0.0,0.0
14 changes: 7 additions & 7 deletions test/inputs/Variable Resolution/flow-both.csv
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from_asset,to_asset,milestone_year,commission_year,active,decommissionable,initial_export_units,initial_import_units
H2,ccgt,2030,2030,true,true,0.0,0.0
ccgt,balance,2030,2030,true,true,0.0,0.0
wind,balance,2030,2030,true,true,0.0,0.0
wind,phs,2030,2030,true,true,0.0,0.0
phs,balance,2030,2030,true,true,0.0,0.0
balance,demand,2030,2030,true,true,1.0,1.0
from_asset,to_asset,milestone_year,commission_year,decommissionable,initial_export_units,initial_import_units
H2,ccgt,2030,2030,true,0.0,0.0
ccgt,balance,2030,2030,true,0.0,0.0
wind,balance,2030,2030,true,0.0,0.0
wind,phs,2030,2030,true,0.0,0.0
phs,balance,2030,2030,true,0.0,0.0
balance,demand,2030,2030,true,1.0,1.0
2 changes: 1 addition & 1 deletion test/test-case-studies.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ end
connection;
model_parameters_file = joinpath(@__DIR__, "inputs", "model-parameters-example.toml"),
)
@test energy_problem.objective_value ≈ 2306271.166700 atol = 1e-5
@test energy_problem.objective_value ≈ 2368623.97046 atol = 1e-5
end

@testset "Infeasible Case Study" begin
Expand Down

0 comments on commit 347a493

Please sign in to comment.