-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #463 from 0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q/dev/che…
…ck_industry_sums add additional summation checks for industry FE
- Loading branch information
Showing
7 changed files
with
48 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
Type: Package | ||
Package: remind2 | ||
Title: The REMIND R package (2nd generation) | ||
Version: 1.117.6 | ||
Date: 2023-09-13 | ||
Version: 1.118.0 | ||
Date: 2023-09-14 | ||
Authors@R: c( | ||
person("Renato", "Rodrigues", , "[email protected]", role = c("aut", "cre")), | ||
person("Lavinia", "Baumstark", role = "aut"), | ||
|
@@ -62,7 +62,7 @@ Imports: | |
madrat, | ||
mip (>= 0.139.1), | ||
openxlsx, | ||
piamInterfaces (>= 0.0.102), | ||
piamInterfaces (>= 0.1.2), | ||
plotly, | ||
quitte, | ||
readr, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
parent; child; factor | ||
|
||
# total FE primary steel production | ||
FE|Industry|Steel|++|Primary; FE|Industry|Steel|+|Solids; 1 | ||
FE|Industry|Steel|++|Primary; FE|Industry|Steel|+|Liquids; 1 | ||
FE|Industry|Steel|++|Primary; FE|Industry|Steel|+|Gases; 1 | ||
FE|Industry|Steel|++|Primary; FE|Industry|Steel|+|Hydrogen; 1 | ||
FE|Industry|Steel|++|Primary; FE|Industry|Steel|Primary|Electricity; 1 | ||
|
||
# total FE secondary steel production | ||
FE|Industry|Steel|++|Secondary; FE|Industry|Steel|Secondary|Electricity; 1 |