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.

Sign up for GitHub

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

Jump to bottom

Facilitate compability with oemof-solph v4.0 #90

Merged
merged 61 commits into from
Aug 13, 2020
Merged

Facilitate compability with oemof-solph v4.0 #90

merged 61 commits into from
Aug 13, 2020

Conversation

smartie2076
Copy link
Collaborator

Fix #32

@smartie2076 smartie2076 added the enhancement New feature or request label Jul 6, 2020
@smartie2076 smartie2076 self-assigned this Jul 6, 2020
@smartie2076 smartie2076 mentioned this pull request Jul 8, 2020
Merged
9 tasks
@smartie2076 smartie2076 mentioned this pull request Jul 9, 2020
Open
9 tasks
@smartie2076
Copy link
Collaborator Author

Left to do before merging: Check that outputs with oemof==0.2.2 is the same as with oemof-solph==0.4.0.

@smartie2076 smartie2076 marked this pull request as draft July 9, 2020 19:23
@smartie2076
Copy link
Collaborator Author

Update to pyomo==5.7!

@smartie2076 smartie2076 changed the title Facilitate compability with oemof v4.0 Facilitate compability with oemof-solph v4.0 Jul 21, 2020
smartie2076 and others added 25 commits August 13, 2020 11:52
@smartie2076
Replace capacity by storage_content
a296b88
@smartie2076
Update input file: output folder
4a33e16
@smartie2076
Update requirements.txt
e532272
@smartie2076
Remove simulation results
8f4330f
@smartie2076
Replace == False with is False
fe3765a
@smartie2076
Replace == True with is True
1eba52f
@smartie2076
Replace [(("generic_storage", "None"), "capacity")] to [(("generic_st…
c74f694 
…orage", "None"), "storage_content")]
@smartie2076
Decrease number of simulations in xslx
10704b8
@smartie2076
Update Changelog
8e56a47
@smartie2076
Reformatting with black
037f36a
@smartie2076
Change test input file
5162bd5
@smartie2076
Correct input file
a2021be
@smartie2076
Replace initial_capacity with initial_storage_level
d28c298
@smartie2076
Remove unused code
b278095
@smartie2076
Remove oemof==0.3.2 from requirements.txt
c3c7220
Replace == True with is True
21f86e6
Replace == False with is False
7c2976f
Fix typo
9771f21
Merging fixes
9dd56c9
Update requirements.txt
7877be4
Rename test file
88d77fa
Updated CHANGELOG.md
bc3be33
Merge branch 'patch/oemof-v4-0' of https://github.com/smartie2076/off…
41c3194 
…gridders into patch/oemof-v4-0

� Conflicts:
�	src/D0_process_input.py
�	src/G1_oemof_create_model.py
�	src/G2a_oemof_busses_and_componets.py
�	src/G2b_constraints_custom.py
Formatting with black
4439726
Refactor reversal
080ae56
@smartie2076
Copy link
Collaborator Author

@santiagoinfantinom I did some major updates, also regarding the oemof version used. Please uninstall oemof and install the new requirements. Update your banches ASAP, as there are many changes. I will probably will create another release soon.

@smartie2076 smartie2076 marked this pull request as ready for review August 13, 2020 10:38
@smartie2076 smartie2076 merged commit 20b1f82 into dev Aug 13, 2020
@smartie2076 smartie2076 deleted the patch/oemof-v4-0 branch August 13, 2020 14:25
@santiagoinfantinom
Copy link
Collaborator

@smartie2076 Ok. I'm going to uninstall oemof and reinstall the requirements. After that i'll merge dev into the other branches

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@smartie2076 smartie2076

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

oemof version needs to be updated from v0.2.2 to v0.4
2 participants
@smartie2076 @santiagoinfantinom