Merge branch 'develop' into degradation-example

agriyakhetarpal · May 23, 2023 · 6f17d6a · 6f17d6a
2 parents 97e69e0 + d90a56c
commit 6f17d6a
Show file tree

Hide file tree

Showing 87 changed files with 219 additions and 3,196 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,14 +7,18 @@
 
 ## Optimizations
 
-- Test `JaxSolver`'s compatibility with Python `3.8`, `3.9`, `3.10`, and `3.11`  ([#2958](https://github.com/pybamm-team/PyBaMM/pull/2958))
+- Test `JaxSolver`'s compatibility with Python `3.8`, `3.9`, `3.10`, and `3.11` ([#2958](https://github.com/pybamm-team/PyBaMM/pull/2958))
 - Update Jax (0.4.8) and JaxLib (0.4.7) compatibility ([#2927](https://github.com/pybamm-team/PyBaMM/pull/2927))
 
 ## Bug fixes
 
 - Fix `pybamm_install_odes` and update the required SUNDIALS version ([#2958](https://github.com/pybamm-team/PyBaMM/pull/2958))
 - Remove brew install for Mac from the recommended developer installation options for SUNDIALS ([#2925](https://github.com/pybamm-team/PyBaMM/pull/2925))
 
+## Breaking changes
+
+- Deprecate functionality to load parameter set from a csv file. Parameter sets must now be provided as python dictionaries ([#2959](https://github.com/pybamm-team/PyBaMM/pull/2959))
+
 # [v23.4.1](https://github.com/pybamm-team/PyBaMM/tree/v23.4) - 2023-05-01
 
 ## Bug fixes
@@ -39,6 +43,7 @@
 - Parameter sets can now contain the key "chemistry", and will ignore its value (this previously would give errors in some cases) ([#2901](https://github.com/pybamm-team/PyBaMM/pull/2901))
 - Fixed a bug in the discretisation of initial conditions of a scaled variable ([#2856](https://github.com/pybamm-team/PyBaMM/pull/2856))
 - Fixed keyerror on "all" when getting sensitivities from IDAKLU solver([#2883](https://github.com/pybamm-team/PyBaMM/pull/2883))
+- Initial conditions for sensitivity equations calculated correctly ([#2920](https://github.com/pybamm-team/PyBaMM/pull/2920))
 
 ## Breaking changes
 

diff --git a/docs/source/api/util.rst b/docs/source/api/util.rst
@@ -16,12 +16,8 @@ Utility functions
 .. autoclass:: pybamm.FuzzyDict
   :members:
 
-.. autofunction:: pybamm.load_function
-
 .. autofunction:: pybamm.load
 
-.. autofunction:: pybamm.get_parameters_filepath
-
 .. autofunction:: pybamm.install_jax
 
 .. autofunction:: pybamm.have_jax

diff --git a/pybamm/__init__.py b/pybamm/__init__.py
@@ -39,7 +39,6 @@
 from .util import Timer, TimerTime, FuzzyDict
 from .util import (
     root_dir,
-    load_function,
     rmse,
     load,
     is_constant_and_can_evaluate,

diff --git a/pybamm/input/parameters/lithium_ion/testing_only/cells/Enertech_Ai2020/README.md b/pybamm/input/parameters/lithium_ion/testing_only/cells/Enertech_Ai2020/README.md
diff --git a/pybamm/input/parameters/lithium_ion/testing_only/cells/Enertech_Ai2020/parameters.csv b/pybamm/input/parameters/lithium_ion/testing_only/cells/Enertech_Ai2020/parameters.csv
diff --git a/pybamm/input/parameters/lithium_ion/testing_only/cells/__init__.py b/pybamm/input/parameters/lithium_ion/testing_only/cells/__init__.py
diff --git a/pybamm/input/parameters/lithium_ion/testing_only/electrolytes/__init__.py b/pybamm/input/parameters/lithium_ion/testing_only/electrolytes/__init__.py
diff --git a/...ithium_ion/testing_only/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/README.md b/...ithium_ion/testing_only/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/README.md
diff --git a/...meters/lithium_ion/testing_only/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/__init__.py b/...meters/lithium_ion/testing_only/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/__init__.py
diff --git a/...ectrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_TDF_EC_DMC_1_1_Landesfeind2019.py b/...ectrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_TDF_EC_DMC_1_1_Landesfeind2019.py
diff --git a/...ng_only/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_base_Landesfeind2019.py b/...ng_only/electrolytes/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_base_Landesfeind2019.py
diff --git a/...s/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_conductivity_EC_DMC_1_1_Landesfeind2019.py b/...s/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_conductivity_EC_DMC_1_1_Landesfeind2019.py
diff --git a/...es/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_diffusivity_EC_DMC_1_1_Landesfeind2019.py b/...es/lipf6_EC_DMC_1_1_Landesfeind2019/electrolyte_diffusivity_EC_DMC_1_1_Landesfeind2019.py