Skip to content
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

Issue 632 average second dimension #1057

Merged
merged 24 commits into from
Jun 16, 2020

Conversation

valentinsulzer
Copy link
Member

Description

Add functionality to allow averaging in a secondary dimension (for example, averaging particle concentrations in the x-dimension in the DFN)

Fixes #632

Type of change

Please add a line in the relevant section of CHANGELOG.md to document the change (include PR #) - note reverse order of PR #s. If necessary, also add to the list of breaking changes.

  • New feature (non-breaking change which adds functionality)
  • Optimization (back-end change that speeds up the code)
  • Bug fix (non-breaking change which fixes an issue)

Key checklist:

  • No style issues: $ flake8
  • All tests pass: $ python run-tests.py --unit
  • The documentation builds: $ cd docs and then $ make clean; make html

You can run all three at once, using $ python run-tests.py --quick.

Further checks:

  • Code is commented, particularly in hard-to-understand areas
  • Tests added that prove fix is effective or that feature works

@codecov
Copy link

codecov bot commented Jun 15, 2020

Codecov Report

Merging #1057 into develop will increase coverage by 0.08%.
The diff coverage is 99.21%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1057      +/-   ##
===========================================
+ Coverage    97.63%   97.72%   +0.08%     
===========================================
  Files          237      237              
  Lines        12386    12426      +40     
===========================================
+ Hits         12093    12143      +50     
+ Misses         293      283      -10     
Impacted Files Coverage Δ
pybamm/expression_tree/binary_operators.py 94.67% <87.50%> (-0.21%) ⬇️
pybamm/discretisations/discretisation.py 99.77% <100.00%> (+<0.01%) ⬆️
pybamm/expression_tree/broadcasts.py 100.00% <100.00%> (ø)
pybamm/expression_tree/concatenations.py 97.45% <100.00%> (ø)
pybamm/expression_tree/functions.py 100.00% <100.00%> (ø)
pybamm/expression_tree/independent_variable.py 100.00% <100.00%> (ø)
pybamm/expression_tree/input_parameter.py 100.00% <100.00%> (ø)
pybamm/expression_tree/operations/simplify.py 95.14% <100.00%> (ø)
pybamm/expression_tree/symbol.py 97.44% <100.00%> (-0.02%) ⬇️
pybamm/expression_tree/unary_operators.py 100.00% <100.00%> (+2.90%) ⬆️
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 16064d8...0a43a73. Read the comment docs.

Copy link
Member

@brosaplanella brosaplanella left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great Tino, thanks! Just the comment on uncommenting some of the models in compare_lead_acid.py.

# pybamm.lead_acid.LOQS(),
# pybamm.lead_acid.FOQS(),
pybamm.lead_acid.Composite(),
# pybamm.lead_acid.Full(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these should not be commented.

@valentinsulzer valentinsulzer merged commit 00cbe19 into develop Jun 16, 2020
@valentinsulzer valentinsulzer deleted the issue-632-average-second-dimension branch September 13, 2021 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Average in secondary dimensions
2 participants