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

Update to storage equations #2

Merged
merged 7 commits into from
Jun 10, 2020
Merged

Conversation

Mattia-Allione
Copy link
Contributor

Hi, in this branch I uploaded my code where I added to the pyomo code the storage equations, storage constraints and storage investments and fixed a bug related to the constraint capacity of one tehnology unit.
Cheers,
Mattia

@willu47
Copy link
Member

willu47 commented Dec 4, 2019

Hi @Mattia-Allione - thanks for this. In order to merge in this pull request, ideally you should overwrite the original Pyomo file with the changes you have made. We will then be able to see the difference between your code, and those in the original Pyomo implementation of OSeMOSYS. Also, given the decision in OSeMOSYS/OSeMOSYS#98, that these changes would be better as an "optional extra", I would prefer if your implementation lives in a branch in this repository, rather than in an extra file on the master branch.

@Mattia-Allione
Copy link
Contributor Author

Mattia-Allione commented Dec 8, 2019

Hi, I now have overwritten the original pyomo file. I am not sure why it should be an optional extra since I have not made changes in the code and I just "translated" storage equation to pyomo from this code: https://github.com/OSeMOSYS/OSeMOSYS_GNU_MathProg/blob/5daea546643298be9d84b0108e4c2dd8e228ee7b/src/osemosys.txt .
Anyway if needed I will branch it into an "optional extra"

@willu47
Copy link
Member

willu47 commented Dec 13, 2019

Hi @Mattia-Allione - apologies. I am getting confused. So this pull request relates to issue #1 in which you have updated the storage equations?

Okay, I will edit the title of the pull request so that it is clear what you are suggesting to merge into the main versoin of OSeMOSYS Pyomo.

@willu47 willu47 changed the title Add files via upload Update to storage equations Dec 13, 2019
@tniet
Copy link

tniet commented Dec 13, 2019

Hi @willu47 @Mattia-Allione - I think the question that comes up for me at this point is who is taking the lead on the Pyomo version of OSeMOSYS? I don't have any expertise in Pyomo specifically and don't have time to review any Pyomo additions so can't really review this pull request in any detail. Not sure if @abhishek0208 or @willu47 have that expertise or are wanting to review Pyomo code...

@Mattia-Allione
Copy link
Contributor Author

Mattia-Allione commented Dec 15, 2019

Hi @willu47, yes it is, sorry if my title was not clear. Thanks for changing the title

@willu47 willu47 merged commit b9bc2e7 into OSeMOSYS:master Jun 10, 2020
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.

3 participants