Skip to content

Commit

Permalink
clean formula
Browse files Browse the repository at this point in the history
  • Loading branch information
0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q committed Aug 11, 2023
1 parent b226aa9 commit 9a18b8f
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions R/reportCrossVariables.R
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,16 @@ reportCrossVariables <- function(gdx, output = NULL, regionSubsetList = NULL,
"Welfare|per capita|Real and undiscounted|Yearly (arbitrary unit/yr)"))

# Energy shares
tmp <- mbind(tmp,setNames( # assume 8% for transmission losses and autoconsumption of power plants
100 * (output[,,"SE|Electricity|Non-Biomass Renewables (EJ/yr)"] + output[,,"SE|Electricity|Biomass (EJ/yr)"])
/ 1.08 / output[,,"FE|Electricity (EJ/yr)"], "Secondary Energy|Electricity|Share of renewables in gross demand|Estimation (Percent)"))
tmp <- mbind(
tmp,
setNames( # assume 8 % for transmission losses and autoconsumption of power plants
100
* ( output[,,"SE|Electricity|Non-Biomass Renewables (EJ/yr)"]
+ output[,,"SE|Electricity|Biomass (EJ/yr)"]
)
/ 1.08
/ output[,,"FE|Electricity (EJ/yr)"],
"Secondary Energy|Electricity|Share of renewables in gross demand|Estimation (Percent)"))

# Energy expenditures
tmp <- mbind(tmp,setNames(
Expand Down

0 comments on commit 9a18b8f

Please sign in to comment.