-
Notifications
You must be signed in to change notification settings - Fork 12
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.
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
Merge develop into main for v0.4.0 release #49
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit
Hold shift + click to select a range
b0433de
Fixed maximum concentration in positive electrode in test file
ikorotkin 3f83150
Fixed maximum concentration in test_schema.py according to issue #30
ikorotkin a88ac51
Merge pull request #31 from ikorotkin/issue-30-fix-max-concentration-…
rtimms 7411768
Validate the sto limits according to issue #8
ikorotkin e836bbe
Fixed tests, added target_soc tests
ikorotkin 233f4db
Fix too big maximum concentration in the example
ikorotkin 6ca9e7b
Added tests for the STO limit validator
ikorotkin 1339711
Improved error messages for the STO limits validator
ikorotkin 3a848d7
Added dict of electrodes for well-mixed blended electrode support
ikorotkin d03c39a
Added blended electrode example to the test
ikorotkin 8dc406b
Split electrode properties into chemistry and other, update test
ikorotkin 4a36ec6
Renamed classes ElectrodeChemistry and ElectrodeOther to Particle and…
ikorotkin bed16f8
First attempt to add validation based on models according to issue #29
ikorotkin 5eeb7e9
Add skip_on_failure for the sto limit validator (no need to check the…
ikorotkin 4a3704b
merge main
rtimms 804d758
merge develop
rtimms 8ad4272
#26 allow user-defined params
rtimms 274dc79
#26 changelog
rtimms f933a15
update docs and README.md
rtimms acb236f
update docstrings
rtimms eb9579d
Updated CHANGELOG
ikorotkin c2afaf8
Merge branch 'develop' into issue-23-blended-electrodes
ikorotkin 3b3e389
Merge remote-tracking branch 'upstream/develop' into issue-29-validat…
ikorotkin e286492
Updated CHANGELOG
ikorotkin f88c6f4
Raise a warning instead of an error
ikorotkin bca53ce
Updated CHANGELOG
ikorotkin 58930b3
Merge pull request #34 from ikorotkin/issue-29-validation-based-on-mo…
rtimms 2a6a0a6
Merged development into issue-23-blended-electrodes
ikorotkin 679e153
Merge pull request #33 from ikorotkin/issue-23-blended-electrodes
ikorotkin b46ddc4
Merged development into issue-8-sto-limits
ikorotkin 14f2c11
Added STO limit check for all parameter sets (including SPM)
ikorotkin b9200d1
Changed error to a warning if initial SOC is outside of [0,1]
ikorotkin 7a54d44
Changed error to a warning for STO limits validator
ikorotkin 19d3dcf
Moved STO validator from schema to new file validators.py
ikorotkin 755ccfd
Added user-defined tolerance to check minimum/maximum voltage limits.…
ikorotkin d18380d
Treat more warnings as errors for testing
ikorotkin 3524977
Updated CHANGELOG
ikorotkin 1fa5ba0
Added example JSON files
ikorotkin e4b061c
Updated changelog
ikorotkin 98b9c1e
merge develop
rtimms fc38062
#26 fix types for user-defined parameters
rtimms f116efd
#26 use get_args
rtimms dd506d8
#26 use get_args
rtimms b797fea
#26 update changelog
rtimms 28eb745
merge develop
rtimms 4cba3f6
update url
rtimms 694e727
update docstrings
rtimms cd00a67
Merge pull request #45 from ikorotkin/examples
rtimms ea7c2c1
merge develop
rtimms e4168ef
Merge develop
ikorotkin 79ecbc2
Merge pull request #44 from FaradayInstitution/issue-26-user-defined-…
rtimms ee7f21c
update authors and install
rtimms 2fbff65
update CHANGELOG
rtimms 8b359b3
add readthedocs.yaml
rtimms 337624b
Merge develop
ikorotkin 1d51b3d
Add v_tol to parse_bpx_obj and parse_bpx_str, rename the global setti…
ikorotkin cd577b9
Added tests
ikorotkin df537c7
Split long strings into several lines
ikorotkin fee5318
Fix one typo and one description
ikorotkin bc8382e
Merge pull request #47 from ikorotkin/typos
rtimms b677fe2
Merge pull request #32 from ikorotkin/issue-8-sto-limits
rtimms 9099c56
merge develop
rtimms 19b78b8
remove makefile
rtimms 9bdb956
Merge pull request #43 from FaradayInstitution/docs
rtimms c36a05b
bump version number
rtimms 39ad3d6
update changelog
rtimms 599d80a
Merge pull request #48 from FaradayInstitution/v-0-4-0-release
rtimms 9d57532
Merge branch 'main' into develop
rtimms c184b7b
update urls and docs instructios
rtimms 64c6470
revert bpx-example url
rtimms File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ This repository features a Pydantic-based parser for JSON files in the BPX forma | |
|
||
To support the new open standard, [About:Energy](https://www.aboutenergy.io/) have supplied two parameters sets for an NMC and LFP cell. The BPX files and associated examples and information can be found on the [A:E BPX Parameterisation repository](https://github.com/About-Energy-OpenSource/About-Energy-BPX-Parameterisation/). | ||
|
||
To see how to use BPX with [PyBaMM](https://www.pybamm.org/), check out the [BPX example repository](https://github.com/pybamm-team/bpx-example). | ||
To see how to use BPX with [PyBaMM](https://www.pybamm.org/), check out the [BPX example repository](https://github.com/FaradayInstitution/bpx-example). | ||
|
||
## 🚀 Installation | ||
The BPX package can be installed using pip | ||
|
@@ -26,7 +26,7 @@ import bpx | |
filename = 'path/to/my/file.json' | ||
my_params = bpx.parse_bpx_file(filename) | ||
``` | ||
`my_params` will now be of type `BPX`, which acts like a python dataclass with the same attributes as the BPX format. To obatin example files, see the `examples` folder, the [A:E BPX Parameterisation repository](https://github.com/About-Energy-OpenSource/About-Energy-BPX-Parameterisation/), or the [BPX example repository](https://github.com/pybamm-team/bpx-example). | ||
`my_params` will now be of type `BPX`, which acts like a python dataclass with the same attributes as the BPX format. To obatin example files, see the `examples` folder, the [A:E BPX Parameterisation repository](https://github.com/About-Energy-OpenSource/About-Energy-BPX-Parameterisation/), or the [BPX example repository](https://github.com/FaradayInstitution/bpx-example). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And here as well, should be |
||
|
||
Attributes of the class can be printed out using the standard Python dot notation, for example, you can print out the initial temperature of the cell using | ||
```python | ||
|
@@ -60,7 +60,7 @@ print(bpx.BPX.schema_json(indent=2)) | |
According to the `pydantic` docs, the generated schemas are compliant with the specifications: JSON Schema Core, JSON Schema Validation and OpenAPI. | ||
|
||
## 📖 Documentation | ||
API documentation for the `bpx` package can be built locally using [Sphinx](https://www.sphinx-doc.org/en/master/). To build the documentation first [clone the repository](https://github.com/git-guides/git-clone), then run the following command: | ||
API documentation for the `bpx` package can be built locally using [Sphinx](https://www.sphinx-doc.org/en/master/). To build the documentation first [clone the repository](https://github.com/git-guides/git-clone), install the `bpx` package, and then run the following command: | ||
```bash | ||
sphinx-build docs docs/_build/html | ||
``` | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ import bpx | |
filename = 'path/to/my/file.json' | ||
my_params = bpx.parse_bpx_file(filename) | ||
``` | ||
`my_params` will now be of type `BPX`, which acts like a python dataclass with the same attributes as the BPX format. To obatin example files, see the [A:E BPX Parameterisation repository](https://github.com/About-Energy-OpenSource/About-Energy-BPX-Parameterisation/) or [BPX example repository](https://github.com/pybamm-team/bpx-example). | ||
`my_params` will now be of type `BPX`, which acts like a python dataclass with the same attributes as the BPX format. To obatin example files, see the [A:E BPX Parameterisation repository](https://github.com/About-Energy-OpenSource/About-Energy-BPX-Parameterisation/) or [BPX example repository](https://github.com/FaradayInstitution/bpx-example). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
Attributes of the class can be printed out using the standard Python dot notation, for example, you can print out the initial temperature of the cell using | ||
```python | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, now this link is broken (and a few other links to
bpx-example
below), it should be inpybamm-team
repo.