Chnage flow data (#832)

TulipaEnergy · Sep 30, 2024 · 4a6cb38 · 4a6cb38
1 parent 1b88434
commit 4a6cb38
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/io.jl b/src/io.jl
@@ -142,8 +142,8 @@ function create_internal_structures(connection)
             row.technical_lifetime,
             row.economic_lifetime,
             row.discount_rate,
-            _get_stuff_vintage_year("assets_data", "investment_cost"; name = row.name),
-            _get_stuff_vintage_year("assets_data", "fixed_cost"; name = row.name),
+            _get_stuff_vintage_year("vintage_assets_data", "investment_cost"; name = row.name),
+            _get_stuff_vintage_year("vintage_assets_data", "fixed_cost"; name = row.name),
             _get_stuff_year("assets_data", "investment_limit"; name = row.name),
             row.capacity,
             _get_stuff_commission_year("assets_data", "initial_units"; name = row.name),
@@ -163,11 +163,15 @@ function create_internal_structures(connection)
             _get_stuff_year("assets_data", "energy_to_power_ratio"; name = row.name),
             _get_stuff_year("assets_data", "storage_method_energy"; name = row.name),
             _get_stuff_vintage_year(
-                "assets_data",
+                "vintage_assets_data",
                 "investment_cost_storage_energy";
                 name = row.name,
             ),
-            _get_stuff_vintage_year("assets_data", "fixed_cost_storage_energy"; name = row.name),
+            _get_stuff_vintage_year(
+                "vintage_assets_data",
+                "fixed_cost_storage_energy";
+                name = row.name,
+            ),
             _get_stuff_year("assets_data", "investment_limit_storage_energy"; name = row.name),
             row.capacity_storage_energy,
             _get_stuff_year("assets_data", "investment_integer_storage_energy"; name = row.name),
@@ -223,13 +227,13 @@ function create_internal_structures(connection)
                 to_asset = row.to_asset,
             ),
             _get_stuff_vintage_year(
-                "flows_data",
+                "vintage_flows_data",
                 "investment_cost";
                 from_asset = row.from_asset,
                 to_asset = row.to_asset,
             ),
             _get_stuff_vintage_year(
-                "flows_data",
+                "vintage_flows_data",
                 "fixed_cost";
                 from_asset = row.from_asset,
                 to_asset = row.to_asset,

diff --git a/test/inputs/Multi-year Investments/flows-data.csv b/test/inputs/Multi-year Investments/flows-data.csv
@@ -1,15 +1,15 @@
 asset_name,asset_name,{true;false},,year,{true;false},{true;false},{true;false},kEUR/MWh,kEUR/MW/year,kEUR/MW/year,MW,MW,MW,p.u.
 from_asset,to_asset,active,year,commission_year,is_transport,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,false,0.07,0,0.1,,0,0,0
-ccgt,demand,true,2030,2025,true,false,false,0.05,0,0.1,,1,1,0
-ccgt,demand,true,2030,2030,true,true,false,0.05,0,0.1,,0,0,0
+ccgt,demand,true,2030,2028,true,false,false,0.05,0,0.1,,1,1,0
+ccgt,demand,true,2030,2030,true,true,false,0.05,0,0.1,100,0,0,0
 battery,demand,true,2030,2030,false,false,false,0.0,0,0.1,,0,0,0.95
 demand,battery,true,2030,2030,false,false,false,0.0,0,0.1,,0,0,0.95
 wind,demand,true,2030,2030,false,false,false,0.001,0,0.1,,0,0,0
 solar,demand,true,2030,2030,false,false,false,0,0,0.1,,0,0,0
 ens,demand,true,2030,2030,false,false,false,0.18,0,0.1,,0,0,0
 ocgt,demand,true,2050,2030,false,false,false,0.07,0,0.1,,0,0,0
-ccgt,demand,true,2050,2030,false,false,false,0.05,0,0.1,,0,0,0
+ccgt,demand,true,2050,2050,true,true,false,0.05,0,0.1,100,0,0,0
 battery,demand,true,2050,2030,false,false,false,0.0,0,0.1,,0,0,0.95
 demand,battery,true,2050,2030,false,false,false,0.0,0,0.1,,0,0,0.95
 wind,demand,true,2050,2030,false,false,false,0.001,0,0.1,,0,0,0