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

Features/cmpr heatpumps and chillers #21

Merged
merged 36 commits into from
Dec 10, 2019
Merged

Features/cmpr heatpumps and chillers #21

merged 36 commits into from
Dec 10, 2019

Conversation

jakob-wo
Copy link
Contributor

@jakob-wo jakob-wo commented Nov 6, 2019

To implement a module and examples for compression heat pump and chiller calculations as described in Issue 591.

Features:

  • Temperature dependent COP calculation using Carnot-Efficiency
  • Examples on how to apply the functions and how to use them with oemof.solph

Related:

ToDos:

  • Add documentation
  • Add tests

Jakob Wolf and others added 23 commits August 6, 2019 15:59
Add module with calculations for compression heat pumps and chillers
369ce7d
Add example on calculating COP of an air-source heat pump
11d38dd
@jnnr
Separate examples from module
e1afac3
Add an example on how use COP calculation for chillers
9c917af
Merge branch 'dev' into features/cmpr_heatpumps_and_chillers
b945c9e
Add an example folder
7fc8dec
Update example
0969067
Add setup file
b9626c8
Add calculations
871230b
Remove folder
9325d94 
- Move code one level up in folder structure
Add input data for air-source hp example
ab920ba
Add example to illustrate COP calulation for heat pumps
3c49f4e 
- Example plots the dependence of the COP on the temperature difference
Add example of a ground-source heat pump
a627bfa
Add pics folder with a plot
61e4b07 
- Add plot of compression heat pump COP dependence on temperature difference
Add docstring
e9ffb2e
Add docstring
efa0afc
Fix docu
11b0fd4 
- Change name in toc
Add draft of a docstring
2954ea6
Merge branch 'dev' into features/cmpr_heatpumps_and_chillers
7772fa5 
# Conflicts (solved):
#	docs/api/oemof-thermal.rst
#	setup.py
Add docstrings
e00dd46
Add section in docu
a7975c7
Update examples
0f9c2eb
Add example on heat pump with variable output
122acc3
@jakob-wo jakob-wo added this to the v0.0.1 milestone Nov 6, 2019
@jakob-wo jakob-wo self-assigned this Nov 6, 2019
@jakob-wo
Copy link
Contributor Author

jakob-wo commented Nov 6, 2019

@jnnr: please have a look at the code and the examples.

jnnr
jnnr reviewed Nov 14, 2019
View reviewed changes
Copy link
Member

@jnnr jnnr left a comment

Choose a reason for hiding this comment

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

Thanks for your effort! Looks good! I like the plots. I added some comments directly in the code.

A more general question: Would you consider an example with investment worthwhile?

examples/compression_heatpumps_and_chiller/data/ASHP_example.csv Show resolved Hide resolved
docs/api/oemof-thermal.rst Show resolved Hide resolved
examples/compression_heatpumps_and_chiller/airsource_heatpump_const_max_output.py Outdated Show resolved Hide resolved
examples/compression_heatpumps_and_chiller/airsource_heatpump_const_max_output.py Outdated Show resolved Hide resolved
examples/compression_heatpumps_and_chiller/airsource_heatpump_const_max_output.py Outdated Show resolved Hide resolved
docs/index.rst Outdated Show resolved Hide resolved
src/oemof/thermal/compression_heatpumps_and_chillers.py Outdated Show resolved Hide resolved
examples/compression_heatpumps_and_chiller/chiller_cop.py Outdated Show resolved Hide resolved
examples/compression_heatpumps_and_chiller/airsource_heatpump_const_max_output.py Show resolved Hide resolved
src/oemof/thermal/compression_heatpumps_and_chillers.py Show resolved Hide resolved
@jnnr jnnr mentioned this pull request Nov 14, 2019
Closed
@jakob-wo
Copy link
Contributor Author

Would you consider an example with investment worthwhile?

I would rather not. Such an example would consist of a simple transformer in invest mode. I think it is obvious how to realize that using the oemof.solph documentation - don't you think so?

Jakob Wolf added 6 commits November 25, 2019 11:06
Make code comply with flake8 rules
cc1fcaa
Add latex formulas to docstrings
ac01056
Remove obsolete file
8254731
Add documentation
a393b49
Update documentation
4441328 
- Clearify what the module can be used for
- Make it easier to understand purpose of this module
- Add references
Make code comply with flake8 rules
9edca53 
- Shorten lines
@jakob-wo jakob-wo requested a review from FranziPl December 10, 2019 09:52
FranziPl
FranziPl approved these changes Dec 10, 2019
View reviewed changes
Copy link
Member

@FranziPl FranziPl 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.

@jakob-wo jakob-wo merged commit 9ca3c56 into dev Dec 10, 2019
@jakob-wo jakob-wo deleted the features/cmpr_heatpumps_and_chillers branch December 10, 2019 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jnnr jnnr jnnr left review comments

@FranziPl FranziPl FranziPl approved these changes

Assignees

@jakob-wo jakob-wo

Labels
enhancement
Projects
None yet
Milestone
v0.0.1
Development

Successfully merging this pull request may close these issues.
3 participants
@jakob-wo @jnnr @FranziPl