Skip to content

Commit

Permalink
Merge pull request #27 from TchilDill/fix/pmax_api
Browse files Browse the repository at this point in the history
v0.7.1
  • Loading branch information
TchilDill authored Nov 21, 2023
2 parents bd54ab7 + 450de12 commit 8b78816
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/),
and [PEP 440](https://www.python.org/dev/peps/pep-0440/).

## [0.7.1] - 2023-11-21

### Fixed

- maximum resistance in API_clay where Pmax was wrongly calculated based on depth instead of diameter, credits to Zhenghui Qiu for spotting this.


## [0.7.0] - 2023-11-12

### Added
Expand Down
2 changes: 1 addition & 1 deletion src/openpile/globals.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# version of the package
VERSION = "0.7.0"
VERSION = "0.7.1"
2 changes: 1 addition & 1 deletion src/openpile/utils/py_curves.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def api_clay(
# Calculate Pmax (regular API)
## Pmax for shallow and deep zones (regular API)
Pmax_shallow = (3 * Su + sig) * D + J * Su * X
Pmax_deep = 9 * Su * X
Pmax_deep = 9 * Su * D
Pmax = min(Pmax_deep, Pmax_shallow)

ylist_in = [0.0, 0.1 * y50, 0.21 * y50, 1 * y50, 3 * y50, 8 * y50, 15 * y50, ymax]
Expand Down
2 changes: 1 addition & 1 deletion test/test_pycurves.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def make(
J: float,
):

return min(9 * Su * X, (3 * Su + sig) * D + J * Su * X)
return min(9 * Su * D, (3 * Su + sig) * D + J * Su * X)

return make

Expand Down

0 comments on commit 8b78816

Please sign in to comment.