Fix parameter set logic and allow FittingProblem to take init_ocv rather than init_soc#425
Merged
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #425 +/- ##
===========================================
+ Coverage 98.51% 98.68% +0.16%
===========================================
Files 46 46
Lines 2960 2961 +1
===========================================
+ Hits 2916 2922 +6
+ Misses 44 39 -5 ☔ View full report in Codecov by Sentry. |
Member
Author
|
TODO: Re-run all notebooks after #428 and check output. |
MarkBlyth
reviewed
Aug 6, 2024
MarkBlyth
approved these changes
Aug 6, 2024
MarkBlyth
left a comment
Contributor
There was a problem hiding this comment.
I'm happy with all this. Since initial_state can be an OCV or SOC, it won't break any of the functionality needed for typical cell-cycling tests.
BradyPlanden
approved these changes
Aug 7, 2024
BradyPlanden
left a comment
Member
There was a problem hiding this comment.
Looks good, thanks for the additions @NicolaCourtier!
This was referenced Aug 7, 2024
15 tasks
BradyPlanden
added a commit
that referenced
this pull request
Aug 8, 2024
…her than init_soc (#425) * Update default init_soc * Update CHANGELOG.md * Update check_params * Add pybamm_model as default attribute * Ensure predict uses unprocessed_model * Move rebuild check to model.simulate * Align simulate output with predict * Replace init_soc with init_ocv for FittingProblem * Update notebooks * Update test_observers.py * Update descriptions and simplify * Add test_set_initial_state * Update test_problem.py * Break connection between parameter_sets * Allow predict to update initial state * Add nbstripout pre-commit hook * Add -q and re-run all notebooks * Copy parameter sets and remove model.initial_state * Reset spm_NelderMead.py * Update CHANGELOG.md * Allow parameter_set is None * Re-run notebooks * Update bounds * Update notebooks * Set numpy random seed in notebooks * Re-run with fixed seed * Update bounds * Update notebooks to initial_state * Add set_initial_state for ECMs * Add init_ocv setter * Add init_ocv values * Re-run notebooks * Add tests for ECM get_initial_state * Add ECM initial state error tests * Remove unused store_optimised_parameters * Update parameters.initial_value * Use any Initial SoC from parameter_set * Update bounds again * Update init_soc in notebooks * Move dataset check within unscented_kalman * Remove unnecessary lines from spm_UKF * Update all parameters for rebuild * Ensure value updates alongside initial_value * Update multi_model_identification * Update spm_electrode_design.ipynb * Fix test_plots design problem * Move Changelog entry to breaking changes * Add tests * Update integration tests * Update spm_weighted_cost.py * Fix tests * Fix model type check * Update _parameter_set to parameter_set * Update tests with parameter set * Add model build description * Revert to _parameter_set * Apply suggestions from code review Co-authored-by: Brady Planden <55357039+BradyPlanden@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Brady Planden <55357039+BradyPlanden@users.noreply.github.com> * Fix syntax * Fix variable name * Update model type check * Update parameter_set setter * Add parameters.reset_initial_value * Add n_outputs property * Remove public parameter_set setter * Correct integer to float * Convert initial_state to dict * Add guidance * Remove empty dictionary defaults * Add warning stacklevels * Catch simulation errors in problem evaluation * Add pybamm version comment * Add set initial ocv check * Add model.clear and remove setters * Update unscented_kalman.py * Update test_models.py * Update test_set_initial_state --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Brady Planden <55357039+BradyPlanden@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Remove the
init_socoption from BaseProblem, keep theinit_socoption for DesignProblem and replace it with aninit_ocvoption for FittingProblem and Observers. This change is to ensure consistency in problems with parameters that affect the calculation of the initial concentrations from SOC.Issue reference
Fixes #424
Review
Before you mark your PR as ready for review, please ensure that you've considered the following:
Type of change
Key checklist:
$ pre-commit run(or$ nox -s pre-commit) (see CONTRIBUTING.md for how to set this up to run automatically when committing locally, in just two lines of code)$ nox -s tests$ nox -s doctestYou can run integration tests, unit tests, and doctests together at once, using
$ nox -s quick.Further checks:
Thank you for contributing to our project! Your efforts help us to deliver great software.