-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* CampScens: Adjustment and new lowLSC scenario As the Mix2 scenario changed since September2023 and the LSC assumptions are relative to the reference scenario (Mix2), I changed the techScen and demScen factors to still follow the scenario protocol. Comparison between old and new runs: * buildLibrary * delete '' for function call * UpdateCampScen To fulfill the requirements from E3M, I ajudsted the parameters in demscen and mitigation tech.csv. The result show that lsc_Strong, Weak and Low are more evenly distributed now. Especially, I ensrued, that lsc_Low is more ambitous than the previous version (E3M request). I changed for the navigate comparison script Mix1 to Mix2 as I understood this to be the new standard comparison techScenario. * Update NAMESPACE The importFrom(magrittr,`%>%`) was necessary because piamInterfaces did not work with the previous version. The compScen can be found at 20240302_PR240_UpdateCampScens_2 * buildLibrary
- Loading branch information
Showing
10 changed files
with
974 additions
and
975 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,6 +1,6 @@ | ||
Package: edgeTransport | ||
Title: Prepare EDGE Transport Data for the REMIND model | ||
Version: 1.5.0 | ||
Version: 1.5.1 | ||
Authors@R: c( | ||
person("Alois", "Dirnaichner", email = "[email protected]", role = c("aut", "cre")), | ||
person("Marianna", "Rottoli", email = "[email protected]", role = "aut"), | ||
|
@@ -15,7 +15,7 @@ Encoding: UTF-8 | |
LazyData: true | ||
RoxygenNote: 7.2.3 | ||
VignetteBuilder: knitr | ||
Date: 2024-01-19 | ||
Date: 2024-02-04 | ||
Config/testthat/edition: 3 | ||
Imports: | ||
rmndt, | ||
|
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
2 changes: 1 addition & 1 deletion
2
inst/Rmd/compareScenarios_Transport/csEDGET_NAV_scenario_evaluation.Rmd
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
Oops, something went wrong.