Skip to content

Commit

Permalink
Changes in antaresViz parameters to reflect new categories introduced…
Browse files Browse the repository at this point in the history
… with Antares V8.1
  • Loading branch information
PPlessiez committed Oct 18, 2021
1 parent 84d1fcc commit d9b74aa
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 1 deletion.
11 changes: 11 additions & 0 deletions R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,18 @@ pkgEnv$prodStackAliases <- list(
description = "must-run",
var = c("pumpedStorage", "import/export", "mustRunTotal", "thermalDispatchable",
"hydraulicDispatchable", "renewableNoDispatchable")
),

eco2mix_clusters = .getProdStackAlias(
description = "Production stack used on Eco2mix website with detailed
renewable generation per type",
var = c("pumpedStorage", "import/export", "bioenergy", "windOnshore",
"windOffshore", "solarPV", "solarRooftop", "solarConcentration",
"otherRes","nuclear", "hydraulic", "gas", "coal", "lignite", "oil",
"other"),
lines = c("load", "totalProd")
)

)

rm(graphicalCharter, formulas, colors)
Expand Down
9 changes: 9 additions & 0 deletions inst/GraphicalCharter.csv
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,12 @@ hydraulicStor;84;151;208;`H. STOR`;H. STOR
totalProduction;235;155;166;NUCLEAR+LIGNITE+COAL+GAS+OIL+`MIX. FUEL`+`MISC. DTG`+WIND+SOLAR+`H. ROR`+`H. STOR`+`MISC. NDG` + pmax(0, PSP);NUCLEAR,LIGNITE,COAL,GAS,OIL,MIX. FUEL,MISC. DTG,WIND,SOLAR,H. ROR,H. STOR,MISC. NDG,PSP
netLoad;101;180;197;netLoad;netLoad
thermalAvailability;1;1;1;`AVL DTG`;AVL DTG
solarAggregated;242;116;6;`SOLAR CONCRT.`+`SOLAR PV`+`SOLAR ROOFT`;SOLAR CONCRT.,SOLAR PV,SOLAR ROOFT
windAggregated;116;205;185;`WIND OFFSHORE`+`WIND ONSHORE`;WIND OFFSHORE,WIND ONSHORE
solarPV;255;132;6;`SOLAR PV`;SOLAR PV
solarRooftop;255;148;6;`SOLAR ROOFT`;SOLAR ROOFT
solarConcentration;255;116;6;`SOLAR CONCRT.`;SOLAR CONCRT.
windOnshore;116;205;225;`WIND ONSHORE`;WIND ONSHORE
windOffshore;116;205;209;`WIND OFFSHORE`;WIND OFFSHORE
otherRes;0;204;0;`RENW. 1`+`RENW. 2`+`RENW. 3`+`RENW. 4`;RENW. 1, RENW. 2, RENW. 3, RENW. 4
totalProd;235;155;166;NUCLEAR+LIGNITE+COAL+GAS+OIL+`MIX. FUEL`+`MISC. DTG`+`MISC. DTG 2`+`MISC. DTG 3`+`MISC. DTG 4`+`WIND OFFSHORE`+`WIND ONSHORE`+`SOLAR CONCRT.`+`SOLAR PV`+`SOLAR ROOFT`+`H. ROR`+`H. STOR`+`MISC. NDG` + pmax(0, PSP);NUCLEAR,LIGNITE,COAL,GAS,OIL,MIX. FUEL,MISC. DTG,MISC. DTG 2,MISC. DTG 3,MISC. DTG 4,WIND OFFSHORE,WIND ONSHORE,SOLAR CONCRT.,SOLAR PV,SOLAR ROOFT,H. ROR,H. STOR,MISC. NDG,PSP
12 changes: 12 additions & 0 deletions inst/colors_map.csv
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,15 @@ red;green;blue;Column
84;151;208;H. STOR
101;180;197;netLoad
1;1;1;AVL DTG
51;255;51;MISC. DTG 2
102;255;51;MISC. DTG 3
102;204;51;MISC. DTG 4
0;204;0;RENW. 1
0;220;0;RENW. 2
0;236;0;RENW. 3
0;252;0;RENW. 4
116;205;209;WIND OFFSHORE
116;205;225;WIND ONSHORE
255;116;6;SOLAR CONCRT.
255;132;6;SOLAR PV
255;148;6;SOLAR ROOFT
2 changes: 1 addition & 1 deletion inst/language_columns.csv
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ thermalAvailability;Marge disponible
RENW. 1;RENW. 1
RENW. 2;RENW. 2
RENW. 3;RENW. 3
RENW. 4;RENW. 4
RENW. 4;RENW. 4

0 comments on commit d9b74aa

Please sign in to comment.