#1129 merge #1230

.github/workflows/build_wheels_and_publish.yml

@@ -37,10 +37,6 @@ jobs:
     - name: Install build-time deps for MacOS
       if: matrix.os == 'macos-latest'
       run: |
-        # Temporary fix for https://github.com/actions/virtual-environments/issues/1811
-        brew untap local/homebrew-openssl
-        brew untap local/homebrew-python2
-        # End of fix
         brew update
         brew install graphviz
         brew install sundials

.github/workflows/test_on_push.yml

@@ -50,10 +50,6 @@ jobs:
     - name: Install MacOS system dependencies
       if: matrix.os == 'macos-latest'
       run: |
-        # Temporary fix for https://github.com/actions/virtual-environments/issues/1811
-        brew untap local/homebrew-openssl
-        brew untap local/homebrew-python2
-        # End of fix
         brew update
         brew install graphviz
         brew install openblas

CHANGELOG.md

@@ -7,25 +7,27 @@
 -   Added `Solution.integration_time`, which is the time taken just by the integration subroutine, without extra setups ([#1223](https://github.com/pybamm-team/PyBaMM/pull/1223))
 -   Added parameter set for an A123 LFP cell ([#1209](https://github.com/pybamm-team/PyBaMM/pull/1209))
 -   Added variables related to equivalent circuit models ([#1204](https://github.com/pybamm-team/PyBaMM/pull/1204))
+-   Added the `Integrated` electrolyte conductivity submodel ([#1188](https://github.com/pybamm-team/PyBaMM/pull/1188))
 -   Added an example script to check conservation of lithium ([#1186](https://github.com/pybamm-team/PyBaMM/pull/1186))
 -   Added `erf` and `erfc` functions ([#1184](https://github.com/pybamm-team/PyBaMM/pull/1184))
 
 ## Optimizations
 
--   Add (optional) smooth approximations for the `minimum`, `maximum`, `Heaviside`, and `AbsoluteValue` operators ([#1223](https://github.com/pybamm-team/PyBaMM/pull/1223))
+-   Add (optional) smooth approximations for the `Minimum`, `Maximum`, `Heaviside`, and `AbsoluteValue` operators ([#1223](https://github.com/pybamm-team/PyBaMM/pull/1223))
 -   Avoid unnecessary repeated computations in the solvers ([#1222](https://github.com/pybamm-team/PyBaMM/pull/1222))
 -   Rewrite `Symbol.is_constant` to be more efficient ([#1222](https://github.com/pybamm-team/PyBaMM/pull/1222))
 -   Cache shape and size calculations ([#1222](https://github.com/pybamm-team/PyBaMM/pull/1222))
 -   Only instantiate the geometric, electrical and thermal parameter classes once ([#1222](https://github.com/pybamm-team/PyBaMM/pull/1222))
 
 ## Bug fixes
 
+-   Quickplot now works when timescale or lengthscale is a function of an input parameter ([#1234](https://github.com/pybamm-team/PyBaMM/pull/1234))
 -   Fix bug that was slowing down creation of the EC reaction SEI submodel ([#1227](https://github.com/pybamm-team/PyBaMM/pull/1227))
 -   Add missing separator thermal parameters for the Ecker parameter set ([#1226](https://github.com/pybamm-team/PyBaMM/pull/1226))
+-   Make sure simulation solves when evaluated timescale is a function of an input parameter ([#1218](https://github.com/pybamm-team/PyBaMM/pull/1218))
 -   Raise error if saving to MATLAB with variable names that MATLAB can't read, and give option of providing alternative variable names ([#1206](https://github.com/pybamm-team/PyBaMM/pull/1206))
 -   Raise error if the boundary condition at the origin in a spherical domain is other than no-flux ([#1175](https://github.com/pybamm-team/PyBaMM/pull/1175))
 -   Fix boundary conditions at r = 0 for Creating Models notebooks ([#1173](https://github.com/pybamm-team/PyBaMM/pull/1173))
--   Make sure simulation solves when evaluated timescale is a function of an input parameter ([#1218](https://github.com/pybamm-team/PyBaMM/pull/1218))
 
 ## Breaking changes
 

docs/source/expression_tree/symbol.rst

@@ -1,6 +1,10 @@
 Symbol
 ======
 
+.. autofunction:: pybamm.array_zeros_like
+
+.. autofunction:: pybamm.array_ones_like
+
 .. autoclass:: pybamm.Symbol
   :special-members:
   :members:

docs/source/models/submodels/electrolyte_conductivity/index.rst

@@ -7,5 +7,6 @@ Electrolyte Conductivity
     base_electrolyte_conductivity
     leading_order_conductivity
     composite_conductivity
+    integrated_conductivity
     full_conductivity
     surface_form/index

docs/source/models/submodels/electrolyte_conductivity/integrated_conductivity.rst

@@ -0,0 +1,5 @@
+Integrated Model
+================
+
+.. autoclass:: pybamm.electrolyte_conductivity.Integrated
+    :members:

examples/scripts/DFN.py

@@ -9,7 +9,7 @@
 
 
 # load model
-model = pybamm.lithium_ion.SPM()
+model = pybamm.lithium_ion.DFN()
 
 # create geometry
 geometry = model.default_geometry

examples/scripts/compare_lead_acid.py

@@ -17,7 +17,7 @@
 sims = []
 for model in models:
     sim = pybamm.Simulation(model)
-    sim.solve([0, 3600])
+    sim.solve([0, 3600 * 17])
     sims.append(sim)
 
 # plot

pybamm/CITATIONS.txt

@@ -208,6 +208,16 @@ primaryClass={physics.app-ph},
   publisher={IOP Publishing}
 }
 
+@article{brosaplanella2020TSPMe,
+title={Systematic derivation and validation of a reduced thermal-electrochemical model for lithium-ion batteries using asymptotic methods}
+journal={Submitted for publication},
+author={Brosa Planella, Ferran and Sheikh, Muhammad and Widanage, Dhammika W},
+year={2020},
+eprint={2011.01611},
+archivePrefix={arXiv},
+primaryClass={physics.chem-ph},
+}
+
 @article{lain2019design,
   title={Design Strategies for High Power vs. High Energy Lithium Ion Cells},
   author={Lain, Michael J and Brandon, James and Kendrick, Emma},

pybamm/discretisations/discretisation.py

@@ -1015,7 +1015,10 @@ def _process_symbol(self, symbol):
 
         elif isinstance(symbol, pybamm.Concatenation):
             new_children = [self.process_symbol(child) for child in symbol.children]
-            new_symbol = spatial_method.concatenation(new_children)
+            try:
+                new_symbol = spatial_method.concatenation(new_children)
+            except:
+                self._process_symbol(symbol.children[1])
 
             return new_symbol