Issue 1582 concentration #1866

valentinsulzer · 2021-12-19T17:34:02Z

Description

Make initial concentration a function of r as well as x.
This prompted a few changes to the internal representation of function parameters, averaging, etc

Fixes #1582

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 · 2021-12-21T18:25:38Z

Codecov Report

Merging #1866 (6f636bd) into develop (bac27fd) will increase coverage by 0.00%.
The diff coverage is 99.55%.

❗ Current head 6f636bd differs from pull request most recent head 21b84ba. Consider uploading reports for the commit 21b84ba to get more accurate results

@@            Coverage Diff            @@
##           develop    #1866    +/-   ##
=========================================
  Coverage    99.32%   99.32%            
=========================================
  Files          346      346            
  Lines        19124    18981   -143     
=========================================
- Hits         18995    18853   -142     
+ Misses         129      128     -1

Impacted Files	Coverage Δ
pybamm/__init__.py	`100.00% <ø> (ø)`
pybamm/meshes/meshes.py	`97.77% <ø> (-0.17%)`	⬇️
pybamm/util.py	`100.00% <ø> (ø)`
pybamm/expression_tree/scalar.py	`96.77% <75.00%> (ø)`
pybamm/expression_tree/symbol.py	`98.54% <98.57%> (-0.21%)`	⬇️
pybamm/discretisations/discretisation.py	`99.79% <100.00%> (+<0.01%)`	⬆️
pybamm/expression_tree/array.py	`100.00% <100.00%> (ø)`
pybamm/expression_tree/averages.py	`100.00% <100.00%> (ø)`
pybamm/expression_tree/binary_operators.py	`99.54% <100.00%> (-0.01%)`	⬇️
pybamm/expression_tree/broadcasts.py	`100.00% <100.00%> (ø)`
... and 46 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 bac27fd...21b84ba. Read the comment docs.

valentinsulzer · 2022-01-21T00:22:33Z

Benchmarks are still failing, but only just, and it's only setup, and I can't figure out how to bring them down

rtimms

thanks @tinosulzer looks great! much prefer just having a single domains dict

rtimms · 2022-01-25T09:54:03Z

pybamm/expression_tree/array.py

@@ -25,6 +25,11 @@ class Array(pybamm.Symbol):
        list of domains the parameter is valid over, defaults to empty list
    auxiliary_domainds : dict, optional


wasn't you, but there is a typo in auxiliary_domains

rtimms · 2022-01-25T09:58:29Z

pybamm/expression_tree/independent_variable.py

@@ -20,18 +20,25 @@ class IndependentVariable(pybamm.Symbol):
        name of the node
    domain : iterable of str
        list of domains that this variable is valid over
+    auxiliary_domainds : dict, optional


"domainds" again

rtimms · 2022-01-25T10:22:14Z

test.json

@@ -0,0 +1 @@
+{"c": [1.0, 0.9798027714409646, 0.960006460477965, 0.9406095788204055, 0.9216020347741102, 0.9029823702003188, 0.8847366581852026, 0.8668601056564101, 0.8493459377424136, 0.832186662408666, 0.8153749778386046, 0.7989034974265092, 0.782764985023561, 0.7669526757329163, 0.751460238142306, 0.7362803334995669, 0.7214067595017163, 0.7068339060218576, 0.692555361502903, 0.6785650429748535, 0.664857083100717, 0.6514259326371419, 0.6382661109279633, 0.625372202374782, 0.6127383975890887, 0.600359805229227, 0.5882313786270565, 0.5763482045504048, 0.5647049769256993, 0.5532968734428519, 0.5421193144470962, 0.5311677011174264, 0.5204374421815062, 0.5099238253787153, 0.49962263026903947, 0.48952957667911157, 0.47964047942244703, 0.4699510980498083, 0.4604574329920214, 0.4511555543059014, 0.4420416052186034, 0.4331116685232906, 0.4243618878176341, 0.41578879237242733, 0.4073888417395631, 0.39915858160714324, 0.3910946437994791, 0.3831937462770909, 0.37545269003839876, 0.3678681114226823], "d": [[1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0], [1.9999999999999998, 2.020408163265306, 2.040816326530612, 2.061224489795918, 2.081632653061224, 2.10204081632653, 2.1224489795918364, 2.1428571428571423, 2.1632653061224487, 2.1836734693877546, 2.204081632653061, 2.224489795918367, 2.2448979591836733, 2.265306122448979, 2.2857142857142856, 2.3061224489795915, 2.326530612244898, 2.346938775510204, 2.36734693877551, 2.387755102040816, 2.408163265306122, 2.4285714285714284, 2.4489795918367343, 2.4693877551020407, 2.4897959183673466, 2.510204081632653, 2.530612244897959, 2.5510204081632653, 2.571428571428571, 2.591836734693877, 2.6122448979591835, 2.6326530612244894, 2.6530612244897958, 2.6734693877551017, 2.693877551020408, 2.714285714285714, 2.7346938775510203, 2.7551020408163263, 2.775510204081632, 2.7959183673469385, 2.8163265306122445, 2.836734693877551, 2.8571428571428568, 2.877551020408163, 2.897959183673469, 2.9183673469387754, 2.9387755102040813, 2.9591836734693877, 2.979591836734694, 3.0]], "c + d": [[3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823], [3.0, 3.0002109347062706, 3.000822787008577, 3.001834068616324, 3.0032346878353344, 3.0050231865268486, 3.007185637777039, 3.0097172485135526, 3.0126112438648622, 3.015860131796421, 3.0194566104916656, 3.023393293344876, 3.0276629442072345, 3.0322587981818954, 3.0371745238565917, 3.0424027824791584, 3.047937371746614, 3.0537726815320614, 3.059902300278413, 3.06632014501567, 3.073020348406839, 3.0799973612085703, 3.0872457027646973, 3.0947599574768225, 3.102534315956435, 3.11056388686188, 3.1188436235250157, 3.12736861271367, 3.1361335483542705, 3.145133608136729, 3.1543642124062794, 3.1638207623419157, 3.173498666671302, 3.183393213133817, 3.1935001812894477, 3.2038152909648256, 3.2143343569734673, 3.2250531388661345, 3.2359676370736534, 3.2470739216528397, 3.258368135830848, 3.2698463624008416, 3.281504744960491, 3.2933398127805904, 3.305348025413032, 3.3175259285459187, 3.3298701540035607, 3.3423774197464784, 3.355044526773093, 3.3678681114226823]], "2c": [2.0, 1.9596055428819292, 1.92001292095593, 1.881219157640811, 1.8432040695482204, 1.8059647404006376, 1.7694733163704053, 1.7337202113128203, 1.6986918754848273, 1.664373324817332, 1.6307499556772092, 1.5978069948530185, 1.565529970047122, 1.5339053514658325, 1.502920476284612, 1.4725606669991338, 1.4428135190034326, 1.4136678120437152, 1.385110723005806, 1.357130085949707, 1.329714166201434, 1.3028518652742838, 1.2765322218559265, 1.250744404749564, 1.2254767951781773, 1.200719610458454, 1.176462757254113, 1.1526964091008096, 1.1294099538513986, 1.1065937468857039, 1.0842386288941923, 1.0623354022348528, 1.0408748843630125, 1.0198476507574306, 0.9992452605380789, 0.9790591533582231, 0.9592809588448941, 0.9399021960996166, 0.9209148659840428, 0.9023111086118027, 0.8840832104372068, 0.8662233370465812, 0.8487237756352682, 0.8315775847448547, 0.8147776834791262, 0.7983171632142865, 0.7821892875989582, 0.7663874925541818, 0.7509053800767975, 0.7357362228453646]}


can this file be deleted?

valentinsulzer added 18 commits August 5, 2021 13:50

#1582 allow initial concentration to depend on r

18ac674

#1582 flake8

dc0dd72

Merge branch 'develop' into issue-1582-concentration

1bee8cc

#1582 fix tests

c6daef5

#1582 merge develop

611219f

#1582 merge develop

cbfdbea

Merge branch 'develop' into issue-1582-concentration

a7eb9b9

#1582 fixing tests

eb2042b

Merge branch 'develop' into issue-1582-concentration

569f814

#1582 merge develop

de6bce4

Merge branch 'issue-1816-domain-error' into issue-1582-concentration

4e046fe

#1582 fix compare_lithium_ion

b69d1d0

#1582 merge #1781

8e79d8c

#1582 fix tests

d6b08cb

#1582 merge averages-class

2ae4d5c

#1582 merge develop

8ea7dc7

Merge branch 'develop' into issue-1582-concentration

9d8cd09

#1582 fix some tests

1d86579

valentinsulzer marked this pull request as draft December 19, 2021 17:34

valentinsulzer added 5 commits December 19, 2021 12:39

#1582 remove accidental duplicate files

2bda121

#1582 reduce if statements

d00ffb5

#1582 revert examples

40e2681

#1582 fix test

038d3f9

merge develop

c3ffef2

valentinsulzer added 5 commits December 29, 2021 09:28

#1582 fixing tests

647540a

Merge branch 'develop' into issue-1582-concentration

556490d

flake8

cdde52a

#1582 fix dfn tests

be7f4a8

#1582 revert examples

966f3a3

valentinsulzer added 14 commits January 12, 2022 13:03

#1582 replacing auxiliary_domains with domains

d4d044a

merge develop

c36c0b4

#1582 fix tests except save/load

7b8d60b

remove gif

6d4371a

#1582 fix save/load

6c8d7aa

#1582 benchmark test

20e6f41

#1582 more tests and benchmarks

f6ce7bd

#1582 flake8

31a30fb

#1582 fix tests

8fda417

#1582 fix docs

a2cb799

#1582 flake8

13e25c8

#1582 merge develop

5eb20f7

#158 coverage

434a544

#1582 coverage and benchmarks

a050d8d

valentinsulzer marked this pull request as ready for review January 21, 2022 00:22

valentinsulzer requested review from brosaplanella and rtimms January 21, 2022 00:22

valentinsulzer added 3 commits January 21, 2022 14:17

Merge branch 'develop' into issue-1582-concentration

d0af13b

#1582 merge develop

ba9a4d0

#1582 test for benchmarks

79e330d

rtimms approved these changes Jan 25, 2022

View reviewed changes

valentinsulzer added 6 commits February 1, 2022 14:10

Merge branch 'develop' into issue-1582-concentration

9b0aa46

#1582 test benchmarks

f1a644a

#1582 more benchmarking

a9acb6b

#1582 deprecate domain setter and fix tests

7cc0d9f

#1582 changelog

6f636bd

#1582 remove test.json

21b84ba

valentinsulzer merged commit 4e028e0 into develop Feb 2, 2022

valentinsulzer deleted the issue-1582-concentration branch February 2, 2022 17:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 1582 concentration #1866

Issue 1582 concentration #1866

valentinsulzer commented Dec 19, 2021

codecov bot commented Dec 21, 2021 •

edited

Loading

valentinsulzer commented Jan 21, 2022

rtimms left a comment

rtimms Jan 25, 2022

rtimms Jan 25, 2022

rtimms Jan 25, 2022

		@@ -25,6 +25,11 @@ class Array(pybamm.Symbol):
		list of domains the parameter is valid over, defaults to empty list
		auxiliary_domainds : dict, optional

Issue 1582 concentration #1866

Issue 1582 concentration #1866

Conversation

valentinsulzer commented Dec 19, 2021

Description

Type of change

Key checklist:

Further checks:

codecov bot commented Dec 21, 2021 • edited Loading

Codecov Report

valentinsulzer commented Jan 21, 2022

rtimms left a comment

Choose a reason for hiding this comment

rtimms Jan 25, 2022

Choose a reason for hiding this comment

rtimms Jan 25, 2022

Choose a reason for hiding this comment

rtimms Jan 25, 2022

Choose a reason for hiding this comment

codecov bot commented Dec 21, 2021 •

edited

Loading