From 5ee9e9bd670d49d275e98907a5aa6f636a711c14 Mon Sep 17 00:00:00 2001 From: datejada Date: Fri, 10 Jan 2025 15:40:31 +0100 Subject: [PATCH 1/3] Aux function to delete the header of the file --- utils/csv-modifications.jl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/utils/csv-modifications.jl b/utils/csv-modifications.jl index 6911e0e2..42a20511 100644 --- a/utils/csv-modifications.jl +++ b/utils/csv-modifications.jl @@ -193,3 +193,25 @@ function apply_to_files_named(f, filename; include_missing = false) end end end + +""" + delete_header_in_csvs(path) + +Searches for all CSV files in the given `path` and its subfolders, deletes the header row of each file, and saves the file. +""" +function delete_header_in_csvs(path) + for (root, _, files) in walkdir(path) + for file in files + if endswith(file, ".csv") + try + file_path = joinpath(root, file) + df = CSV.read(file_path, DataFrame; header = 2) + CSV.write(file_path, df; append = false) + println("Processed: $file_path") + catch e + println("Error processing $file_path: $e") + end + end + end + end +end From ab782d8fc295d013bdf289ef434da51c4a465a05 Mon Sep 17 00:00:00 2001 From: datejada Date: Fri, 10 Jan 2025 15:41:50 +0100 Subject: [PATCH 2/3] Update read CSV header parameter --- docs/src/10-how-to-use.md | 8 ++++---- docs/src/30-concepts.md | 22 +++++++++++----------- utils/csv-modifications.jl | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/src/10-how-to-use.md b/docs/src/10-how-to-use.md index 3c38cf1b..6fffd6fa 100644 --- a/docs/src/10-how-to-use.md +++ b/docs/src/10-how-to-use.md @@ -471,7 +471,7 @@ Let's explore how the groups are set up in the test case called [Norse](https:// using DataFrames # hide using CSV # hide input_asset_file = "../../test/inputs/Norse/group-asset.csv" # hide -assets = CSV.read(input_asset_file, DataFrame, header = 2) # hide +assets = CSV.read(input_asset_file, DataFrame, header = 1) # hide ``` In the given data, there are two groups: `renewables` and `ccgt`. Both groups have the `invest_method` parameter set to `true`, indicating that investment group constraints apply to both. For the `renewables` group, the `min_investment_limit` parameter is missing, signifying that there is no minimum limit imposed on the group. However, the `max_investment_limit` parameter is set to 40000 MW, indicating that the total investments of assets in the group must be less than or equal to this value. In contrast, the `ccgt` group has a missing value in the `max_investment_limit` parameter, indicating no maximum limit, while the `min_investment_limit` is set to 10000 MW for the total investments in that group. @@ -480,7 +480,7 @@ Let's now explore which assets are in each group. To do so, we can take a look a ```@example display-group-setup input_asset_file = "../../test/inputs/Norse/graph-assets-data.csv" # hide -assets = CSV.read(input_asset_file, DataFrame, header = 2) # hide +assets = CSV.read(input_asset_file, DataFrame, header = 1) # hide assets = assets[.!ismissing.(assets.group), [:name, :type, :group]] # hide ``` @@ -538,7 +538,7 @@ In order to set up a model with year information, the following steps are necess using DataFrames # hide using CSV # hide input_asset_file = "../../test/inputs/Multi-year Investments/assets-data.csv" # hide - assets_data = CSV.read(input_asset_file, DataFrame, header = 2) # hide + assets_data = CSV.read(input_asset_file, DataFrame, header = 1) # hide assets_data = assets_data[1:10, [:name, :year, :commission_year, :investable, :initial_units]] # hide ``` @@ -558,7 +558,7 @@ In order to set up a model with year information, the following steps are necess ```@example multi-year-setup input_asset_file = "../../test/inputs/Multi-year Investments/assets-profiles.csv" # hide - assets_profiles = CSV.read(input_asset_file, DataFrame, header = 2) # hide + assets_profiles = CSV.read(input_asset_file, DataFrame, header = 1) # hide assets_profiles = assets_profiles[1:2, :] # hide ``` diff --git a/docs/src/30-concepts.md b/docs/src/30-concepts.md index 42f14d3b..5651497a 100644 --- a/docs/src/30-concepts.md +++ b/docs/src/30-concepts.md @@ -75,7 +75,7 @@ The following table shows the user input data for the definition of asset time r using DataFrames # hide using CSV # hide input_asset_file = "../../test/inputs/Variable Resolution/assets-rep-periods-partitions.csv" # hide -assets = CSV.read(input_asset_file, DataFrame, header = 2) # hide +assets = CSV.read(input_asset_file, DataFrame, header = 1) # hide assets = assets[assets.asset .!= "wind", :] # hide ``` @@ -85,7 +85,7 @@ The same time resolution can be specified for the flows, for example (again, the ```@example print-partitions input_flow_file = "../../test/inputs/Variable Resolution/flows-rep-periods-partitions.csv" # hide -flows_partitions = CSV.read(input_flow_file, DataFrame, header = 2) # hide +flows_partitions = CSV.read(input_flow_file, DataFrame, header = 1) # hide ``` The table shows a `uniform` definition for the flow from the hydrogen producer (`H2`) to the conversion asset (`ccgt`) of 6 hours, from the wind producer (`wind`) to the storage (`phs`) of 3 hours, and from the balance hub (`balance`) to the consumer (`demand`) of 3 hours, too. In addition, the flow from the wind producer (`wind`) to the balance hub (`balance`) is defined using the `math` specification of `1x2+1x4`, meaning that there are two time blocks, one of two hours (i.e., `1:2`) and another of four hours (i.e., `3:6`). Finally, the flow from the storage (`phs`) to the balance hub (`balance`) is defined using the `math` specification of `1x4+1x2`, meaning that there are two time blocks, one of four hours (i.e., `1:4`) and another of two hours (i.e., `5:6`). @@ -350,8 +350,8 @@ The example demonstrates various assets that supply demand. Each asset has diffe using DataFrames # hide using CSV # hide input_dir = "../../test/inputs/UC-ramping" # hide -assets_data = CSV.read(joinpath(input_dir, "assets-data.csv"), DataFrame, header = 2) # hide -graph_assets = CSV.read(joinpath(input_dir, "graph-assets-data.csv"), DataFrame, header = 2) # hide +assets_data = CSV.read(joinpath(input_dir, "assets-data.csv"), DataFrame, header = 1) # hide +graph_assets = CSV.read(joinpath(input_dir, "graph-assets-data.csv"), DataFrame, header = 1) # hide assets = leftjoin(graph_assets, assets_data, on=:name) # hide filtered_assets = assets[assets.type .== "producer" .|| assets.type .== "conversion", ["name", "type", "capacity", "initial_units", "unit_commitment", "ramping"]] # hide ``` @@ -359,14 +359,14 @@ filtered_assets = assets[assets.type .== "producer" .|| assets.type .== "convers The `assets-rep-periods-partitions` file defines the time resolution for the assets in the `partition` column. For instance, here we can see that the time resolutions are 3h for the `ccgt` and 6h for the `smr`. These values mean that the unit commitment variables (e.g., `units_on`) in the model have three and six hours resolution, respectively. ```@example unit-commitment -assets_partitions_data = CSV.read(joinpath(input_dir, "assets-rep-periods-partitions.csv"), DataFrame, header = 2) # hide +assets_partitions_data = CSV.read(joinpath(input_dir, "assets-rep-periods-partitions.csv"), DataFrame, header = 1) # hide filtered_assets_partitions = assets_partitions_data[!, ["asset", "specification", "partition"]] # hide ``` The `flows-rep-periods-partitions` file defines the time resolution for the flows. In this example, we have that the flows from the `gas` asset to the `ccgt` and from the `ccgt` asset to the `demand` are in a 2h resolution. ```@example unit-commitment -flows_partitions_data = CSV.read(joinpath(input_dir, "flows-rep-periods-partitions.csv"), DataFrame, header = 2) # hide +flows_partitions_data = CSV.read(joinpath(input_dir, "flows-rep-periods-partitions.csv"), DataFrame, header = 1) # hide filtered_flows_partitions = flows_partitions_data[!, ["from_asset", "to_asset", "specification", "partition"]] # hide ``` @@ -554,8 +554,8 @@ Let's first look at this feature's most relevant input data, starting with the ` using DataFrames # hide using CSV # hide input_dir = "../../test/inputs/Storage" # hide -assets_data = CSV.read(joinpath(input_dir, "assets-data.csv"), DataFrame, header = 2) # hide -graph_assets = CSV.read(joinpath(input_dir, "graph-assets-data.csv"), DataFrame, header = 2) # hide +assets_data = CSV.read(joinpath(input_dir, "assets-data.csv"), DataFrame, header = 1) # hide +graph_assets = CSV.read(joinpath(input_dir, "graph-assets-data.csv"), DataFrame, header = 1) # hide assets = leftjoin(graph_assets, assets_data, on=:name) # hide filtered_assets = assets[assets.type .== "storage", ["name", "type", "capacity", "capacity_storage_energy", "initial_storage_units", "initial_storage_level", "is_seasonal"]] # hide ``` @@ -566,7 +566,7 @@ The `rep-periods-data` file has information on the representative periods in the ```@example seasonal-storage rp_file = "../../test/inputs/Storage/rep-periods-data.csv" # hide -rp = CSV.read(rp_file, DataFrame, header = 2) # hide +rp = CSV.read(rp_file, DataFrame, header = 1) # hide ``` ![availability-profiles](./figs/availability-profiles.png) @@ -575,7 +575,7 @@ The `rep-periods-mapping` relates each representative period with the periods in ```@example seasonal-storage map_file = "../../test/inputs/Storage/rep-periods-mapping.csv" # hide -map = CSV.read(map_file, DataFrame, header = 2) # hide +map = CSV.read(map_file, DataFrame, header = 1) # hide unstacked_map = unstack(map, :period, :rep_period, :weight) # hide rename!(unstacked_map, ["period", "k=1", "k=2", "k=3"]) # hide unstacked_map[!,["k=1", "k=2", "k=3"]] = convert.(Float64, unstacked_map[!,["k=1", "k=2", "k=3"]]) # hide @@ -586,7 +586,7 @@ The file `assets-timeframe-partitions` has the information on how often we want ```@example seasonal-storage phs_partitions_file = "../../test/inputs/Storage/assets-timeframe-partitions.csv" # hide -phs_partitions = CSV.read(phs_partitions_file, DataFrame, header = 2) # hide +phs_partitions = CSV.read(phs_partitions_file, DataFrame, header = 1) # hide ``` > **Note:** diff --git a/utils/csv-modifications.jl b/utils/csv-modifications.jl index 42a20511..1f99fc03 100644 --- a/utils/csv-modifications.jl +++ b/utils/csv-modifications.jl @@ -20,7 +20,7 @@ function TulipaCSV(path) end units = split(readline(path), ",") - csv = CSV.read(path, DataFrame; header = 2, types = String) + csv = CSV.read(path, DataFrame; header = 1, types = String) if size(csv) == (0, 0) units = String[] From 93a7eaa4454c276019b2a67d2f812e7f550f2c33 Mon Sep 17 00:00:00 2001 From: datejada Date: Fri, 10 Jan 2025 15:42:35 +0100 Subject: [PATCH 3/3] Update input files --- benchmark/EU/asset-both.csv | 1 - benchmark/EU/asset-commission.csv | 1 - benchmark/EU/asset-milestone.csv | 1 - benchmark/EU/asset.csv | 1 - benchmark/EU/assets-profiles.csv | 1 - .../EU/assets-rep-periods-partitions.csv | 1 - benchmark/EU/assets-timeframe-partitions.csv | 1 - benchmark/EU/assets-timeframe-profiles.csv | 1 - benchmark/EU/flow-both.csv | 1 - benchmark/EU/flow-commission.csv | 1 - benchmark/EU/flow-milestone.csv | 1 - benchmark/EU/flow.csv | 1 - benchmark/EU/flows-profiles.csv | 1 - benchmark/EU/flows-rep-periods-partitions.csv | 1 - benchmark/EU/flows-timeframe-partitions.csv | 1 - benchmark/EU/flows-timeframe-profiles.csv | 1 - benchmark/EU/profiles-rep-periods.csv | 1 - benchmark/EU/profiles-timeframe.csv | 1 - benchmark/EU/rep-periods-data.csv | 1 - benchmark/EU/rep-periods-mapping.csv | 1 - benchmark/EU/timeframe-data.csv | 1 - benchmark/EU/year-data.csv | 1 - .../Multi-year Investments/asset-both.csv | 1 - .../asset-commission.csv | 1 - .../asset-milestone.csv | 1 - test/inputs/Multi-year Investments/asset.csv | 1 - .../assets-profiles.csv | 1 - .../Multi-year Investments/flow-both.csv | 1 - .../flow-commission.csv | 1 - .../Multi-year Investments/flow-milestone.csv | 1 - test/inputs/Multi-year Investments/flow.csv | 1 - .../Multi-year Investments/flows-profiles.csv | 1 - .../initial-assets-data.csv | 1 - .../profiles-rep-periods.csv | 229 +++++++++--------- .../rep-periods-data.csv | 1 - .../rep-periods-mapping.csv | 1 - .../Multi-year Investments/timeframe-data.csv | 1 - .../Multi-year Investments/year-data.csv | 1 - test/inputs/Norse/asset-both.csv | 1 - test/inputs/Norse/asset-commission.csv | 1 - test/inputs/Norse/asset-milestone.csv | 1 - test/inputs/Norse/asset.csv | 1 - test/inputs/Norse/assets-profiles.csv | 1 - .../Norse/assets-rep-periods-partitions.csv | 1 - .../Norse/assets-timeframe-partitions.csv | 1 - .../Norse/assets-timeframe-profiles.csv | 1 - test/inputs/Norse/flow-both.csv | 1 - test/inputs/Norse/flow-commission.csv | 1 - test/inputs/Norse/flow-milestone.csv | 1 - test/inputs/Norse/flow.csv | 1 - test/inputs/Norse/flows-profiles.csv | 1 - .../Norse/flows-rep-periods-partitions.csv | 1 - test/inputs/Norse/group-asset.csv | 1 - test/inputs/Norse/profiles-rep-periods.csv | 1 - test/inputs/Norse/profiles-timeframe.csv | 1 - test/inputs/Norse/rep-periods-data.csv | 1 - test/inputs/Norse/rep-periods-mapping.csv | 1 - test/inputs/Norse/timeframe-data.csv | 1 - test/inputs/Norse/year-data.csv | 1 - test/inputs/Storage/asset-both.csv | 1 - test/inputs/Storage/asset-commission.csv | 1 - test/inputs/Storage/asset-milestone.csv | 1 - test/inputs/Storage/asset.csv | 1 - test/inputs/Storage/assets-profiles.csv | 1 - .../Storage/assets-rep-periods-partitions.csv | 1 - .../Storage/assets-timeframe-partitions.csv | 1 - .../Storage/assets-timeframe-profiles.csv | 1 - test/inputs/Storage/flow-both.csv | 1 - test/inputs/Storage/flow-commission.csv | 1 - test/inputs/Storage/flow-milestone.csv | 1 - test/inputs/Storage/flow.csv | 1 - test/inputs/Storage/flows-profiles.csv | 1 - .../Storage/flows-rep-periods-partitions.csv | 1 - test/inputs/Storage/profiles-rep-periods.csv | 1 - test/inputs/Storage/profiles-timeframe.csv | 1 - test/inputs/Storage/rep-periods-data.csv | 1 - test/inputs/Storage/rep-periods-mapping.csv | 1 - test/inputs/Storage/timeframe-data.csv | 1 - test/inputs/Storage/year-data.csv | 1 - test/inputs/Tiny/asset-both.csv | 1 - test/inputs/Tiny/asset-commission.csv | 1 - test/inputs/Tiny/asset-milestone.csv | 1 - test/inputs/Tiny/asset.csv | 1 - test/inputs/Tiny/assets-profiles.csv | 1 - test/inputs/Tiny/flow-both.csv | 1 - test/inputs/Tiny/flow-commission.csv | 1 - test/inputs/Tiny/flow-milestone.csv | 1 - test/inputs/Tiny/flow.csv | 1 - test/inputs/Tiny/flows-profiles.csv | 1 - test/inputs/Tiny/profiles-rep-periods.csv | 1 - test/inputs/Tiny/rep-periods-data.csv | 1 - test/inputs/Tiny/rep-periods-mapping.csv | 1 - test/inputs/Tiny/timeframe-data.csv | 1 - test/inputs/Tiny/year-data.csv | 1 - test/inputs/UC-ramping/asset-both.csv | 1 - test/inputs/UC-ramping/asset-commission.csv | 1 - test/inputs/UC-ramping/asset-milestone.csv | 1 - test/inputs/UC-ramping/asset.csv | 1 - test/inputs/UC-ramping/assets-profiles.csv | 1 - .../assets-rep-periods-partitions.csv | 1 - test/inputs/UC-ramping/flow-both.csv | 1 - test/inputs/UC-ramping/flow-commission.csv | 1 - test/inputs/UC-ramping/flow-milestone.csv | 1 - test/inputs/UC-ramping/flow.csv | 1 - test/inputs/UC-ramping/flows-profiles.csv | 1 - .../flows-rep-periods-partitions.csv | 1 - .../UC-ramping/profiles-rep-periods.csv | 1 - test/inputs/UC-ramping/rep-periods-data.csv | 1 - .../inputs/UC-ramping/rep-periods-mapping.csv | 1 - test/inputs/UC-ramping/timeframe-data.csv | 1 - test/inputs/UC-ramping/year-data.csv | 1 - .../inputs/Variable Resolution/asset-both.csv | 1 - .../Variable Resolution/asset-commission.csv | 1 - .../Variable Resolution/asset-milestone.csv | 1 - test/inputs/Variable Resolution/asset.csv | 1 - .../Variable Resolution/assets-profiles.csv | 1 - .../assets-rep-periods-partitions.csv | 1 - .../assets-timeframe-partitions.csv | 1 - .../assets-timeframe-profiles.csv | 1 - test/inputs/Variable Resolution/flow-both.csv | 1 - .../Variable Resolution/flow-commission.csv | 1 - .../Variable Resolution/flow-milestone.csv | 1 - test/inputs/Variable Resolution/flow.csv | 1 - .../Variable Resolution/flows-profiles.csv | 1 - .../flows-rep-periods-partitions.csv | 1 - .../flows-timeframe-partitions.csv | 1 - .../flows-timeframe-profiles.csv | 1 - .../profiles-rep-periods.csv | 1 - .../profiles-timeframe.csv | 1 - .../Variable Resolution/rep-periods-data.csv | 1 - .../rep-periods-mapping.csv | 1 - .../Variable Resolution/timeframe-data.csv | 1 - test/inputs/Variable Resolution/year-data.csv | 1 - 133 files changed, 114 insertions(+), 247 deletions(-) diff --git a/benchmark/EU/asset-both.csv b/benchmark/EU/asset-both.csv index 51a52324..43f8bef9 100644 --- a/benchmark/EU/asset-both.csv +++ b/benchmark/EU/asset-both.csv @@ -1,4 +1,3 @@ -,,,,,, asset,milestone_year,commission_year,active,decommissionable,initial_units,initial_storage_units NL_E_Balance,2030,2030,true,true,0.0,0.0 NL_E_Demand,2030,2030,true,true,0.0,0.0 diff --git a/benchmark/EU/asset-commission.csv b/benchmark/EU/asset-commission.csv index 5c1a8bac..ae7a3073 100644 --- a/benchmark/EU/asset-commission.csv +++ b/benchmark/EU/asset-commission.csv @@ -1,4 +1,3 @@ -,,,,,,, asset,commission_year,fixed_cost,investment_cost,investment_limit,fixed_cost_storage_energy,investment_cost_storage_energy,investment_limit_storage_energy NL_Wind_Offshore,2030,20.0,119.73261777406992,22940.0,5.0,0.0, BE_E_Demand,2030,20.0,0.0,,5.0,0.0, diff --git a/benchmark/EU/asset-milestone.csv b/benchmark/EU/asset-milestone.csv index 9a05d067..da126aab 100644 --- a/benchmark/EU/asset-milestone.csv +++ b/benchmark/EU/asset-milestone.csv @@ -1,4 +1,3 @@ -,,,,,,,, asset,milestone_year,investable,peak_demand,storage_inflows,initial_storage_level,min_energy_timeframe_partition,max_energy_timeframe_partition,units_on_cost NL_Wind_Offshore,2030,false,0.0,0.0,0.0,,, BE_E_Demand,2030,false,14380.34,0.0,0.0,,, diff --git a/benchmark/EU/asset.csv b/benchmark/EU/asset.csv index 33c89176..a6c86140 100644 --- a/benchmark/EU/asset.csv +++ b/benchmark/EU/asset.csv @@ -1,4 +1,3 @@ -,,,,,,,,,,,,,,,,,,,,,, asset,type,group,capacity,min_operating_point,investment_method,investment_integer,technical_lifetime,economic_lifetime,discount_rate,consumer_balance_sense,capacity_storage_energy,is_seasonal,use_binary_storage_method,unit_commitment,unit_commitment_method,unit_commitment_integer,ramping,storage_method_energy,energy_to_power_ratio,investment_integer_storage_energy,max_ramp_up,max_ramp_down AT_Battery,storage,,2469.0,,none,false,25,1,0.05,,7407.0,false,,false,,false,false,false,3.0,false,, AT_E_Balance,hub,,0.0,,none,false,25,1,0.05,,0.0,false,,false,,false,false,false,0.0,false,, diff --git a/benchmark/EU/assets-profiles.csv b/benchmark/EU/assets-profiles.csv index 47b08419..41628628 100644 --- a/benchmark/EU/assets-profiles.csv +++ b/benchmark/EU/assets-profiles.csv @@ -1,4 +1,3 @@ -,,type,name asset,commission_year,profile_type,profile_name NL_E_Demand,2030,demand,NL_E_Demand NL_Wind_Onshore,2030,availability,NL_Wind_Onshore diff --git a/benchmark/EU/assets-rep-periods-partitions.csv b/benchmark/EU/assets-rep-periods-partitions.csv index fecd7ef5..939e7d1a 100644 --- a/benchmark/EU/assets-rep-periods-partitions.csv +++ b/benchmark/EU/assets-rep-periods-partitions.csv @@ -1,4 +1,3 @@ -,,,{uniform;explicit;math}, asset,year,rep_period,specification,partition NL_E_Balance,2030,1,uniform,1 NL_E_Demand,2030,1,uniform,1 diff --git a/benchmark/EU/assets-timeframe-partitions.csv b/benchmark/EU/assets-timeframe-partitions.csv index 1d229201..5c262d96 100644 --- a/benchmark/EU/assets-timeframe-partitions.csv +++ b/benchmark/EU/assets-timeframe-partitions.csv @@ -1,2 +1 @@ -,,{uniform;explicit;math}, asset,year,specification,partition diff --git a/benchmark/EU/assets-timeframe-profiles.csv b/benchmark/EU/assets-timeframe-profiles.csv index 14b28d19..cd604680 100644 --- a/benchmark/EU/assets-timeframe-profiles.csv +++ b/benchmark/EU/assets-timeframe-profiles.csv @@ -1,2 +1 @@ -,,type,name asset,commission_year,profile_type,profile_name diff --git a/benchmark/EU/flow-both.csv b/benchmark/EU/flow-both.csv index 131d54dc..5b4b0598 100644 --- a/benchmark/EU/flow-both.csv +++ b/benchmark/EU/flow-both.csv @@ -1,4 +1,3 @@ -,,,,,,, from_asset,to_asset,milestone_year,commission_year,active,decommissionable,initial_export_units,initial_import_units NL_E_Balance,BE_E_Balance,2030,2030,true,true,3.4,2.4 NL_E_Balance,NL_E_Demand,2030,2030,true,true,0.0,0.0 diff --git a/benchmark/EU/flow-commission.csv b/benchmark/EU/flow-commission.csv index 4e28afa8..437e3a55 100644 --- a/benchmark/EU/flow-commission.csv +++ b/benchmark/EU/flow-commission.csv @@ -1,4 +1,3 @@ -,,,,,, from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit NL_E_ENS,NL_E_Demand,2030,0.0,0.0,1.0, DE_OCGT,DE_E_Balance,2030,0.0,0.0,1.0, diff --git a/benchmark/EU/flow-milestone.csv b/benchmark/EU/flow-milestone.csv index c0c83c23..26dda80a 100644 --- a/benchmark/EU/flow-milestone.csv +++ b/benchmark/EU/flow-milestone.csv @@ -1,4 +1,3 @@ -,,,, from_asset,to_asset,milestone_year,investable,variable_cost NL_E_ENS,NL_E_Demand,2030,false,1000.0 NL_Wind_Onshore,NL_E_Balance,2030,false,2.06 diff --git a/benchmark/EU/flow.csv b/benchmark/EU/flow.csv index 33931acc..d0723ef3 100644 --- a/benchmark/EU/flow.csv +++ b/benchmark/EU/flow.csv @@ -1,4 +1,3 @@ -,,,,,,,, from_asset,to_asset,carrier,is_transport,capacity,technical_lifetime,economic_lifetime,discount_rate,investment_integer NL_E_Balance,BE_E_Balance,electricity,true,1000.0,10,1,0.02,false DE_E_ENS,DE_E_Demand,electricity,false,1000.0,10,1,0.02,false diff --git a/benchmark/EU/flows-profiles.csv b/benchmark/EU/flows-profiles.csv index 9dcbacd6..7f47ac58 100644 --- a/benchmark/EU/flows-profiles.csv +++ b/benchmark/EU/flows-profiles.csv @@ -1,2 +1 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name diff --git a/benchmark/EU/flows-rep-periods-partitions.csv b/benchmark/EU/flows-rep-periods-partitions.csv index 1c48b0a0..617a9099 100644 --- a/benchmark/EU/flows-rep-periods-partitions.csv +++ b/benchmark/EU/flows-rep-periods-partitions.csv @@ -1,4 +1,3 @@ -,,,,{uniform;explicit;math}, from_asset,to_asset,year,rep_period,specification,partition NL_E_Balance,BE_E_Balance,2030,1,uniform,1 NL_E_Balance,NL_E_Demand,2030,1,uniform,1 diff --git a/benchmark/EU/flows-timeframe-partitions.csv b/benchmark/EU/flows-timeframe-partitions.csv index 05e8bbd2..1c7eff5f 100644 --- a/benchmark/EU/flows-timeframe-partitions.csv +++ b/benchmark/EU/flows-timeframe-partitions.csv @@ -1,2 +1 @@ -,,{uniform;explicit;math}, from_asset,to_asset,specification,partition diff --git a/benchmark/EU/flows-timeframe-profiles.csv b/benchmark/EU/flows-timeframe-profiles.csv index 9dcbacd6..7f47ac58 100644 --- a/benchmark/EU/flows-timeframe-profiles.csv +++ b/benchmark/EU/flows-timeframe-profiles.csv @@ -1,2 +1 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name diff --git a/benchmark/EU/profiles-rep-periods.csv b/benchmark/EU/profiles-rep-periods.csv index b0221ea6..fa31dec1 100644 --- a/benchmark/EU/profiles-rep-periods.csv +++ b/benchmark/EU/profiles-rep-periods.csv @@ -1,4 +1,3 @@ -,,,p.u. profile_name,year,rep_period,timestep,value NL_Wind_Onshore,2030,1,1,0.007717831 NL_Wind_Onshore,2030,1,2,0.006234769 diff --git a/benchmark/EU/profiles-timeframe.csv b/benchmark/EU/profiles-timeframe.csv index 2661df5d..82ff7a50 100644 --- a/benchmark/EU/profiles-timeframe.csv +++ b/benchmark/EU/profiles-timeframe.csv @@ -1,2 +1 @@ -,,,p.u. profile_name,year,period,value diff --git a/benchmark/EU/rep-periods-data.csv b/benchmark/EU/rep-periods-data.csv index 634429e3..3ed598b2 100644 --- a/benchmark/EU/rep-periods-data.csv +++ b/benchmark/EU/rep-periods-data.csv @@ -1,3 +1,2 @@ -,,hours,,hours year,rep_period,weight,num_timesteps,resolution 2030,1,1,8760,1.0 diff --git a/benchmark/EU/rep-periods-mapping.csv b/benchmark/EU/rep-periods-mapping.csv index f2c96a91..ed7321fd 100644 --- a/benchmark/EU/rep-periods-mapping.csv +++ b/benchmark/EU/rep-periods-mapping.csv @@ -1,3 +1,2 @@ -,,,p.u. year,period,rep_period,weight 2030,1,1,1.0 diff --git a/benchmark/EU/timeframe-data.csv b/benchmark/EU/timeframe-data.csv index a22d78f4..5013f3da 100644 --- a/benchmark/EU/timeframe-data.csv +++ b/benchmark/EU/timeframe-data.csv @@ -1,3 +1,2 @@ -,, year,period,num_timesteps 2030,1,8760 diff --git a/benchmark/EU/year-data.csv b/benchmark/EU/year-data.csv index 79ef081b..3a815eb1 100644 --- a/benchmark/EU/year-data.csv +++ b/benchmark/EU/year-data.csv @@ -1,3 +1,2 @@ -,h,{true;false} year,length,is_milestone 2030,8760,true diff --git a/test/inputs/Multi-year Investments/asset-both.csv b/test/inputs/Multi-year Investments/asset-both.csv index 0d9c1fbd..ffa96038 100644 --- a/test/inputs/Multi-year Investments/asset-both.csv +++ b/test/inputs/Multi-year Investments/asset-both.csv @@ -1,4 +1,3 @@ -,,,,,, asset,milestone_year,commission_year,active,decommissionable,initial_units,initial_storage_units ocgt,2030,2030,true,false,0.0,0.0 ccgt,2030,2028,true,true,1.0,0.0 diff --git a/test/inputs/Multi-year Investments/asset-commission.csv b/test/inputs/Multi-year Investments/asset-commission.csv index 6e3427d6..af9f2959 100644 --- a/test/inputs/Multi-year Investments/asset-commission.csv +++ b/test/inputs/Multi-year Investments/asset-commission.csv @@ -1,4 +1,3 @@ -,,,,,,, asset,commission_year,fixed_cost,investment_cost,investment_limit,fixed_cost_storage_energy,investment_cost_storage_energy,investment_limit_storage_energy wind,2020,20.0,70.0,,5.0,0.0, demand,2050,20.0,0.0,,5.0,0.0, diff --git a/test/inputs/Multi-year Investments/asset-milestone.csv b/test/inputs/Multi-year Investments/asset-milestone.csv index 19b4c887..59482fb7 100644 --- a/test/inputs/Multi-year Investments/asset-milestone.csv +++ b/test/inputs/Multi-year Investments/asset-milestone.csv @@ -1,4 +1,3 @@ -,,,,,,,, asset,milestone_year,investable,peak_demand,storage_inflows,initial_storage_level,min_energy_timeframe_partition,max_energy_timeframe_partition,units_on_cost ccgt,2030,true,0.0,0.0,0.0,,, wind,2030,true,0.0,0.0,0.0,,, diff --git a/test/inputs/Multi-year Investments/asset.csv b/test/inputs/Multi-year Investments/asset.csv index c631e9ca..72680fd0 100644 --- a/test/inputs/Multi-year Investments/asset.csv +++ b/test/inputs/Multi-year Investments/asset.csv @@ -1,4 +1,3 @@ -,,,,,,,,,,,,,,,,,,,,,, asset,type,group,capacity,min_operating_point,investment_method,investment_integer,technical_lifetime,economic_lifetime,discount_rate,consumer_balance_sense,capacity_storage_energy,is_seasonal,use_binary_storage_method,unit_commitment,unit_commitment_method,unit_commitment_integer,ramping,storage_method_energy,energy_to_power_ratio,investment_integer_storage_energy,max_ramp_up,max_ramp_down battery,storage,,50.0,,simple,true,30,10,0.05,,100.0,false,,false,,false,false,false,0.0,false,, ccgt,producer,,400.0,,compact,true,25,10,0.05,,0.0,false,,false,,false,false,false,0.0,false,, diff --git a/test/inputs/Multi-year Investments/assets-profiles.csv b/test/inputs/Multi-year Investments/assets-profiles.csv index c21700a0..54c03e83 100644 --- a/test/inputs/Multi-year Investments/assets-profiles.csv +++ b/test/inputs/Multi-year Investments/assets-profiles.csv @@ -1,4 +1,3 @@ -,,type,name asset,commission_year,profile_type,profile_name wind,2020,availability,availability-wind2020 wind,2030,availability,availability-wind2030 diff --git a/test/inputs/Multi-year Investments/flow-both.csv b/test/inputs/Multi-year Investments/flow-both.csv index ec9506f6..27046510 100644 --- a/test/inputs/Multi-year Investments/flow-both.csv +++ b/test/inputs/Multi-year Investments/flow-both.csv @@ -1,4 +1,3 @@ -,,,,,,, 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 diff --git a/test/inputs/Multi-year Investments/flow-commission.csv b/test/inputs/Multi-year Investments/flow-commission.csv index d82e85eb..afbcce6a 100644 --- a/test/inputs/Multi-year Investments/flow-commission.csv +++ b/test/inputs/Multi-year Investments/flow-commission.csv @@ -1,4 +1,3 @@ -,,,,,, from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit battery,demand,2030,0.0,350.0,0.95, wind,demand,2030,0.0,350.0,0.0, diff --git a/test/inputs/Multi-year Investments/flow-milestone.csv b/test/inputs/Multi-year Investments/flow-milestone.csv index 82a7711d..2d375f73 100644 --- a/test/inputs/Multi-year Investments/flow-milestone.csv +++ b/test/inputs/Multi-year Investments/flow-milestone.csv @@ -1,4 +1,3 @@ -,,,, from_asset,to_asset,milestone_year,investable,variable_cost battery,demand,2030,false,0.0 wind,demand,2030,false,0.001 diff --git a/test/inputs/Multi-year Investments/flow.csv b/test/inputs/Multi-year Investments/flow.csv index da6077fd..d5a13f14 100644 --- a/test/inputs/Multi-year Investments/flow.csv +++ b/test/inputs/Multi-year Investments/flow.csv @@ -1,4 +1,3 @@ -,,,,,,,, from_asset,to_asset,carrier,is_transport,capacity,technical_lifetime,economic_lifetime,discount_rate,investment_integer ens,demand,electricity,false,0.0,10,1,0.02,false ocgt,demand,electricity,false,0.0,10,1,0.02,false diff --git a/test/inputs/Multi-year Investments/flows-profiles.csv b/test/inputs/Multi-year Investments/flows-profiles.csv index 9dcbacd6..7f47ac58 100644 --- a/test/inputs/Multi-year Investments/flows-profiles.csv +++ b/test/inputs/Multi-year Investments/flows-profiles.csv @@ -1,2 +1 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name diff --git a/test/inputs/Multi-year Investments/initial-assets-data.csv b/test/inputs/Multi-year Investments/initial-assets-data.csv index 70f983aa..51ad5028 100644 --- a/test/inputs/Multi-year Investments/initial-assets-data.csv +++ b/test/inputs/Multi-year Investments/initial-assets-data.csv @@ -1,4 +1,3 @@ -,{true;false},,,{true;false},{true;false},kEUR/MW/year,MW,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,MWh,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,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,, diff --git a/test/inputs/Multi-year Investments/profiles-rep-periods.csv b/test/inputs/Multi-year Investments/profiles-rep-periods.csv index da6b300e..81b7215e 100644 --- a/test/inputs/Multi-year Investments/profiles-rep-periods.csv +++ b/test/inputs/Multi-year Investments/profiles-rep-periods.csv @@ -1,4 +1,3 @@ -,,,,p.u. profile_name,year,rep_period,timestep,value availability-wind2020,2030,1,1,0.11 availability-wind2020,2030,1,2,0.11 @@ -144,11 +143,11 @@ availability-wind2030,2030,3,21,0.74 availability-wind2030,2030,3,22,0.74 availability-wind2030,2030,3,23,0.74 availability-wind2030,2030,3,24,0.74 -availability-solar2030,2030,1,1,0 -availability-solar2030,2030,1,2,0 -availability-solar2030,2030,1,3,0 -availability-solar2030,2030,1,4,0 -availability-solar2030,2030,1,5,0 +availability-solar2030,2030,1,1,0.0 +availability-solar2030,2030,1,2,0.0 +availability-solar2030,2030,1,3,0.0 +availability-solar2030,2030,1,4,0.0 +availability-solar2030,2030,1,5,0.0 availability-solar2030,2030,1,6,0.02 availability-solar2030,2030,1,7,0.12 availability-solar2030,2030,1,8,0.3 @@ -163,17 +162,17 @@ availability-solar2030,2030,1,16,0.53 availability-solar2030,2030,1,17,0.35 availability-solar2030,2030,1,18,0.17 availability-solar2030,2030,1,19,0.04 -availability-solar2030,2030,1,20,0 -availability-solar2030,2030,1,21,0 -availability-solar2030,2030,1,22,0 -availability-solar2030,2030,1,23,0 -availability-solar2030,2030,1,24,0 -availability-solar2030,2030,2,1,0 -availability-solar2030,2030,2,2,0 -availability-solar2030,2030,2,3,0 -availability-solar2030,2030,2,4,0 -availability-solar2030,2030,2,5,0 -availability-solar2030,2030,2,6,0 +availability-solar2030,2030,1,20,0.0 +availability-solar2030,2030,1,21,0.0 +availability-solar2030,2030,1,22,0.0 +availability-solar2030,2030,1,23,0.0 +availability-solar2030,2030,1,24,0.0 +availability-solar2030,2030,2,1,0.0 +availability-solar2030,2030,2,2,0.0 +availability-solar2030,2030,2,3,0.0 +availability-solar2030,2030,2,4,0.0 +availability-solar2030,2030,2,5,0.0 +availability-solar2030,2030,2,6,0.0 availability-solar2030,2030,2,7,0.01 availability-solar2030,2030,2,8,0.07 availability-solar2030,2030,2,9,0.2 @@ -186,19 +185,19 @@ availability-solar2030,2030,2,15,0.44 availability-solar2030,2030,2,16,0.29 availability-solar2030,2030,2,17,0.13 availability-solar2030,2030,2,18,0.03 -availability-solar2030,2030,2,19,0 -availability-solar2030,2030,2,20,0 -availability-solar2030,2030,2,21,0 -availability-solar2030,2030,2,22,0 -availability-solar2030,2030,2,23,0 -availability-solar2030,2030,2,24,0 -availability-solar2030,2030,3,1,0 -availability-solar2030,2030,3,2,0 -availability-solar2030,2030,3,3,0 -availability-solar2030,2030,3,4,0 -availability-solar2030,2030,3,5,0 -availability-solar2030,2030,3,6,0 -availability-solar2030,2030,3,7,0 +availability-solar2030,2030,2,19,0.0 +availability-solar2030,2030,2,20,0.0 +availability-solar2030,2030,2,21,0.0 +availability-solar2030,2030,2,22,0.0 +availability-solar2030,2030,2,23,0.0 +availability-solar2030,2030,2,24,0.0 +availability-solar2030,2030,3,1,0.0 +availability-solar2030,2030,3,2,0.0 +availability-solar2030,2030,3,3,0.0 +availability-solar2030,2030,3,4,0.0 +availability-solar2030,2030,3,5,0.0 +availability-solar2030,2030,3,6,0.0 +availability-solar2030,2030,3,7,0.0 availability-solar2030,2030,3,8,0.01 availability-solar2030,2030,3,9,0.12 availability-solar2030,2030,3,10,0.28 @@ -209,13 +208,13 @@ availability-solar2030,2030,3,14,0.5 availability-solar2030,2030,3,15,0.4 availability-solar2030,2030,3,16,0.23 availability-solar2030,2030,3,17,0.05 -availability-solar2030,2030,3,18,0 -availability-solar2030,2030,3,19,0 -availability-solar2030,2030,3,20,0 -availability-solar2030,2030,3,21,0 -availability-solar2030,2030,3,22,0 -availability-solar2030,2030,3,23,0 -availability-solar2030,2030,3,24,0 +availability-solar2030,2030,3,18,0.0 +availability-solar2030,2030,3,19,0.0 +availability-solar2030,2030,3,20,0.0 +availability-solar2030,2030,3,21,0.0 +availability-solar2030,2030,3,22,0.0 +availability-solar2030,2030,3,23,0.0 +availability-solar2030,2030,3,24,0.0 demand-demand,2030,1,1,0.852017937 demand-demand,2030,1,2,0.780269058 demand-demand,2030,1,3,0.730044843 @@ -236,7 +235,7 @@ demand-demand,2030,1,17,0.86367713 demand-demand,2030,1,18,0.894170404 demand-demand,2030,1,19,0.980269058 demand-demand,2030,1,20,0.999103139 -demand-demand,2030,1,21,1 +demand-demand,2030,1,21,1.0 demand-demand,2030,1,22,0.992825112 demand-demand,2030,1,23,0.944394619 demand-demand,2030,1,24,0.928251121 @@ -260,7 +259,7 @@ demand-demand,2030,2,17,0.86367713 demand-demand,2030,2,18,0.894170404 demand-demand,2030,2,19,0.980269058 demand-demand,2030,2,20,0.999103139 -demand-demand,2030,2,21,1 +demand-demand,2030,2,21,1.0 demand-demand,2030,2,22,0.992825112 demand-demand,2030,2,23,0.944394619 demand-demand,2030,2,24,0.928251121 @@ -284,7 +283,7 @@ demand-demand,2030,3,17,0.86367713 demand-demand,2030,3,18,0.894170404 demand-demand,2030,3,19,0.980269058 demand-demand,2030,3,20,0.999103139 -demand-demand,2030,3,21,1 +demand-demand,2030,3,21,1.0 demand-demand,2030,3,22,0.992825112 demand-demand,2030,3,23,0.944394619 demand-demand,2030,3,24,0.9282511 @@ -432,11 +431,11 @@ availability-wind2050,2050,3,21,0.74 availability-wind2050,2050,3,22,0.74 availability-wind2050,2050,3,23,0.74 availability-wind2050,2050,3,24,0.74 -availability-solar2030,2050,1,1,0 -availability-solar2030,2050,1,2,0 -availability-solar2030,2050,1,3,0 -availability-solar2030,2050,1,4,0 -availability-solar2030,2050,1,5,0 +availability-solar2030,2050,1,1,0.0 +availability-solar2030,2050,1,2,0.0 +availability-solar2030,2050,1,3,0.0 +availability-solar2030,2050,1,4,0.0 +availability-solar2030,2050,1,5,0.0 availability-solar2030,2050,1,6,0.02 availability-solar2030,2050,1,7,0.12 availability-solar2030,2050,1,8,0.3 @@ -451,17 +450,17 @@ availability-solar2030,2050,1,16,0.53 availability-solar2030,2050,1,17,0.35 availability-solar2030,2050,1,18,0.17 availability-solar2030,2050,1,19,0.04 -availability-solar2030,2050,1,20,0 -availability-solar2030,2050,1,21,0 -availability-solar2030,2050,1,22,0 -availability-solar2030,2050,1,23,0 -availability-solar2030,2050,1,24,0 -availability-solar2030,2050,2,1,0 -availability-solar2030,2050,2,2,0 -availability-solar2030,2050,2,3,0 -availability-solar2030,2050,2,4,0 -availability-solar2030,2050,2,5,0 -availability-solar2030,2050,2,6,0 +availability-solar2030,2050,1,20,0.0 +availability-solar2030,2050,1,21,0.0 +availability-solar2030,2050,1,22,0.0 +availability-solar2030,2050,1,23,0.0 +availability-solar2030,2050,1,24,0.0 +availability-solar2030,2050,2,1,0.0 +availability-solar2030,2050,2,2,0.0 +availability-solar2030,2050,2,3,0.0 +availability-solar2030,2050,2,4,0.0 +availability-solar2030,2050,2,5,0.0 +availability-solar2030,2050,2,6,0.0 availability-solar2030,2050,2,7,0.01 availability-solar2030,2050,2,8,0.07 availability-solar2030,2050,2,9,0.2 @@ -474,19 +473,19 @@ availability-solar2030,2050,2,15,0.44 availability-solar2030,2050,2,16,0.29 availability-solar2030,2050,2,17,0.13 availability-solar2030,2050,2,18,0.03 -availability-solar2030,2050,2,19,0 -availability-solar2030,2050,2,20,0 -availability-solar2030,2050,2,21,0 -availability-solar2030,2050,2,22,0 -availability-solar2030,2050,2,23,0 -availability-solar2030,2050,2,24,0 -availability-solar2030,2050,3,1,0 -availability-solar2030,2050,3,2,0 -availability-solar2030,2050,3,3,0 -availability-solar2030,2050,3,4,0 -availability-solar2030,2050,3,5,0 -availability-solar2030,2050,3,6,0 -availability-solar2030,2050,3,7,0 +availability-solar2030,2050,2,19,0.0 +availability-solar2030,2050,2,20,0.0 +availability-solar2030,2050,2,21,0.0 +availability-solar2030,2050,2,22,0.0 +availability-solar2030,2050,2,23,0.0 +availability-solar2030,2050,2,24,0.0 +availability-solar2030,2050,3,1,0.0 +availability-solar2030,2050,3,2,0.0 +availability-solar2030,2050,3,3,0.0 +availability-solar2030,2050,3,4,0.0 +availability-solar2030,2050,3,5,0.0 +availability-solar2030,2050,3,6,0.0 +availability-solar2030,2050,3,7,0.0 availability-solar2030,2050,3,8,0.01 availability-solar2030,2050,3,9,0.12 availability-solar2030,2050,3,10,0.28 @@ -497,18 +496,18 @@ availability-solar2030,2050,3,14,0.5 availability-solar2030,2050,3,15,0.4 availability-solar2030,2050,3,16,0.23 availability-solar2030,2050,3,17,0.05 -availability-solar2030,2050,3,18,0 -availability-solar2030,2050,3,19,0 -availability-solar2030,2050,3,20,0 -availability-solar2030,2050,3,21,0 -availability-solar2030,2050,3,22,0 -availability-solar2030,2050,3,23,0 -availability-solar2030,2050,3,24,0 -availability-solar2050,2050,1,1,0 -availability-solar2050,2050,1,2,0 -availability-solar2050,2050,1,3,0 -availability-solar2050,2050,1,4,0 -availability-solar2050,2050,1,5,0 +availability-solar2030,2050,3,18,0.0 +availability-solar2030,2050,3,19,0.0 +availability-solar2030,2050,3,20,0.0 +availability-solar2030,2050,3,21,0.0 +availability-solar2030,2050,3,22,0.0 +availability-solar2030,2050,3,23,0.0 +availability-solar2030,2050,3,24,0.0 +availability-solar2050,2050,1,1,0.0 +availability-solar2050,2050,1,2,0.0 +availability-solar2050,2050,1,3,0.0 +availability-solar2050,2050,1,4,0.0 +availability-solar2050,2050,1,5,0.0 availability-solar2050,2050,1,6,0.02 availability-solar2050,2050,1,7,0.12 availability-solar2050,2050,1,8,0.3 @@ -523,17 +522,17 @@ availability-solar2050,2050,1,16,0.53 availability-solar2050,2050,1,17,0.35 availability-solar2050,2050,1,18,0.17 availability-solar2050,2050,1,19,0.04 -availability-solar2050,2050,1,20,0 -availability-solar2050,2050,1,21,0 -availability-solar2050,2050,1,22,0 -availability-solar2050,2050,1,23,0 -availability-solar2050,2050,1,24,0 -availability-solar2050,2050,2,1,0 -availability-solar2050,2050,2,2,0 -availability-solar2050,2050,2,3,0 -availability-solar2050,2050,2,4,0 -availability-solar2050,2050,2,5,0 -availability-solar2050,2050,2,6,0 +availability-solar2050,2050,1,20,0.0 +availability-solar2050,2050,1,21,0.0 +availability-solar2050,2050,1,22,0.0 +availability-solar2050,2050,1,23,0.0 +availability-solar2050,2050,1,24,0.0 +availability-solar2050,2050,2,1,0.0 +availability-solar2050,2050,2,2,0.0 +availability-solar2050,2050,2,3,0.0 +availability-solar2050,2050,2,4,0.0 +availability-solar2050,2050,2,5,0.0 +availability-solar2050,2050,2,6,0.0 availability-solar2050,2050,2,7,0.01 availability-solar2050,2050,2,8,0.07 availability-solar2050,2050,2,9,0.2 @@ -546,19 +545,19 @@ availability-solar2050,2050,2,15,0.44 availability-solar2050,2050,2,16,0.29 availability-solar2050,2050,2,17,0.13 availability-solar2050,2050,2,18,0.03 -availability-solar2050,2050,2,19,0 -availability-solar2050,2050,2,20,0 -availability-solar2050,2050,2,21,0 -availability-solar2050,2050,2,22,0 -availability-solar2050,2050,2,23,0 -availability-solar2050,2050,2,24,0 -availability-solar2050,2050,3,1,0 -availability-solar2050,2050,3,2,0 -availability-solar2050,2050,3,3,0 -availability-solar2050,2050,3,4,0 -availability-solar2050,2050,3,5,0 -availability-solar2050,2050,3,6,0 -availability-solar2050,2050,3,7,0 +availability-solar2050,2050,2,19,0.0 +availability-solar2050,2050,2,20,0.0 +availability-solar2050,2050,2,21,0.0 +availability-solar2050,2050,2,22,0.0 +availability-solar2050,2050,2,23,0.0 +availability-solar2050,2050,2,24,0.0 +availability-solar2050,2050,3,1,0.0 +availability-solar2050,2050,3,2,0.0 +availability-solar2050,2050,3,3,0.0 +availability-solar2050,2050,3,4,0.0 +availability-solar2050,2050,3,5,0.0 +availability-solar2050,2050,3,6,0.0 +availability-solar2050,2050,3,7,0.0 availability-solar2050,2050,3,8,0.01 availability-solar2050,2050,3,9,0.12 availability-solar2050,2050,3,10,0.28 @@ -569,13 +568,13 @@ availability-solar2050,2050,3,14,0.5 availability-solar2050,2050,3,15,0.4 availability-solar2050,2050,3,16,0.23 availability-solar2050,2050,3,17,0.05 -availability-solar2050,2050,3,18,0 -availability-solar2050,2050,3,19,0 -availability-solar2050,2050,3,20,0 -availability-solar2050,2050,3,21,0 -availability-solar2050,2050,3,22,0 -availability-solar2050,2050,3,23,0 -availability-solar2050,2050,3,24,0 +availability-solar2050,2050,3,18,0.0 +availability-solar2050,2050,3,19,0.0 +availability-solar2050,2050,3,20,0.0 +availability-solar2050,2050,3,21,0.0 +availability-solar2050,2050,3,22,0.0 +availability-solar2050,2050,3,23,0.0 +availability-solar2050,2050,3,24,0.0 demand-demand,2050,1,1,0.852017937 demand-demand,2050,1,2,0.780269058 demand-demand,2050,1,3,0.730044843 @@ -596,7 +595,7 @@ demand-demand,2050,1,17,0.86367713 demand-demand,2050,1,18,0.894170404 demand-demand,2050,1,19,0.980269058 demand-demand,2050,1,20,0.999103139 -demand-demand,2050,1,21,1 +demand-demand,2050,1,21,1.0 demand-demand,2050,1,22,0.992825112 demand-demand,2050,1,23,0.944394619 demand-demand,2050,1,24,0.928251121 @@ -620,7 +619,7 @@ demand-demand,2050,2,17,0.86367713 demand-demand,2050,2,18,0.894170404 demand-demand,2050,2,19,0.980269058 demand-demand,2050,2,20,0.999103139 -demand-demand,2050,2,21,1 +demand-demand,2050,2,21,1.0 demand-demand,2050,2,22,0.992825112 demand-demand,2050,2,23,0.944394619 demand-demand,2050,2,24,0.928251121 @@ -644,7 +643,7 @@ demand-demand,2050,3,17,0.86367713 demand-demand,2050,3,18,0.894170404 demand-demand,2050,3,19,0.980269058 demand-demand,2050,3,20,0.999103139 -demand-demand,2050,3,21,1 +demand-demand,2050,3,21,1.0 demand-demand,2050,3,22,0.992825112 demand-demand,2050,3,23,0.944394619 demand-demand,2050,3,24,0.9282511 diff --git a/test/inputs/Multi-year Investments/rep-periods-data.csv b/test/inputs/Multi-year Investments/rep-periods-data.csv index 8373c569..549f2734 100644 --- a/test/inputs/Multi-year Investments/rep-periods-data.csv +++ b/test/inputs/Multi-year Investments/rep-periods-data.csv @@ -1,4 +1,3 @@ -,,,hours year,rep_period,num_timesteps,resolution 2030,1,24,1.0 2030,2,24,1.0 diff --git a/test/inputs/Multi-year Investments/rep-periods-mapping.csv b/test/inputs/Multi-year Investments/rep-periods-mapping.csv index c93709a4..557bbbdf 100644 --- a/test/inputs/Multi-year Investments/rep-periods-mapping.csv +++ b/test/inputs/Multi-year Investments/rep-periods-mapping.csv @@ -1,4 +1,3 @@ -,,,p.u. year,period,rep_period,weight 2030,1,1,1.0 2030,2,1,1.0 diff --git a/test/inputs/Multi-year Investments/timeframe-data.csv b/test/inputs/Multi-year Investments/timeframe-data.csv index 99a812c2..b60b777c 100644 --- a/test/inputs/Multi-year Investments/timeframe-data.csv +++ b/test/inputs/Multi-year Investments/timeframe-data.csv @@ -1,4 +1,3 @@ -,, year,period,num_timesteps 2030,1,24 2030,2,24 diff --git a/test/inputs/Multi-year Investments/year-data.csv b/test/inputs/Multi-year Investments/year-data.csv index 46d17067..47e0bb97 100644 --- a/test/inputs/Multi-year Investments/year-data.csv +++ b/test/inputs/Multi-year Investments/year-data.csv @@ -1,4 +1,3 @@ -,h,{true;false} year,length,is_milestone 2020,8760,false 2028,8760,false diff --git a/test/inputs/Norse/asset-both.csv b/test/inputs/Norse/asset-both.csv index 61bb559b..8d9f5fe5 100644 --- a/test/inputs/Norse/asset-both.csv +++ b/test/inputs/Norse/asset-both.csv @@ -1,4 +1,3 @@ -,,,,,, 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 diff --git a/test/inputs/Norse/asset-commission.csv b/test/inputs/Norse/asset-commission.csv index 16d80622..3f14ace0 100644 --- a/test/inputs/Norse/asset-commission.csv +++ b/test/inputs/Norse/asset-commission.csv @@ -1,4 +1,3 @@ -,,,,,,, asset,commission_year,fixed_cost,investment_cost,investment_limit,fixed_cost_storage_energy,investment_cost_storage_energy,investment_limit_storage_energy Asgard_CCGT,2030,0.0,650.0,,5.0,0.0, Midgard_Wind,2030,0.0,1300.0,80000.0,5.0,0.0, diff --git a/test/inputs/Norse/asset-milestone.csv b/test/inputs/Norse/asset-milestone.csv index efb6b945..02656b33 100644 --- a/test/inputs/Norse/asset-milestone.csv +++ b/test/inputs/Norse/asset-milestone.csv @@ -1,4 +1,3 @@ -,,,,,,,, asset,milestone_year,investable,peak_demand,storage_inflows,initial_storage_level,min_energy_timeframe_partition,max_energy_timeframe_partition,units_on_cost Asgard_CCGT,2030,true,0.0,0.0,0.0,,,0.97 Midgard_Wind,2030,true,0.0,0.0,0.0,,4.5e6, diff --git a/test/inputs/Norse/asset.csv b/test/inputs/Norse/asset.csv index c9f4f8ad..427ccc68 100644 --- a/test/inputs/Norse/asset.csv +++ b/test/inputs/Norse/asset.csv @@ -1,4 +1,3 @@ -,,,,,,,,,,,,,,,,,,,,,, asset,type,group,capacity,min_operating_point,investment_method,investment_integer,technical_lifetime,economic_lifetime,discount_rate,consumer_balance_sense,capacity_storage_energy,is_seasonal,use_binary_storage_method,unit_commitment,unit_commitment_method,unit_commitment_integer,ramping,storage_method_energy,energy_to_power_ratio,investment_integer_storage_energy,max_ramp_up,max_ramp_down Asgard_Battery,storage,,100.0,,simple,true,15,1,0.05,,10.0,false,binary,false,,false,false,true,100.0,true,, Asgard_CCGT,conversion,ccgt,500.0,0.25,simple,true,15,1,0.05,,0.0,false,,true,basic,false,true,false,0.0,false,0.5,0.3 diff --git a/test/inputs/Norse/assets-profiles.csv b/test/inputs/Norse/assets-profiles.csv index c8df7194..1f07a3be 100644 --- a/test/inputs/Norse/assets-profiles.csv +++ b/test/inputs/Norse/assets-profiles.csv @@ -1,4 +1,3 @@ -,,type,name asset,commission_year,profile_type,profile_name Asgard_Solar,2030,availability,availability-Asgard_Solar Asgard_E_demand,2030,demand,demand-Asgard_E_demand diff --git a/test/inputs/Norse/assets-rep-periods-partitions.csv b/test/inputs/Norse/assets-rep-periods-partitions.csv index de0ce797..7d991ed1 100644 --- a/test/inputs/Norse/assets-rep-periods-partitions.csv +++ b/test/inputs/Norse/assets-rep-periods-partitions.csv @@ -1,4 +1,3 @@ -,,,{uniform;explicit;math}, asset,year,rep_period,specification,partition Asgard_Solar,2030,1,uniform,4 Asgard_E_demand,2030,1,explicit,7;7;7;21;21;21;21;21;21;21 diff --git a/test/inputs/Norse/assets-timeframe-partitions.csv b/test/inputs/Norse/assets-timeframe-partitions.csv index e9ca7c80..54d77d3a 100644 --- a/test/inputs/Norse/assets-timeframe-partitions.csv +++ b/test/inputs/Norse/assets-timeframe-partitions.csv @@ -1,4 +1,3 @@ -,,{uniform;explicit;math}, asset,year,specification,partition Midgard_Wind,2030,math,5x28+4x6+1x1+1x28+1x22 Midgard_Nuclear_SMR,2030,math,1x215 diff --git a/test/inputs/Norse/assets-timeframe-profiles.csv b/test/inputs/Norse/assets-timeframe-profiles.csv index e3a5d8ad..6f6ced20 100644 --- a/test/inputs/Norse/assets-timeframe-profiles.csv +++ b/test/inputs/Norse/assets-timeframe-profiles.csv @@ -1,4 +1,3 @@ -,,type,name asset,commission_year,profile_type,profile_name Midgard_Hydro,2030,max_storage_level,max_storage_level-Midgard_Hydro Midgard_Hydro,2030,min_storage_level,min_storage_level-Midgard_Hydro diff --git a/test/inputs/Norse/flow-both.csv b/test/inputs/Norse/flow-both.csv index 22c07c7d..fe510121 100644 --- a/test/inputs/Norse/flow-both.csv +++ b/test/inputs/Norse/flow-both.csv @@ -1,4 +1,3 @@ -,,,,,,, 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 diff --git a/test/inputs/Norse/flow-commission.csv b/test/inputs/Norse/flow-commission.csv index 3136c1d8..f359a18b 100644 --- a/test/inputs/Norse/flow-commission.csv +++ b/test/inputs/Norse/flow-commission.csv @@ -1,4 +1,3 @@ -,,,,,, from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit G_imports,Midgard_CCGT,2030,0.0,0.0,1.0,0.0 Midgard_E_demand,Midgard_Hydro,2030,0.0,0.0,0.7,0.0 diff --git a/test/inputs/Norse/flow-milestone.csv b/test/inputs/Norse/flow-milestone.csv index 7c7eec8a..79d5929d 100644 --- a/test/inputs/Norse/flow-milestone.csv +++ b/test/inputs/Norse/flow-milestone.csv @@ -1,4 +1,3 @@ -,,,, from_asset,to_asset,milestone_year,investable,variable_cost G_imports,Midgard_CCGT,2030,false,0.0015 Midgard_E_demand,Midgard_Hydro,2030,false,0.0 diff --git a/test/inputs/Norse/flow.csv b/test/inputs/Norse/flow.csv index fc22a81e..bb041df8 100644 --- a/test/inputs/Norse/flow.csv +++ b/test/inputs/Norse/flow.csv @@ -1,4 +1,3 @@ -,,,,,,,, from_asset,to_asset,carrier,is_transport,capacity,technical_lifetime,economic_lifetime,discount_rate,investment_integer Asgard_CCGT,Asgard_E_demand,electricity,false,0.0,10,1,0.02,false G_imports,Midgard_CCGT,gas,false,0.0,10,1,0.02,false diff --git a/test/inputs/Norse/flows-profiles.csv b/test/inputs/Norse/flows-profiles.csv index 1c7cec06..532342ca 100644 --- a/test/inputs/Norse/flows-profiles.csv +++ b/test/inputs/Norse/flows-profiles.csv @@ -1,3 +1,2 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name Asgard_E_demand,Valhalla_E_balance,2030,availability,availability-Asgard_Valhalla_flow diff --git a/test/inputs/Norse/flows-rep-periods-partitions.csv b/test/inputs/Norse/flows-rep-periods-partitions.csv index fa82f4a9..01ff85f7 100644 --- a/test/inputs/Norse/flows-rep-periods-partitions.csv +++ b/test/inputs/Norse/flows-rep-periods-partitions.csv @@ -1,4 +1,3 @@ -,,,,{uniform;explicit;math}, from_asset,to_asset,year,rep_period,specification,partition Asgard_Solar,Asgard_Battery,2030,2,math,4x3+3x4 Asgard_Solar,Asgard_E_demand,2030,2,math,3x4+4x3 diff --git a/test/inputs/Norse/group-asset.csv b/test/inputs/Norse/group-asset.csv index d1359d5c..e7b46e1f 100644 --- a/test/inputs/Norse/group-asset.csv +++ b/test/inputs/Norse/group-asset.csv @@ -1,4 +1,3 @@ -group_name,,{false; true},MW,MW name,milestone_year,invest_method,min_investment_limit,max_investment_limit renewables,2030,true,,40000 ccgt,2030,true,10000, diff --git a/test/inputs/Norse/profiles-rep-periods.csv b/test/inputs/Norse/profiles-rep-periods.csv index 163cf759..09aa0713 100644 --- a/test/inputs/Norse/profiles-rep-periods.csv +++ b/test/inputs/Norse/profiles-rep-periods.csv @@ -1,4 +1,3 @@ -,,,,p.u. profile_name,year,rep_period,timestep,value availability-Asgard_Solar,2030,1,1,0.0 availability-Asgard_Solar,2030,1,2,0.0 diff --git a/test/inputs/Norse/profiles-timeframe.csv b/test/inputs/Norse/profiles-timeframe.csv index 080add93..e13c3d63 100644 --- a/test/inputs/Norse/profiles-timeframe.csv +++ b/test/inputs/Norse/profiles-timeframe.csv @@ -1,4 +1,3 @@ -,,,p.u. profile_name,year,period,value max_energy-Midgard_Wind,2030,1,1.0 max_energy-Midgard_Wind,2030,2,1.0 diff --git a/test/inputs/Norse/rep-periods-data.csv b/test/inputs/Norse/rep-periods-data.csv index 7dcff03d..6e688d85 100644 --- a/test/inputs/Norse/rep-periods-data.csv +++ b/test/inputs/Norse/rep-periods-data.csv @@ -1,4 +1,3 @@ -,,,hours year,rep_period,num_timesteps,resolution 2030,1,168,1.0 2030,2,24,1.0 diff --git a/test/inputs/Norse/rep-periods-mapping.csv b/test/inputs/Norse/rep-periods-mapping.csv index dc1b57f7..3bef700c 100644 --- a/test/inputs/Norse/rep-periods-mapping.csv +++ b/test/inputs/Norse/rep-periods-mapping.csv @@ -1,4 +1,3 @@ -,,,p.u. year,period,rep_period,weight 2030,1,2,1.0 2030,2,2,1.0 diff --git a/test/inputs/Norse/timeframe-data.csv b/test/inputs/Norse/timeframe-data.csv index 5202d7b2..363fd021 100644 --- a/test/inputs/Norse/timeframe-data.csv +++ b/test/inputs/Norse/timeframe-data.csv @@ -1,4 +1,3 @@ -,, year,period,num_timesteps 2030,1,24 2030,2,24 diff --git a/test/inputs/Norse/year-data.csv b/test/inputs/Norse/year-data.csv index 79ef081b..3a815eb1 100644 --- a/test/inputs/Norse/year-data.csv +++ b/test/inputs/Norse/year-data.csv @@ -1,3 +1,2 @@ -,h,{true;false} year,length,is_milestone 2030,8760,true diff --git a/test/inputs/Storage/asset-both.csv b/test/inputs/Storage/asset-both.csv index 3323b073..3e749d20 100644 --- a/test/inputs/Storage/asset-both.csv +++ b/test/inputs/Storage/asset-both.csv @@ -1,4 +1,3 @@ -,,,,,, 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 diff --git a/test/inputs/Storage/asset-commission.csv b/test/inputs/Storage/asset-commission.csv index ab30a84e..ce83a62d 100644 --- a/test/inputs/Storage/asset-commission.csv +++ b/test/inputs/Storage/asset-commission.csv @@ -1,4 +1,3 @@ -,,,,,,, asset,commission_year,fixed_cost,investment_cost,investment_limit,fixed_cost_storage_energy,investment_cost_storage_energy,investment_limit_storage_energy ccgt,2030,0.0,0.0,,5.0,0.0, wind,2030,0.0,0.0,,5.0,0.0, diff --git a/test/inputs/Storage/asset-milestone.csv b/test/inputs/Storage/asset-milestone.csv index eaa42a10..578d9888 100644 --- a/test/inputs/Storage/asset-milestone.csv +++ b/test/inputs/Storage/asset-milestone.csv @@ -1,4 +1,3 @@ -,,,,,,,, asset,milestone_year,investable,peak_demand,storage_inflows,initial_storage_level,min_energy_timeframe_partition,max_energy_timeframe_partition,units_on_cost ccgt,2030,false,0.0,0.0,0.0,,, wind,2030,false,0.0,0.0,0.0,,, diff --git a/test/inputs/Storage/asset.csv b/test/inputs/Storage/asset.csv index 8dde1cb0..48a1573d 100644 --- a/test/inputs/Storage/asset.csv +++ b/test/inputs/Storage/asset.csv @@ -1,4 +1,3 @@ -,,,,,,,,,,,,,,,,,,,,,, asset,type,group,capacity,min_operating_point,investment_method,investment_integer,technical_lifetime,economic_lifetime,discount_rate,consumer_balance_sense,capacity_storage_energy,is_seasonal,use_binary_storage_method,unit_commitment,unit_commitment_method,unit_commitment_integer,ramping,storage_method_energy,energy_to_power_ratio,investment_integer_storage_energy,max_ramp_up,max_ramp_down battery,storage,,10.0,,none,false,15,1,0.05,,20.0,false,,false,,false,false,false,0.0,false,, ccgt,producer,,400.0,,none,false,15,1,0.05,,0.0,false,,false,,false,false,false,0.0,false,, diff --git a/test/inputs/Storage/assets-profiles.csv b/test/inputs/Storage/assets-profiles.csv index 0939ece9..50529d72 100644 --- a/test/inputs/Storage/assets-profiles.csv +++ b/test/inputs/Storage/assets-profiles.csv @@ -1,4 +1,3 @@ -,,type,name asset,commission_year,profile_type,profile_name wind,2030,availability,availability-wind solar,2030,availability,availability-solar diff --git a/test/inputs/Storage/assets-rep-periods-partitions.csv b/test/inputs/Storage/assets-rep-periods-partitions.csv index 336f35f8..e6e5b429 100644 --- a/test/inputs/Storage/assets-rep-periods-partitions.csv +++ b/test/inputs/Storage/assets-rep-periods-partitions.csv @@ -1,2 +1 @@ -,,,{uniform;explicit;math}, asset,year,rep_period,specification,partition diff --git a/test/inputs/Storage/assets-timeframe-partitions.csv b/test/inputs/Storage/assets-timeframe-partitions.csv index e8ff6a33..5a0bccaa 100644 --- a/test/inputs/Storage/assets-timeframe-partitions.csv +++ b/test/inputs/Storage/assets-timeframe-partitions.csv @@ -1,3 +1,2 @@ -,,{uniform;explicit;math}, asset,year,specification,partition phs,2030,uniform,1 diff --git a/test/inputs/Storage/assets-timeframe-profiles.csv b/test/inputs/Storage/assets-timeframe-profiles.csv index 14b28d19..cd604680 100644 --- a/test/inputs/Storage/assets-timeframe-profiles.csv +++ b/test/inputs/Storage/assets-timeframe-profiles.csv @@ -1,2 +1 @@ -,,type,name asset,commission_year,profile_type,profile_name diff --git a/test/inputs/Storage/flow-both.csv b/test/inputs/Storage/flow-both.csv index 9b4f43a2..57561b8d 100644 --- a/test/inputs/Storage/flow-both.csv +++ b/test/inputs/Storage/flow-both.csv @@ -1,4 +1,3 @@ -,,,,,,, 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 diff --git a/test/inputs/Storage/flow-commission.csv b/test/inputs/Storage/flow-commission.csv index aa75cfb6..3212297e 100644 --- a/test/inputs/Storage/flow-commission.csv +++ b/test/inputs/Storage/flow-commission.csv @@ -1,4 +1,3 @@ -,,,,,, from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit wind,demand,2030,0.0,0.0,0.0, battery,demand,2030,0.0,0.0,0.95, diff --git a/test/inputs/Storage/flow-milestone.csv b/test/inputs/Storage/flow-milestone.csv index 43d53c2f..9f0043b1 100644 --- a/test/inputs/Storage/flow-milestone.csv +++ b/test/inputs/Storage/flow-milestone.csv @@ -1,4 +1,3 @@ -,,,, from_asset,to_asset,milestone_year,investable,variable_cost wind,demand,2030,false,0.001 battery,demand,2030,false,0.0 diff --git a/test/inputs/Storage/flow.csv b/test/inputs/Storage/flow.csv index 7ea169c3..323900dc 100644 --- a/test/inputs/Storage/flow.csv +++ b/test/inputs/Storage/flow.csv @@ -1,4 +1,3 @@ -,,,,,,,, from_asset,to_asset,carrier,is_transport,capacity,technical_lifetime,economic_lifetime,discount_rate,investment_integer ens,demand,electricity,false,0.0,10,1,0.02,false ocgt,demand,electricity,false,0.0,10,1,0.02,false diff --git a/test/inputs/Storage/flows-profiles.csv b/test/inputs/Storage/flows-profiles.csv index 9dcbacd6..7f47ac58 100644 --- a/test/inputs/Storage/flows-profiles.csv +++ b/test/inputs/Storage/flows-profiles.csv @@ -1,2 +1 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name diff --git a/test/inputs/Storage/flows-rep-periods-partitions.csv b/test/inputs/Storage/flows-rep-periods-partitions.csv index 163dacd6..7f5bacc0 100644 --- a/test/inputs/Storage/flows-rep-periods-partitions.csv +++ b/test/inputs/Storage/flows-rep-periods-partitions.csv @@ -1,2 +1 @@ -,,,,{uniform;explicit;math}, from_asset,to_asset,year,rep_period,specification,partition diff --git a/test/inputs/Storage/profiles-rep-periods.csv b/test/inputs/Storage/profiles-rep-periods.csv index 847bfce6..df3247d8 100644 --- a/test/inputs/Storage/profiles-rep-periods.csv +++ b/test/inputs/Storage/profiles-rep-periods.csv @@ -1,4 +1,3 @@ -,,,,p.u. profile_name,year,rep_period,timestep,value availability-wind,2030,1,1,0.11 availability-wind,2030,1,2,0.11 diff --git a/test/inputs/Storage/profiles-timeframe.csv b/test/inputs/Storage/profiles-timeframe.csv index 2661df5d..82ff7a50 100644 --- a/test/inputs/Storage/profiles-timeframe.csv +++ b/test/inputs/Storage/profiles-timeframe.csv @@ -1,2 +1 @@ -,,,p.u. profile_name,year,period,value diff --git a/test/inputs/Storage/rep-periods-data.csv b/test/inputs/Storage/rep-periods-data.csv index aef43c7d..dc48292e 100644 --- a/test/inputs/Storage/rep-periods-data.csv +++ b/test/inputs/Storage/rep-periods-data.csv @@ -1,4 +1,3 @@ -,,,hours year,rep_period,num_timesteps,resolution 2030,1,24,1.0 2030,2,24,1.0 diff --git a/test/inputs/Storage/rep-periods-mapping.csv b/test/inputs/Storage/rep-periods-mapping.csv index ffe7d22e..66efc835 100644 --- a/test/inputs/Storage/rep-periods-mapping.csv +++ b/test/inputs/Storage/rep-periods-mapping.csv @@ -1,4 +1,3 @@ -,,,p.u. year,period,rep_period,weight 2030,1,1,0.0 2030,1,2,1.0 diff --git a/test/inputs/Storage/timeframe-data.csv b/test/inputs/Storage/timeframe-data.csv index 187b6104..07f863c9 100644 --- a/test/inputs/Storage/timeframe-data.csv +++ b/test/inputs/Storage/timeframe-data.csv @@ -1,4 +1,3 @@ -,, year,period,num_timesteps 2030,1,24 2030,2,24 diff --git a/test/inputs/Storage/year-data.csv b/test/inputs/Storage/year-data.csv index 79ef081b..3a815eb1 100644 --- a/test/inputs/Storage/year-data.csv +++ b/test/inputs/Storage/year-data.csv @@ -1,3 +1,2 @@ -,h,{true;false} year,length,is_milestone 2030,8760,true diff --git a/test/inputs/Tiny/asset-both.csv b/test/inputs/Tiny/asset-both.csv index a15773a8..c4fce275 100644 --- a/test/inputs/Tiny/asset-both.csv +++ b/test/inputs/Tiny/asset-both.csv @@ -1,4 +1,3 @@ -,,,,,, 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 diff --git a/test/inputs/Tiny/asset-commission.csv b/test/inputs/Tiny/asset-commission.csv index 02903d5d..ce919ce4 100644 --- a/test/inputs/Tiny/asset-commission.csv +++ b/test/inputs/Tiny/asset-commission.csv @@ -1,4 +1,3 @@ -,,,,,,, asset,commission_year,fixed_cost,investment_cost,investment_limit,fixed_cost_storage_energy,investment_cost_storage_energy,investment_limit_storage_energy ccgt,2030,0.0,40.0,10000.0,5.0,0.0, wind,2030,0.0,70.0,,5.0,0.0, diff --git a/test/inputs/Tiny/asset-milestone.csv b/test/inputs/Tiny/asset-milestone.csv index 444d7263..9835bfde 100644 --- a/test/inputs/Tiny/asset-milestone.csv +++ b/test/inputs/Tiny/asset-milestone.csv @@ -1,4 +1,3 @@ -,,,,,,,, asset,milestone_year,investable,peak_demand,storage_inflows,initial_storage_level,min_energy_timeframe_partition,max_energy_timeframe_partition,units_on_cost ccgt,2030,true,0.0,0.0,0.0,,, wind,2030,true,0.0,0.0,0.0,,, diff --git a/test/inputs/Tiny/asset.csv b/test/inputs/Tiny/asset.csv index 450d08c1..43783b8f 100644 --- a/test/inputs/Tiny/asset.csv +++ b/test/inputs/Tiny/asset.csv @@ -1,4 +1,3 @@ -,,,,,,,,,,,,,,,,,,,,,, asset,type,group,capacity,min_operating_point,investment_method,investment_integer,technical_lifetime,economic_lifetime,discount_rate,consumer_balance_sense,capacity_storage_energy,is_seasonal,use_binary_storage_method,unit_commitment,unit_commitment_method,unit_commitment_integer,ramping,storage_method_energy,energy_to_power_ratio,investment_integer_storage_energy,max_ramp_up,max_ramp_down ccgt,producer,,400.0,,simple,true,15,1,0.05,,0.0,false,,false,,false,false,false,0.0,false,, demand,consumer,,0.0,,none,false,15,1,0.05,,0.0,false,,false,,false,false,false,0.0,false,, diff --git a/test/inputs/Tiny/assets-profiles.csv b/test/inputs/Tiny/assets-profiles.csv index 0939ece9..50529d72 100644 --- a/test/inputs/Tiny/assets-profiles.csv +++ b/test/inputs/Tiny/assets-profiles.csv @@ -1,4 +1,3 @@ -,,type,name asset,commission_year,profile_type,profile_name wind,2030,availability,availability-wind solar,2030,availability,availability-solar diff --git a/test/inputs/Tiny/flow-both.csv b/test/inputs/Tiny/flow-both.csv index 7134b870..0e0e4cb2 100644 --- a/test/inputs/Tiny/flow-both.csv +++ b/test/inputs/Tiny/flow-both.csv @@ -1,4 +1,3 @@ -,,,,,,, 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 diff --git a/test/inputs/Tiny/flow-commission.csv b/test/inputs/Tiny/flow-commission.csv index a3147b19..070d3393 100644 --- a/test/inputs/Tiny/flow-commission.csv +++ b/test/inputs/Tiny/flow-commission.csv @@ -1,4 +1,3 @@ -,,,,,, from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit wind,demand,2030,0.0,0.0,0.0, ccgt,demand,2030,0.0,0.0,0.0, diff --git a/test/inputs/Tiny/flow-milestone.csv b/test/inputs/Tiny/flow-milestone.csv index aea41cd8..d65f935f 100644 --- a/test/inputs/Tiny/flow-milestone.csv +++ b/test/inputs/Tiny/flow-milestone.csv @@ -1,4 +1,3 @@ -,,,, from_asset,to_asset,milestone_year,investable,variable_cost wind,demand,2030,false,0.001 ccgt,demand,2030,false,0.05 diff --git a/test/inputs/Tiny/flow.csv b/test/inputs/Tiny/flow.csv index 0f6a8717..dd85b859 100644 --- a/test/inputs/Tiny/flow.csv +++ b/test/inputs/Tiny/flow.csv @@ -1,4 +1,3 @@ -,,,,,,,, from_asset,to_asset,carrier,is_transport,capacity,technical_lifetime,economic_lifetime,discount_rate,investment_integer ens,demand,electricity,false,0.0,10,1,0.02,false ocgt,demand,electricity,false,0.0,10,1,0.02,false diff --git a/test/inputs/Tiny/flows-profiles.csv b/test/inputs/Tiny/flows-profiles.csv index 9dcbacd6..7f47ac58 100644 --- a/test/inputs/Tiny/flows-profiles.csv +++ b/test/inputs/Tiny/flows-profiles.csv @@ -1,2 +1 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name diff --git a/test/inputs/Tiny/profiles-rep-periods.csv b/test/inputs/Tiny/profiles-rep-periods.csv index 847bfce6..df3247d8 100644 --- a/test/inputs/Tiny/profiles-rep-periods.csv +++ b/test/inputs/Tiny/profiles-rep-periods.csv @@ -1,4 +1,3 @@ -,,,,p.u. profile_name,year,rep_period,timestep,value availability-wind,2030,1,1,0.11 availability-wind,2030,1,2,0.11 diff --git a/test/inputs/Tiny/rep-periods-data.csv b/test/inputs/Tiny/rep-periods-data.csv index aef43c7d..dc48292e 100644 --- a/test/inputs/Tiny/rep-periods-data.csv +++ b/test/inputs/Tiny/rep-periods-data.csv @@ -1,4 +1,3 @@ -,,,hours year,rep_period,num_timesteps,resolution 2030,1,24,1.0 2030,2,24,1.0 diff --git a/test/inputs/Tiny/rep-periods-mapping.csv b/test/inputs/Tiny/rep-periods-mapping.csv index e5da1a63..968ff41f 100644 --- a/test/inputs/Tiny/rep-periods-mapping.csv +++ b/test/inputs/Tiny/rep-periods-mapping.csv @@ -1,4 +1,3 @@ -,,,p.u. year,period,rep_period,weight 2030,1,1,1.0 2030,2,1,1.0 diff --git a/test/inputs/Tiny/timeframe-data.csv b/test/inputs/Tiny/timeframe-data.csv index ff8a1351..3eb73a20 100644 --- a/test/inputs/Tiny/timeframe-data.csv +++ b/test/inputs/Tiny/timeframe-data.csv @@ -1,4 +1,3 @@ -,, year,period,num_timesteps 2030,1,24 2030,2,24 diff --git a/test/inputs/Tiny/year-data.csv b/test/inputs/Tiny/year-data.csv index 79ef081b..3a815eb1 100644 --- a/test/inputs/Tiny/year-data.csv +++ b/test/inputs/Tiny/year-data.csv @@ -1,3 +1,2 @@ -,h,{true;false} year,length,is_milestone 2030,8760,true diff --git a/test/inputs/UC-ramping/asset-both.csv b/test/inputs/UC-ramping/asset-both.csv index ea44cbe6..1c645bf1 100644 --- a/test/inputs/UC-ramping/asset-both.csv +++ b/test/inputs/UC-ramping/asset-both.csv @@ -1,4 +1,3 @@ -,,,,,, 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 diff --git a/test/inputs/UC-ramping/asset-commission.csv b/test/inputs/UC-ramping/asset-commission.csv index 0480756a..7737b8da 100644 --- a/test/inputs/UC-ramping/asset-commission.csv +++ b/test/inputs/UC-ramping/asset-commission.csv @@ -1,4 +1,3 @@ -,,,,,,, asset,commission_year,fixed_cost,investment_cost,investment_limit,fixed_cost_storage_energy,investment_cost_storage_energy,investment_limit_storage_energy ccgt,2030,0.0,40.0,10000.0,5.0,0.0, wind,2030,0.0,100.0,,5.0,0.0, diff --git a/test/inputs/UC-ramping/asset-milestone.csv b/test/inputs/UC-ramping/asset-milestone.csv index 81ed6c4a..d7ae1241 100644 --- a/test/inputs/UC-ramping/asset-milestone.csv +++ b/test/inputs/UC-ramping/asset-milestone.csv @@ -1,4 +1,3 @@ -,,,,,,,, asset,milestone_year,investable,peak_demand,storage_inflows,initial_storage_level,min_energy_timeframe_partition,max_energy_timeframe_partition,units_on_cost ccgt,2030,true,0.0,0.0,0.0,,,0.45 wind,2030,true,0.0,0.0,0.0,,, diff --git a/test/inputs/UC-ramping/asset.csv b/test/inputs/UC-ramping/asset.csv index 84899572..6e00a111 100644 --- a/test/inputs/UC-ramping/asset.csv +++ b/test/inputs/UC-ramping/asset.csv @@ -1,4 +1,3 @@ -,,,,,,,,,,,,,,,,,,,,,, asset,type,group,capacity,min_operating_point,investment_method,investment_integer,technical_lifetime,economic_lifetime,discount_rate,consumer_balance_sense,capacity_storage_energy,is_seasonal,use_binary_storage_method,unit_commitment,unit_commitment_method,unit_commitment_integer,ramping,storage_method_energy,energy_to_power_ratio,investment_integer_storage_energy,max_ramp_up,max_ramp_down ccgt,conversion,,200.0,0.25,simple,true,15,1,0.05,,0.0,false,,true,basic,true,true,false,0.0,false,0.3,0.4 demand,consumer,,0.0,,none,false,15,1,0.05,,0.0,false,,false,,false,false,false,0.0,false,, diff --git a/test/inputs/UC-ramping/assets-profiles.csv b/test/inputs/UC-ramping/assets-profiles.csv index 0939ece9..50529d72 100644 --- a/test/inputs/UC-ramping/assets-profiles.csv +++ b/test/inputs/UC-ramping/assets-profiles.csv @@ -1,4 +1,3 @@ -,,type,name asset,commission_year,profile_type,profile_name wind,2030,availability,availability-wind solar,2030,availability,availability-solar diff --git a/test/inputs/UC-ramping/assets-rep-periods-partitions.csv b/test/inputs/UC-ramping/assets-rep-periods-partitions.csv index 38f732d3..69651648 100644 --- a/test/inputs/UC-ramping/assets-rep-periods-partitions.csv +++ b/test/inputs/UC-ramping/assets-rep-periods-partitions.csv @@ -1,4 +1,3 @@ -,,,{uniform;explicit;math}, asset,year,rep_period,specification,partition ccgt,2030,1,uniform,3 smr,2030,1,uniform,6 diff --git a/test/inputs/UC-ramping/flow-both.csv b/test/inputs/UC-ramping/flow-both.csv index 34dbb383..ee2e93f0 100644 --- a/test/inputs/UC-ramping/flow-both.csv +++ b/test/inputs/UC-ramping/flow-both.csv @@ -1,4 +1,3 @@ -,,,,,,, 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 diff --git a/test/inputs/UC-ramping/flow-commission.csv b/test/inputs/UC-ramping/flow-commission.csv index 1d9b326f..14266b05 100644 --- a/test/inputs/UC-ramping/flow-commission.csv +++ b/test/inputs/UC-ramping/flow-commission.csv @@ -1,4 +1,3 @@ -,,,,,, from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit wind,demand,2030,0.0,0.0,0.0, ccgt,demand,2030,0.0,0.0,0.5, diff --git a/test/inputs/UC-ramping/flow-milestone.csv b/test/inputs/UC-ramping/flow-milestone.csv index 3a03beb1..c4efea52 100644 --- a/test/inputs/UC-ramping/flow-milestone.csv +++ b/test/inputs/UC-ramping/flow-milestone.csv @@ -1,4 +1,3 @@ -,,,, from_asset,to_asset,milestone_year,investable,variable_cost wind,demand,2030,false,0.001 ccgt,demand,2030,false,0.05 diff --git a/test/inputs/UC-ramping/flow.csv b/test/inputs/UC-ramping/flow.csv index 3c54a21c..0afa0aba 100644 --- a/test/inputs/UC-ramping/flow.csv +++ b/test/inputs/UC-ramping/flow.csv @@ -1,4 +1,3 @@ -,,,,,,,, from_asset,to_asset,carrier,is_transport,capacity,technical_lifetime,economic_lifetime,discount_rate,investment_integer ens,demand,electricity,false,0.0,10,1,0.02,false gas,ccgt,electricity,false,0.0,10,1,0.02,false diff --git a/test/inputs/UC-ramping/flows-profiles.csv b/test/inputs/UC-ramping/flows-profiles.csv index 9dcbacd6..7f47ac58 100644 --- a/test/inputs/UC-ramping/flows-profiles.csv +++ b/test/inputs/UC-ramping/flows-profiles.csv @@ -1,2 +1 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name diff --git a/test/inputs/UC-ramping/flows-rep-periods-partitions.csv b/test/inputs/UC-ramping/flows-rep-periods-partitions.csv index a9f01c0d..2af69b06 100644 --- a/test/inputs/UC-ramping/flows-rep-periods-partitions.csv +++ b/test/inputs/UC-ramping/flows-rep-periods-partitions.csv @@ -1,4 +1,3 @@ -,,,,{uniform;explicit;math}, from_asset,to_asset,year,rep_period,specification,partition gas,ccgt,2030,1,uniform,2 ccgt,demand,2030,1,uniform,2 diff --git a/test/inputs/UC-ramping/profiles-rep-periods.csv b/test/inputs/UC-ramping/profiles-rep-periods.csv index 52c7f56a..476cd4a4 100644 --- a/test/inputs/UC-ramping/profiles-rep-periods.csv +++ b/test/inputs/UC-ramping/profiles-rep-periods.csv @@ -1,4 +1,3 @@ -,,,,p.u. profile_name,year,rep_period,timestep,value availability-wind,2030,1,1,0.164 availability-wind,2030,1,2,0.152 diff --git a/test/inputs/UC-ramping/rep-periods-data.csv b/test/inputs/UC-ramping/rep-periods-data.csv index 74acbb1f..7b6f64b1 100644 --- a/test/inputs/UC-ramping/rep-periods-data.csv +++ b/test/inputs/UC-ramping/rep-periods-data.csv @@ -1,3 +1,2 @@ -,,,hours year,rep_period,num_timesteps,resolution 2030,1,24,1.0 diff --git a/test/inputs/UC-ramping/rep-periods-mapping.csv b/test/inputs/UC-ramping/rep-periods-mapping.csv index 58abee28..7df12416 100644 --- a/test/inputs/UC-ramping/rep-periods-mapping.csv +++ b/test/inputs/UC-ramping/rep-periods-mapping.csv @@ -1,4 +1,3 @@ -,,,p.u. year,period,rep_period,weight 2030,1,1,1.0 2030,2,1,1.0 diff --git a/test/inputs/UC-ramping/timeframe-data.csv b/test/inputs/UC-ramping/timeframe-data.csv index ff8a1351..3eb73a20 100644 --- a/test/inputs/UC-ramping/timeframe-data.csv +++ b/test/inputs/UC-ramping/timeframe-data.csv @@ -1,4 +1,3 @@ -,, year,period,num_timesteps 2030,1,24 2030,2,24 diff --git a/test/inputs/UC-ramping/year-data.csv b/test/inputs/UC-ramping/year-data.csv index 79ef081b..3a815eb1 100644 --- a/test/inputs/UC-ramping/year-data.csv +++ b/test/inputs/UC-ramping/year-data.csv @@ -1,3 +1,2 @@ -,h,{true;false} year,length,is_milestone 2030,8760,true diff --git a/test/inputs/Variable Resolution/asset-both.csv b/test/inputs/Variable Resolution/asset-both.csv index 25437108..05d9273e 100644 --- a/test/inputs/Variable Resolution/asset-both.csv +++ b/test/inputs/Variable Resolution/asset-both.csv @@ -1,4 +1,3 @@ -,,,,,, 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 diff --git a/test/inputs/Variable Resolution/asset-commission.csv b/test/inputs/Variable Resolution/asset-commission.csv index 353a137d..4844fe61 100644 --- a/test/inputs/Variable Resolution/asset-commission.csv +++ b/test/inputs/Variable Resolution/asset-commission.csv @@ -1,4 +1,3 @@ -,,,,,,, asset,commission_year,fixed_cost,investment_cost,investment_limit,fixed_cost_storage_energy,investment_cost_storage_energy,investment_limit_storage_energy ccgt,2030,0.0,0.0,,5.0,0.0, wind,2030,0.0,0.0,,5.0,0.0, diff --git a/test/inputs/Variable Resolution/asset-milestone.csv b/test/inputs/Variable Resolution/asset-milestone.csv index 0ff42772..2918db03 100644 --- a/test/inputs/Variable Resolution/asset-milestone.csv +++ b/test/inputs/Variable Resolution/asset-milestone.csv @@ -1,4 +1,3 @@ -,,,,,,,, asset,milestone_year,investable,peak_demand,storage_inflows,initial_storage_level,min_energy_timeframe_partition,max_energy_timeframe_partition,units_on_cost ccgt,2030,false,0.0,0.0,0.0,,, wind,2030,false,0.0,0.0,0.0,,, diff --git a/test/inputs/Variable Resolution/asset.csv b/test/inputs/Variable Resolution/asset.csv index 30a04ffc..1ee3b472 100644 --- a/test/inputs/Variable Resolution/asset.csv +++ b/test/inputs/Variable Resolution/asset.csv @@ -1,4 +1,3 @@ -,,,,,,,,,,,,,,,,,,,,,, asset,type,group,capacity,min_operating_point,investment_method,investment_integer,technical_lifetime,economic_lifetime,discount_rate,consumer_balance_sense,capacity_storage_energy,is_seasonal,use_binary_storage_method,unit_commitment,unit_commitment_method,unit_commitment_integer,ramping,storage_method_energy,energy_to_power_ratio,investment_integer_storage_energy,max_ramp_up,max_ramp_down H2,producer,,400.0,,none,false,15,1,0.05,,0.0,false,,false,,false,false,false,0.0,false,, balance,hub,,0.0,,none,false,15,1,0.05,,0.0,false,,false,,false,false,false,0.0,false,, diff --git a/test/inputs/Variable Resolution/assets-profiles.csv b/test/inputs/Variable Resolution/assets-profiles.csv index b6903400..a0d77ae0 100644 --- a/test/inputs/Variable Resolution/assets-profiles.csv +++ b/test/inputs/Variable Resolution/assets-profiles.csv @@ -1,4 +1,3 @@ -,,type,name asset,commission_year,profile_type,profile_name wind,2030,availability,availability-wind demand,2030,demand,demand-demand diff --git a/test/inputs/Variable Resolution/assets-rep-periods-partitions.csv b/test/inputs/Variable Resolution/assets-rep-periods-partitions.csv index a1141e09..1a782b9e 100644 --- a/test/inputs/Variable Resolution/assets-rep-periods-partitions.csv +++ b/test/inputs/Variable Resolution/assets-rep-periods-partitions.csv @@ -1,4 +1,3 @@ -,,,{uniform;explicit;math}, asset,year,rep_period,specification,partition H2,2030,1,uniform,6 wind,2030,1,uniform,6 diff --git a/test/inputs/Variable Resolution/assets-timeframe-partitions.csv b/test/inputs/Variable Resolution/assets-timeframe-partitions.csv index 1d229201..5c262d96 100644 --- a/test/inputs/Variable Resolution/assets-timeframe-partitions.csv +++ b/test/inputs/Variable Resolution/assets-timeframe-partitions.csv @@ -1,2 +1 @@ -,,{uniform;explicit;math}, asset,year,specification,partition diff --git a/test/inputs/Variable Resolution/assets-timeframe-profiles.csv b/test/inputs/Variable Resolution/assets-timeframe-profiles.csv index 14b28d19..cd604680 100644 --- a/test/inputs/Variable Resolution/assets-timeframe-profiles.csv +++ b/test/inputs/Variable Resolution/assets-timeframe-profiles.csv @@ -1,2 +1 @@ -,,type,name asset,commission_year,profile_type,profile_name diff --git a/test/inputs/Variable Resolution/flow-both.csv b/test/inputs/Variable Resolution/flow-both.csv index 3df1cc10..76eb35d1 100644 --- a/test/inputs/Variable Resolution/flow-both.csv +++ b/test/inputs/Variable Resolution/flow-both.csv @@ -1,4 +1,3 @@ -,,,,,,, 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 diff --git a/test/inputs/Variable Resolution/flow-commission.csv b/test/inputs/Variable Resolution/flow-commission.csv index 7f866b0c..b2c21f17 100644 --- a/test/inputs/Variable Resolution/flow-commission.csv +++ b/test/inputs/Variable Resolution/flow-commission.csv @@ -1,4 +1,3 @@ -,,,,,, from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit H2,ccgt,2030,0.0,0.0,1.0, wind,phs,2030,0.0,0.0,0.9, diff --git a/test/inputs/Variable Resolution/flow-milestone.csv b/test/inputs/Variable Resolution/flow-milestone.csv index 441a06a6..f5727d23 100644 --- a/test/inputs/Variable Resolution/flow-milestone.csv +++ b/test/inputs/Variable Resolution/flow-milestone.csv @@ -1,4 +1,3 @@ -,,,, from_asset,to_asset,milestone_year,investable,variable_cost H2,ccgt,2030,false,0.01 wind,phs,2030,false,0.002 diff --git a/test/inputs/Variable Resolution/flow.csv b/test/inputs/Variable Resolution/flow.csv index ccbc54dc..dee3d3c1 100644 --- a/test/inputs/Variable Resolution/flow.csv +++ b/test/inputs/Variable Resolution/flow.csv @@ -1,4 +1,3 @@ -,,,,,,,, from_asset,to_asset,carrier,is_transport,capacity,technical_lifetime,economic_lifetime,discount_rate,investment_integer phs,balance,electricity,false,0.0,10,1,0.02,false H2,ccgt,hydrogen,false,0.0,10,1,0.02,false diff --git a/test/inputs/Variable Resolution/flows-profiles.csv b/test/inputs/Variable Resolution/flows-profiles.csv index 9dcbacd6..7f47ac58 100644 --- a/test/inputs/Variable Resolution/flows-profiles.csv +++ b/test/inputs/Variable Resolution/flows-profiles.csv @@ -1,2 +1 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name diff --git a/test/inputs/Variable Resolution/flows-rep-periods-partitions.csv b/test/inputs/Variable Resolution/flows-rep-periods-partitions.csv index b23187d2..029c9e70 100644 --- a/test/inputs/Variable Resolution/flows-rep-periods-partitions.csv +++ b/test/inputs/Variable Resolution/flows-rep-periods-partitions.csv @@ -1,4 +1,3 @@ -,,,,{uniform;explicit;math}, from_asset,to_asset,year,rep_period,specification,partition H2,ccgt,2030,1,uniform,6 wind,balance,2030,1,math,1x2+1x4 diff --git a/test/inputs/Variable Resolution/flows-timeframe-partitions.csv b/test/inputs/Variable Resolution/flows-timeframe-partitions.csv index 05e8bbd2..1c7eff5f 100644 --- a/test/inputs/Variable Resolution/flows-timeframe-partitions.csv +++ b/test/inputs/Variable Resolution/flows-timeframe-partitions.csv @@ -1,2 +1 @@ -,,{uniform;explicit;math}, from_asset,to_asset,specification,partition diff --git a/test/inputs/Variable Resolution/flows-timeframe-profiles.csv b/test/inputs/Variable Resolution/flows-timeframe-profiles.csv index 9dcbacd6..7f47ac58 100644 --- a/test/inputs/Variable Resolution/flows-timeframe-profiles.csv +++ b/test/inputs/Variable Resolution/flows-timeframe-profiles.csv @@ -1,2 +1 @@ -,,,type,name from_asset,to_asset,year,profile_type,profile_name diff --git a/test/inputs/Variable Resolution/profiles-rep-periods.csv b/test/inputs/Variable Resolution/profiles-rep-periods.csv index eca51aae..bbee192f 100644 --- a/test/inputs/Variable Resolution/profiles-rep-periods.csv +++ b/test/inputs/Variable Resolution/profiles-rep-periods.csv @@ -1,4 +1,3 @@ -,,,,p.u. profile_name,year,rep_period,timestep,value availability-wind,2030,1,1,0.11 availability-wind,2030,1,2,0.11 diff --git a/test/inputs/Variable Resolution/profiles-timeframe.csv b/test/inputs/Variable Resolution/profiles-timeframe.csv index 2661df5d..82ff7a50 100644 --- a/test/inputs/Variable Resolution/profiles-timeframe.csv +++ b/test/inputs/Variable Resolution/profiles-timeframe.csv @@ -1,2 +1 @@ -,,,p.u. profile_name,year,period,value diff --git a/test/inputs/Variable Resolution/rep-periods-data.csv b/test/inputs/Variable Resolution/rep-periods-data.csv index 7f279778..57b1b1aa 100644 --- a/test/inputs/Variable Resolution/rep-periods-data.csv +++ b/test/inputs/Variable Resolution/rep-periods-data.csv @@ -1,3 +1,2 @@ -,,,hours year,rep_period,num_timesteps,resolution 2030,1,6,1.0 diff --git a/test/inputs/Variable Resolution/rep-periods-mapping.csv b/test/inputs/Variable Resolution/rep-periods-mapping.csv index f2c96a91..ed7321fd 100644 --- a/test/inputs/Variable Resolution/rep-periods-mapping.csv +++ b/test/inputs/Variable Resolution/rep-periods-mapping.csv @@ -1,3 +1,2 @@ -,,,p.u. year,period,rep_period,weight 2030,1,1,1.0 diff --git a/test/inputs/Variable Resolution/timeframe-data.csv b/test/inputs/Variable Resolution/timeframe-data.csv index d8e882ea..b4eb3028 100644 --- a/test/inputs/Variable Resolution/timeframe-data.csv +++ b/test/inputs/Variable Resolution/timeframe-data.csv @@ -1,3 +1,2 @@ -,, year,period,num_timesteps 2030,1,6 diff --git a/test/inputs/Variable Resolution/year-data.csv b/test/inputs/Variable Resolution/year-data.csv index 79ef081b..3a815eb1 100644 --- a/test/inputs/Variable Resolution/year-data.csv +++ b/test/inputs/Variable Resolution/year-data.csv @@ -1,3 +1,2 @@ -,h,{true;false} year,length,is_milestone 2030,8760,true