Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorder SE, PE, FE, UE mix #497

Merged
merged 9 commits into from
Dec 15, 2023
Merged

Reorder SE, PE, FE, UE mix #497

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
71a5231
reordering energy carrier
Dec 13, 2023
cd15578
Merge branch 'master' into reorderSE
Dec 13, 2023
30ade10
reordering energy and demand by incumbent to incoming principle (or d…
Dec 13, 2023
12e780f
remove extra files
Dec 13, 2023
39395f3
small fix
Dec 13, 2023
90ee3ca
reordering FE demand by incumbent (dirty) to incoming (clean)principle
Dec 13, 2023
3dce04b
small patches
Dec 15, 2023
1d20b51
Merge branch 'master' into reorderSE
Dec 15, 2023
ab1aa34
version number
Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 55 additions & 44 deletions inst/markdown/compareScenarios2/cs2_01_summary.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,39 +146,44 @@ showMultiLinePlotsByVariable(dIea, items, "GDP|PPP pCap", scales = "fixed")

```{r FE by carrier}
items <- c(
"FE|Solids",
"FE|Liquids",
"FE|Gases",
"FE|Heat",
"FE|Electricity",
"FE|Hydrogen",
"FE|Electricity")
showAreaAndBarPlots(data, items, scales = "fixed")
"FE|Heat",
"FE|Gases",
"FE|Liquids",
"FE|Solids",
NULL
cchrisgong marked this conversation as resolved.
Show resolved Hide resolved
)
showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
```

## FE Industry by carrier

```{r FE Industry by carrier}
items <- c(
"FE|Industry|Solids",
"FE|Industry|Liquids",
"FE|Industry|Gases",
"FE|Industry|Heat",
"FE|Industry|Electricity",
"FE|Industry|Hydrogen",
"FE|Industry|Electricity")
showAreaAndBarPlots(data, items, scales = "fixed")
"FE|Industry|Heat",
"FE|Industry|Gases",
"FE|Industry|Liquids",
"FE|Industry|Solids",
NULL
)
showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
```

## FE Buildings by carrier

```{r FE Buildings by carrier}
items <- c(
"FE|Buildings|Solids",
"FE|Buildings|Liquids",
"FE|Buildings|Gases",
"FE|Buildings|Heat",
"FE|Buildings|Electricity",
"FE|Buildings|Hydrogen",
"FE|Buildings|Electricity")
showAreaAndBarPlots(data, items, scales = "fixed")
"FE|Buildings|Heat",
"FE|Buildings|Gases",
"FE|Buildings|Liquids",
"FE|Buildings|Solids",
NULL)
showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
```

## FE Transport by carrier
Expand All @@ -187,21 +192,24 @@ showAreaAndBarPlots(data, items, scales = "fixed")
items <- c(
"FE|Transport|Electricity",
"FE|Transport|Hydrogen",
"FE|Transport|Gases",
"FE|Transport|Liquids",
"FE|Transport|Gases")
showAreaAndBarPlots(data, items, scales = "fixed")
NULL)
showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
```

## FE CDR by carrier


```{r FE CDR by carrier}
items <- c(
"FE|CDR|Liquids",
"FE|CDR|Gases",
"FE|CDR|Electricity",
"FE|CDR|Hydrogen",
"FE|CDR|Electricity")
showAreaAndBarPlots(data, items, scales = "fixed")
"FE|CDR|Gases",
"FE|CDR|Liquids",
NULL
)
showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
```

## SE Electricity by carrier
Expand All @@ -211,24 +219,25 @@ showAreaAndBarPlots(data, items, scales = "fixed")
tot <- "SE|Electricity"

items <- c(
"SE|Electricity|Coal|w/ CC",
"SE|Electricity|Coal|w/o CC",
"SE|Electricity|Oil",
"SE|Electricity|Gas|w/ CC",
"SE|Electricity|Gas|w/o CC",
"SE|Electricity|Geothermal",
"SE|Electricity|Hydro",
"SE|Electricity|Nuclear",
"SE|Electricity|Biomass|w/ CC",
"SE|Electricity|Biomass|w/o CC",
"SE|Electricity|Net Imports",
"SE|Electricity|Solar|CSP",
"SE|Electricity|Solar|PV",
"SE|Electricity|Wind|Onshore",
"SE|Electricity|Wind|Offshore",
"SE|Electricity|Hydro",
"SE|Electricity|Hydrogen",
"SE|Electricity|Net Imports")
"SE|Electricity|Nuclear",
"SE|Electricity|Geothermal",
"SE|Electricity|Biomass|w/ CC",
"SE|Electricity|Biomass|w/o CC",
"SE|Electricity|Oil",
"SE|Electricity|Gas|w/ CC",
"SE|Electricity|Gas|w/o CC",
"SE|Electricity|Coal|w/ CC",
"SE|Electricity|Coal|w/o CC",
NULL)

showAreaAndBarPlots(data, items, tot, scales = "fixed")
showAreaAndBarPlots(data, items, orderVars = "user", tot, scales = "fixed")
```


Expand All @@ -237,16 +246,18 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed")

```{r PE by carrier}
items <- c(
"PE|Coal",
"PE|Oil",
"PE|Gas",
"PE|Biomass",
"PE|Nuclear",
"PE|Solar",
"PE|Wind",
"PE|Hydro",
"PE|Geothermal")
showAreaAndBarPlots(data, items, scales = "fixed")
"PE|Hydro",
"PE|Nuclear",
"PE|Geothermal",
"PE|Biomass",
"PE|Oil",
"PE|Gas",
"PE|Coal",
NULL)

showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
```


Expand Down
Loading