Merge branch 'develop' into issue-1554-2D-processed-var

pybamm-team · Jul 21, 2021 · 7b4905d · 7b4905d
2 parents 7d611b5 + e21d2da
commit 7b4905d
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@
 ## Bug fixes
 
 -   Fixed a bug where the order of the indexing for the entries of variables discretised using FEM was incorrect ([#1556](https://github.com/pybamm-team/PyBaMM/pull/1556))
+-   Fix broken module import for spyder when running a script twice ([#1555](https://github.com/pybamm-team/PyBaMM/pull/1555))
 -   Fixed ElectrodeSOH model for multi-dimensional simulations ([#1548](https://github.com/pybamm-team/PyBaMM/pull/1548))
 -   Removed the overly-restrictive check "each variable in the algebraic eqn keys must appear in the eqn" ([#1510](https://github.com/pybamm-team/PyBaMM/pull/1510))
 -   Made parameters importable through pybamm ([#1475](https://github.com/pybamm-team/PyBaMM/pull/1475))

diff --git a/pybamm/input/parameters/lead_acid/cells/__init__.py b/pybamm/input/parameters/lead_acid/cells/__init__.py
diff --git a/pybamm/input/parameters/lead_acid/electrolytes/__init__.py b/pybamm/input/parameters/lead_acid/electrolytes/__init__.py
diff --git a/pybamm/input/parameters/lead_acid/experiments/__init__.py b/pybamm/input/parameters/lead_acid/experiments/__init__.py
diff --git a/pybamm/input/parameters/lead_acid/negative_electrodes/__init__.py b/pybamm/input/parameters/lead_acid/negative_electrodes/__init__.py
diff --git a/pybamm/input/parameters/lead_acid/positive_electrodes/__init__.py b/pybamm/input/parameters/lead_acid/positive_electrodes/__init__.py
diff --git a/pybamm/input/parameters/lead_acid/separators/__init__.py b/pybamm/input/parameters/lead_acid/separators/__init__.py
diff --git a/pybamm/input/parameters/lithium_ion/cells/__init__.py b/pybamm/input/parameters/lithium_ion/cells/__init__.py
diff --git a/pybamm/input/parameters/lithium_ion/experiments/__init__.py b/pybamm/input/parameters/lithium_ion/experiments/__init__.py
diff --git a/pybamm/input/parameters/lithium_ion/lithium_platings/__init__.py b/pybamm/input/parameters/lithium_ion/lithium_platings/__init__.py
diff --git a/pybamm/input/parameters/lithium_ion/negative_electrodes/__init__.py b/pybamm/input/parameters/lithium_ion/negative_electrodes/__init__.py
diff --git a/pybamm/input/parameters/lithium_ion/positive_electrodes/__init__.py b/pybamm/input/parameters/lithium_ion/positive_electrodes/__init__.py
diff --git a/pybamm/input/parameters/lithium_ion/seis/__init__.py b/pybamm/input/parameters/lithium_ion/seis/__init__.py
diff --git a/pybamm/input/parameters/lithium_ion/separators/__init__.py b/pybamm/input/parameters/lithium_ion/separators/__init__.py