Skip to content

Commit

Permalink
Merge pull request #237 from ImperialCollegeLondon/develop
Browse files Browse the repository at this point in the history
Version number updates for 2.1 from develop
  • Loading branch information
kccwing authored May 31, 2023
2 parents 0ab9869 + 9d9733b commit 4eeb126
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"schemaVersion": 1,
"label": "release version",
"message": "2.0.1",
"message": "2.1",
"color": "green"
}
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,29 @@

[Full Changelog](/~https://github.com/imperialcollegelondon/sharpy/compare/2.0...2.0.1)

**Implemented enhancements:**

- SHARPy Docker now releases to GitHub Packages [\#218](/~https://github.com/ImperialCollegeLondon/sharpy/pull/218) ([ngoiz](/~https://github.com/ngoiz))
- Some Enhancements and Fixes for the Polar Correction, Wake Discretisation, and Gust Velocity Field Generator [\#217](/~https://github.com/ImperialCollegeLondon/sharpy/pull/217) ([sduess](/~https://github.com/sduess))
- Collective blade pitch PID control of wind turbines [\#176](/~https://github.com/ImperialCollegeLondon/sharpy/pull/176) ([ArturoMS13](/~https://github.com/ArturoMS13))

**Fixed bugs:**

- Handle absolute tolerance for structural convergence tests as input settings and increase default value [\#221](/~https://github.com/ImperialCollegeLondon/sharpy/pull/221) ([sduess](/~https://github.com/sduess))
- Fix horseshoe wake handling in UVLM [\#204](/~https://github.com/ImperialCollegeLondon/sharpy/pull/204) ([sduess](/~https://github.com/sduess))

**Closed issues:**

- Twist direction inconsistent [\#212](/~https://github.com/ImperialCollegeLondon/sharpy/issues/212)

**Merged pull requests:**

- Updates to Goland wing example [\#234](/~https://github.com/ImperialCollegeLondon/sharpy/pull/234) ([rafapalacios](/~https://github.com/rafapalacios))
- A bit of clean-up of the readme file of the repo [\#231](/~https://github.com/ImperialCollegeLondon/sharpy/pull/231) ([rafapalacios](/~https://github.com/rafapalacios))
- Dev internals [\#223](/~https://github.com/ImperialCollegeLondon/sharpy/pull/223) ([ACea15](/~https://github.com/ACea15))
- updating from python 3.7 to 3.10 [\#222](/~https://github.com/ImperialCollegeLondon/sharpy/pull/222) ([kccwing](/~https://github.com/kccwing))
- Fix typo in setting [\#206](/~https://github.com/ImperialCollegeLondon/sharpy/pull/206) ([sduess](/~https://github.com/sduess))

## [2.0](/~https://github.com/imperialcollegelondon/sharpy/tree/2.0) (2022-07-04)

[Full Changelog](/~https://github.com/imperialcollegelondon/sharpy/compare/1.3...2.0)
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@
# built documents.
#
# The short X.Y version.
version = '2.0.1'
version = '2.1'
# The full version, including alpha/beta/rc tags.
release = '2.0.1'
release = '2.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion sharpy/sharpy_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def main(args=None, sharpy_input_dict=None):
if sharpy_input_dict is None:
parser = argparse.ArgumentParser(prog='SHARPy', description=
"""This is the executable for Simulation of High Aspect Ratio Planes.\n
Imperial College London 2022""")
Imperial College London 2023""")
parser.add_argument('input_filename', help='path to the *.sharpy input file', type=str, default='')
parser.add_argument('-r', '--restart', help='restart the solution with a given snapshot', type=str,
default=None)
Expand Down

0 comments on commit 4eeb126

Please sign in to comment.