Skip to content

Commit

Permalink
Merge pull request #168 from MassimoCimmino/issue167_version-2-1-0
Browse files Browse the repository at this point in the history
Version 2.1.0
  • Loading branch information
MassimoCimmino authored Nov 12, 2021
2 parents d98325a + f611a78 commit fa106e0
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Current version

## Version 2.1.0 (2021-11-12)

### New features

* [Issue 36](https://github.com/MassimoCimmino/pygfunction/issues/36) - Added a `Coaxial` class to the `pipes` module to model boreholes with coaxial pipes.
Expand Down
11 changes: 6 additions & 5 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
numpydoc
numpy
scipy
matplotlib
CoolProp
numpy >= 1.20.1
scipy >= 1.6.2
matplotlib >= 3.3.4
numpydoc >= 1.1.0
sphinx >= 4.0.1
CoolProp >= 6.4.1
6 changes: 3 additions & 3 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

# If your documentation needs a minimal Sphinx version, state it here.
#
# needs_sphinx = '1.0'
needs_sphinx = '4.0'

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
Expand Down Expand Up @@ -74,9 +74,9 @@
# built documents.
#
# The short X.Y version.
version = u'2.0'
version = u'2.1'
# The full version, including alpha/beta/rc tags.
release = u'2.0.0'
release = u'2.1.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 3 additions & 3 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
pygfunction
===========

*pygfunction* is a Python package that allows the calculation thermal response
factors - or *g*-functions - for geothermal borehole fields using analytical
solutions.
*pygfunction* is a Python package that allows the calculation of thermal
response factors - or *g*-functions - for geothermal borehole fields using
analytical solutions.

.. toctree::
:maxdepth: 2
Expand Down
2 changes: 1 addition & 1 deletion pygfunction/examples/discretize_boreholes.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
boundary conditions : (1) a uniform borehole wall temperature along the
boreholes equal for all boreholes, and (2) an equal inlet fluid
temperature into the boreholes. g-Functions using 8 segments in a
non-uniform deiscretization are compared to reference g-functions
non-uniform discretization are compared to reference g-functions
calculated using 48 segments of equal lengths. It is shown that g-functions
can be calculated accurately using a small number of segments.
"""
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def read(fname):

setup(
name="pygfunction",
version="2.0.0",
version="2.1.0",
packages=['pygfunction',
'pygfunction/examples'],
include_package_data=True,
Expand Down

0 comments on commit fa106e0

Please sign in to comment.