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

Bugfix in water cost equation #727

Merged
merged 15 commits into from
Sep 26, 2024

Conversation

vartika271987
Copy link
Contributor

🐦 Description of this PR 🐦

  • This PR corrects a bug in the water cost equation. This affects only India runs at present, and only in the case when pumping cost settings are used for India. No change in the MAgPIE default run.

🔧 Checklist for PR creator 🔧

  • Label pull request from the label list.

    • Low risk: Simple bugfixes (missing files, updated documentation, typos) or changes in start or output scripts
  • Self-review own code

    • No hard coded numbers and cluster/country/region names.
    • The new code doesn't contain declared but unused parameters or variables.
    • magpie4 R library has been updated accordingly and backwards compatible where necessary.
    • scenario_config.csv has been updated accordingly (important if default.cfg has been updated)
  • Document changes

    • Add changes to CHANGELOG.md
  • Perform test runs

    • Low risk:
      • Run a compilation check via Rscript start.R --> "compilation check"
    • Medium risk:
      • Run test runs via Rscript start.R --> "test runs"
      • Check logs for errors/warnings

🚨 Checklist for reviewer 🚨

  • PR is labeled correctly
  • Code changes look reasonable
    • No hard coded numbers and cluster/country/region names.
    • No unnecessary increase in module interfaces
    • model behavior/performance is satisfactory.
  • Changes are properly documented
    • CHANGELOG is updated correctly
    • Updates in interfaces have been properly addressed in the module documentations
    • In-code documentation looks appropriate
  • content review done (at least 1)
  • RSE review done (at least 1)

CHANGELOG.md Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason there are more differences in the changelog than the line that you have added.
Often just a doubling of the headline (e.g. Unreleased Unreleased). Maybe a merge conflict thing?
Could you clean that up?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to fix it after a version was released yesterday, but it seems it has changed a lot of things, its not clear to me. Can you please check if it looks okay now?
Or I will drop this one and create a new PR altogether.

main.gms Show resolved Hide resolved
Copy link
Member

@k4rst3ns k4rst3ns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.
I guess this is not critical, as water pumping cost were not active for most cases, is that correct?
Just out of curiosity, I would be interested in the difference that makes for irrigation dynamics in the model ^^'

@vartika271987
Copy link
Contributor Author

Looks good to me. I guess this is not critical, as water pumping cost were not active for most cases, is that correct? Just out of curiosity, I would be interested in the difference that makes for irrigation dynamics in the model ^^'

  • Water pumping costs were not active by default, and even when activated only contain values for India. So, only India runs were affected.

@vartika271987 vartika271987 reopened this Sep 26, 2024
@vartika271987 vartika271987 merged commit 59f0599 into magpiemodel:develop Sep 26, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Low risk Low risk Minor Smaller modifications
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants