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 #47

Merged
merged 151 commits into from
Jul 12, 2022
Merged

Develop #47

merged 151 commits into from
Jul 12, 2022

Conversation

FelicitasBeier
Copy link
Owner

merge current develop with my develop branch

vartika271987 and others added 28 commits July 7, 2022 14:05
Added settings for pumping costs for zero in default and switch to use them for India
Start script for India run specifications
Update fable_india start script
FSEC output scripts now write into the scenario output folders themselves
# Conflicts:
#	scripts/output/extra/disaggregation_BII.R
Co-authored-by: pfuehrlich-pik <82826417+pfuehrlich-pik@users.noreply.github.com>
Co-authored-by: pfuehrlich-pik <82826417+pfuehrlich-pik@users.noreply.github.com>
Merge 4.5.0 back into develop
Outputs scripts for FSDP runs
@FelicitasBeier FelicitasBeier merged commit ca6f684 into FelicitasBeier:develop Jul 12, 2022
FelicitasBeier pushed a commit that referenced this pull request Nov 29, 2023
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.

6 participants