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.

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

develop #502

Closed
wants to merge 149 commits into from
Closed

develop #502

wants to merge 149 commits into from

Conversation

pfuehrlich-pik
Copy link
Contributor

  • add renv + bootstrapping
  • main renv + bootstrapping
  • remove blackmagicc for now
  • fix here paths
  • create run renv in start_run
  • add DESCRIPTION
  • use piamenv
  • up version number to 4.6
  • add Makefile
  • remove renv scripts
  • no main renv.lock
  • ruse gms::getLine, create run renv
  • Update SHAPE settings
  • Update SDP-EI settings in scenario_config.csv
  • Update scenario_config.csv
  • minor things
  • added water output script and adjusted cellular input scenarios
  • updated to v 7.48 preprocessing
  • updated version number
  • added new scnearios for FSEC
  • output.R update check, other stuff
  • add qgraph as suggests, show goxygen warnings
  • master back into develop
  • bugfix removed mapping
  • skip renv for snapshots
  • simpler ask
  • require piamenv 0.3.2
  • fix / in output script name
  • adjusted scaling
  • set tolerances back to default
  • handle multiple output scripts/run folder
  • bugfix missing slash
  • changelog, readme
  • make help using Rscript
  • alignment
  • flexibilize EFP transition period with start and endyear scalar
  • updated some solver settings and FSEC emis scens and output scripts
  • code clean up
  • updated additional data
  • updated changelog
  • correction of FSDP_collect
  • updated FSDP_collect
  • set minimum wage to 3
  • Add reporting script to output that generates a short mif containing only variables relevant for the REMIND coupling.
  • Only load libraries we need. Move function getReportShortForREMIND to magpie4 library.
  • adjusted linear interpolation macro such that start year can be equal to target year and then receive target value without fading in
  • Update CHANGELOG.md
  • Fix styling issues.
  • Update to new function name
  • Update scripts/output/extra/reportShortForREMIND.R
  • Update scripts/output/extra/reportShortForREMIND.R
  • Use local environment to keep option settings local.
  • adjustment in highres script and FSDP_collect to allow high-res runs in different folder
  • removed FSDP_process for better runtime
  • added new EFP scenario fading scenario
  • DESC -> DEPENDENCIES
  • reverted changed solver settings
  • bugfixes
  • Update scripts/output/extra/reportShortForREMIND.R
  • Rename script to use the same name as the underlying reporting function.
  • missing commas
  • updated version number to 28
  • use DEPENDENCIES in bootstrapping
  • use identical
  • some bufixes in FSDP_collect
  • bugfix in FSDP_collect
  • updated changelog
  • update
  • included costs from maccs in employment calculation
  • updated changelog
  • updated documentation
  • update
  • addressed comments
  • Performance improvements rds files. Selection of needed variables in regional report.
  • bugfix
  • bugfix
  • re-add blackmagicc script
  • set RENV_PATHS_LIBRARY
  • set RENV_PATHS_LIBRARY when creating run renvs
  • Update CHANGELOG.md
  • Update SHAPE SDP switches in scenario_config.csv
  • Update SDP-EI setting
  • added sub-national validation output script for India
  • Updated calibration factor
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • Update scripts/output/projects/FABLE_India_subnational_validation.R
  • copyright 2023
  • run insertheader.R
  • delete empty not_used.txt
  • remove empty not_used.txt, remove header
  • remove copyright not_used
  • insertheader -txt
  • start release script
  • minor
  • more
  • magpie release 4.6.2

PrantikaDas and others added 28 commits January 11, 2023 16:21
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
Co-authored-by: mishkos <32301623+mishkos@users.noreply.github.com>
added sub-national validation output script for India
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants