Skip to content

Commit 8c75a25

Browse files
authored
Merge pull request #6 from gamma-opt/model_GIS_data
Model gis data
2 parents 8fd5c72 + a82815e commit 8c75a25

File tree

154 files changed

+232272
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+232272
-175
lines changed

.vscode/settings.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<<<<<<< Updated upstream
12
{
23
"python.pythonPath": "C:\\Users\\ludic\\miniconda3\\python.exe"
3-
}
4+
}
5+
=======
6+
{}
7+
>>>>>>> Stashed changes
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","0"
3+
"Fossil Brown coal/Lignite","N/A"
4+
"Fossil Coal-derived gas","N/A"
5+
"Fossil Gas","N/A"
6+
"Fossil Hard coal","N/A"
7+
"Fossil Oil","N/A"
8+
"Fossil Oil shale","N/A"
9+
"Fossil Peat","N/A"
10+
"Geothermal","N/A"
11+
"Hydro Pumped Storage","N/A"
12+
"Hydro Run-of-river and poundage","1492"
13+
"Hydro Water Reservoir","N/A"
14+
"Marine","N/A"
15+
"Nuclear","N/A"
16+
"Other","N/A"
17+
"Other renewable","N/A"
18+
"Solar","N/A"
19+
"Waste","N/A"
20+
"Wind Offshore","N/A"
21+
"Wind Onshore","N/A"
22+
"Total Grand capacity","1492"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","n/e"
3+
"Fossil Brown coal/Lignite","n/e"
4+
"Fossil Coal-derived gas","n/e"
5+
"Fossil Gas","n/e"
6+
"Fossil Hard coal","n/e"
7+
"Fossil Oil","n/e"
8+
"Fossil Oil shale","n/e"
9+
"Fossil Peat","n/e"
10+
"Geothermal","n/e"
11+
"Hydro Pumped Storage","n/e"
12+
"Hydro Run-of-river and poundage","n/e"
13+
"Hydro Water Reservoir","n/e"
14+
"Marine","n/e"
15+
"Nuclear","n/e"
16+
"Other","n/e"
17+
"Other renewable","n/e"
18+
"Solar","n/e"
19+
"Waste","n/e"
20+
"Wind Offshore","n/e"
21+
"Wind Onshore","n/e"
22+
"Total Grand capacity","n/e"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","497"
3+
"Fossil Brown coal/Lignite","0"
4+
"Fossil Coal-derived gas","0"
5+
"Fossil Gas","4015"
6+
"Fossil Hard coal","246"
7+
"Fossil Oil","178"
8+
"Fossil Oil shale","0"
9+
"Fossil Peat","0"
10+
"Geothermal","0"
11+
"Hydro Pumped Storage","3120"
12+
"Hydro Run-of-river and poundage","5724"
13+
"Hydro Water Reservoir","2436"
14+
"Marine","0"
15+
"Nuclear","0"
16+
"Other","23"
17+
"Other renewable","100"
18+
"Solar","1333"
19+
"Waste","150"
20+
"Wind Offshore","0"
21+
"Wind Onshore","3133"
22+
"Total Grand capacity","20955"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","n/e"
3+
"Fossil Brown coal/Lignite","n/e"
4+
"Fossil Coal-derived gas","n/e"
5+
"Fossil Gas","n/e"
6+
"Fossil Hard coal","n/e"
7+
"Fossil Oil","n/e"
8+
"Fossil Oil shale","n/e"
9+
"Fossil Peat","n/e"
10+
"Geothermal","n/e"
11+
"Hydro Pumped Storage","n/e"
12+
"Hydro Run-of-river and poundage","n/e"
13+
"Hydro Water Reservoir","n/e"
14+
"Marine","n/e"
15+
"Nuclear","n/e"
16+
"Other","n/e"
17+
"Other renewable","n/e"
18+
"Solar","n/e"
19+
"Waste","n/e"
20+
"Wind Offshore","n/e"
21+
"Wind Onshore","n/e"
22+
"Total Grand capacity","n/e"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","n/e"
3+
"Fossil Brown coal/Lignite","n/e"
4+
"Fossil Coal-derived gas","n/e"
5+
"Fossil Gas","n/e"
6+
"Fossil Hard coal","n/e"
7+
"Fossil Oil","n/e"
8+
"Fossil Oil shale","n/e"
9+
"Fossil Peat","n/e"
10+
"Geothermal","n/e"
11+
"Hydro Pumped Storage","n/e"
12+
"Hydro Run-of-river and poundage","n/e"
13+
"Hydro Water Reservoir","n/e"
14+
"Marine","n/e"
15+
"Nuclear","n/e"
16+
"Other","n/e"
17+
"Other renewable","n/e"
18+
"Solar","n/e"
19+
"Waste","n/e"
20+
"Wind Offshore","n/e"
21+
"Wind Onshore","n/e"
22+
"Total Grand capacity","n/e"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","647"
3+
"Fossil Brown coal/Lignite","n/e"
4+
"Fossil Coal-derived gas","n/e"
5+
"Fossil Gas","6799"
6+
"Fossil Hard coal","n/e"
7+
"Fossil Oil","246"
8+
"Fossil Oil shale","n/e"
9+
"Fossil Peat","n/e"
10+
"Geothermal","n/e"
11+
"Hydro Pumped Storage","1308"
12+
"Hydro Run-of-river and poundage","175"
13+
"Hydro Water Reservoir","n/e"
14+
"Marine","n/e"
15+
"Nuclear","5943"
16+
"Other","19"
17+
"Other renewable","n/e"
18+
"Solar","3887"
19+
"Waste","362"
20+
"Wind Offshore","2254"
21+
"Wind Onshore","2416"
22+
"Total Grand capacity","24056"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","N/A"
3+
"Fossil Brown coal/Lignite","988"
4+
"Fossil Coal-derived gas","N/A"
5+
"Fossil Gas","N/A"
6+
"Fossil Hard coal","887"
7+
"Fossil Oil","N/A"
8+
"Fossil Oil shale","N/A"
9+
"Fossil Peat","N/A"
10+
"Geothermal","N/A"
11+
"Hydro Pumped Storage","440"
12+
"Hydro Run-of-river and poundage","1083"
13+
"Hydro Water Reservoir","707"
14+
"Marine","N/A"
15+
"Nuclear","N/A"
16+
"Other","N/A"
17+
"Other renewable","N/A"
18+
"Solar","N/A"
19+
"Waste","N/A"
20+
"Wind Offshore","N/A"
21+
"Wind Onshore","87"
22+
"Total Grand capacity","4192"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","74"
3+
"Fossil Brown coal/Lignite","4119"
4+
"Fossil Coal-derived gas","N/A"
5+
"Fossil Gas","1232"
6+
"Fossil Hard coal","356"
7+
"Fossil Oil","N/A"
8+
"Fossil Oil shale","N/A"
9+
"Fossil Peat","N/A"
10+
"Geothermal","N/A"
11+
"Hydro Pumped Storage","864"
12+
"Hydro Run-of-river and poundage","537"
13+
"Hydro Water Reservoir","1810"
14+
"Marine","N/A"
15+
"Nuclear","2000"
16+
"Other","N/A"
17+
"Other renewable","N/A"
18+
"Solar","1084"
19+
"Waste","6"
20+
"Wind Offshore","N/A"
21+
"Wind Onshore","700"
22+
"Total Grand capacity","12782"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
"Production Type","2020 [MW]"
2+
"Biomass","91"
3+
"Fossil Brown coal/Lignite","n/e"
4+
"Fossil Coal-derived gas","n/e"
5+
"Fossil Gas","743"
6+
"Fossil Hard coal","332"
7+
"Fossil Oil","937"
8+
"Fossil Oil shale","n/e"
9+
"Fossil Peat","n/e"
10+
"Geothermal","10"
11+
"Hydro Pumped Storage","281"
12+
"Hydro Run-of-river and poundage","421"
13+
"Hydro Water Reservoir","1444"
14+
"Marine","n/e"
15+
"Nuclear","n/e"
16+
"Other","n/e"
17+
"Other renewable","50"
18+
"Solar","53"
19+
"Waste","6"
20+
"Wind Offshore","n/e"
21+
"Wind Onshore","739"
22+
"Total Grand capacity","5107"

0 commit comments

Comments
 (0)