Skip to content

Commit

Permalink
Update exmaples
Browse files Browse the repository at this point in the history
  • Loading branch information
@simnh
simnh committed Feb 28, 2019
1 parent 4c1f04f commit 5443a44
Show file tree
Hide file tree
Showing 17 changed files with 427 additions and 364 deletions.
8 changes: 4 additions & 4 deletions src/oemof/tabular/examples/datapackages/dispatch/data/elements/dispatchable.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name;type;capacity;capacity_cost;bus;marginal_cost;profile;output_parameters;carrier;tech
gas;dispatchable;100;;bus1;40;;{"summed_max": 2000};gas;gt
coal;dispatchable;100;;bus0;40;;{};coal;st
lignite;dispatchable;50;;bus0;20;;{};lignite;st
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;profile;output_parameters;carrier;tech
gas;dispatchable;gas;octg;100;;bus1;40;;{"summed_max": 2000};gas;gt
coal;dispatchable;coal;st;100;;bus0;40;;{};coal;st
lignite;dispatchable;lignite;st;50;;bus0;20;;{};lignite;st
6 changes: 3 additions & 3 deletions src/oemof/tabular/examples/datapackages/dispatch/data/elements/storage.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name,storage_capacity,capacity,capacity_cost,capacity_ratio,storage_capacity_initial,type,bus
el-storage1,100,10,10,0.2,0.5,storage,bus0
el-storage2,200,20,15,0.2,0.2,storage,bus0
name,carrier,tech,storage_capacity,capacity,capacity_cost,capacity_ratio,storage_capacity_initial,type,bus
el-storage1,lithium,battery,100,10,10,0.2,0.5,storage,bus0
el-storage2,lithium,battery,200,20,15,0.2,0.2,storage,bus0
6 changes: 3 additions & 3 deletions src/oemof/tabular/examples/datapackages/dispatch/data/elements/volatile.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name;type;capacity;capacity_cost;bus;marginal_cost;profile;output_parameters
wind;volatile;50;;bus0;0;wind-profile;{}
pv;volatile;20;;bus1;0;pv-profile;{}
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;profile;output_parameters
wind;volatile;wind;onshore;50;;bus0;0;wind-profile;{}
pv;volatile;solar;pv;20;;bus1;0;pv-profile;{}
32 changes: 31 additions & 1 deletion src/oemof/tabular/examples/datapackages/dispatch/datapackage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@
"name": "type",
"format": "default"
},
{
"type": "string",
"name": "carrier",
"format": "default"
},
{
"type": "string",
"name": "tech",
"format": "default"
},
{
"type": "integer",
"name": "capacity",
Expand Down Expand Up @@ -113,6 +123,16 @@
"name": "type",
"format": "default"
},
{
"type": "string",
"name": "carrier",
"format": "default"
},
{
"type": "string",
"name": "tech",
"format": "default"
},
{
"type": "integer",
"name": "capacity",
Expand Down Expand Up @@ -204,6 +224,16 @@
"name": "name",
"format": "default"
},
{
"type": "string",
"name": "carrier",
"format": "default"
},
{
"type": "string",
"name": "tech",
"format": "default"
},
{
"type": "integer",
"name": "storage_capacity",
Expand Down Expand Up @@ -423,4 +453,4 @@
"name": "load_profile"
}
]
}
}
2 changes: 1 addition & 1 deletion src/oemof/tabular/examples/datapackages/foreignkeys/data/elements/component.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name;type;capacity;bus;profile;output_parameters;input_parameters;carrier;tech;amount;max
coal;dispatchable;100000;bus0;dispatchable-profile;{"max": "max-profile"};{};coal;st;Infinity;max-profile
coal;dispatchable;100000;bus0;dispatchable-profile;{"max": 10};{};coal;st;Infinity;max-profile
demand;load;Infinity;bus0;electricity-load-profile;{};{"max": 5};electricity;load;10;max-profile
6 changes: 3 additions & 3 deletions src/oemof/tabular/examples/datapackages/investment/data/elements/chp.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name;type;capacity;marginal_cost;capacity_cost;electricity_bus;heat_bus;fuel_bus;carrier;electric_efficiency;thermal_efficiency;condensing_efficiency
ext;extraction;;100;60;bus0;heat-bus;gas-bus;gas;0.4;0.3;0.5
bp;backpressure;;100;10;bus0;heat-bus;gas-bus;gas;0.4;0.3;0
name;type;carrier;tech;capacity;marginal_cost;capacity_cost;electricity_bus;heat_bus;fuel_bus;electric_efficiency;thermal_efficiency;condensing_efficiency
ext;extraction;gas;ext;;1;60;bus0;heat-bus;gas-bus;0.4;0.3;0.5
bp;backpressure;gas;bp;;1;10;bus0;heat-bus;gas-bus;0.4;0.3;0
4 changes: 2 additions & 2 deletions src/oemof/tabular/examples/datapackages/investment/data/elements/conversion.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name;type;capacity;capacity_cost;marginal_cost;efficiency;from_bus;to_bus
power2heat;conversion;;20;2;0.99;bus1;heat-bus
name;type;carrier;tech;capacity;capacity_cost;marginal_cost;efficiency;from_bus;to_bus
power2heat;conversion;electricity;heatpump;;20;2;0.99;bus1;heat-bus
12 changes: 6 additions & 6 deletions src/oemof/tabular/examples/datapackages/investment/data/elements/source.csv
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name;type;capacity;capacity_cost;bus;marginal_cost;profile;output_parameters;carrier
gas-gt;dispatchable;;100;bus1;40;;{"summed_max": 2000};gas
coal-st;dispatchable;;100;bus0;40;;{};coal
lignite-st;dispatchable;50;;bus0;20;;{};lignite
wind;volatile;;50;bus0;0;wind-profile;{};wind
pv;volatile;;20;bus1;0;pv-profile;{};solar
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;profile;output_parameters;carrier
gas-gt;dispatchable;gas;gt;;100;bus1;40;;{"summed_max": 2000};gas
coal-st;dispatchable;coal;st;;100;bus0;40;;{};coal
lignite-st;dispatchable;lignite;st;;50;bus0;20;;{};lignite
wind;volatile;wind;onshore;;50;bus0;0;wind-profile;{};wind
pv;volatile;solar;pv;;20;bus1;0;pv-profile;{};solar
6 changes: 3 additions & 3 deletions src/oemof/tabular/examples/datapackages/investment/data/elements/storage.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name;storage_capacity;capacity;capacity_cost;capacity_ratio;type;bus;tech
el-storage;;;10;0.2;storage;bus0;battery
el-storage-exist;10;1;10;0.2;storage;bus0;battery
name;carrier;tech;storage_capacity;capacity;capacity_cost;capacity_ratio;type;bus;tech
el-storage;lithium;battery;;;10;0.2;storage;bus0;battery
el-storage-exist;lithium;battery;10;1;10;0.2;storage;bus0;battery

0 comments on commit 5443a44

Please sign in to comment.