Skip to content

Commit

Permalink
Merge branch 'develop' into basic-experiments
Browse files Browse the repository at this point in the history
  • Loading branch information
rtimms authored May 7, 2024
2 parents a14400c + fadf094 commit f214f3c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,15 @@
"contributions": [
"doc"
]
},
{
"login": "Hongmeiqi",
"name": "Hongmeiqi",
"avatar_url": "https://avatars.githubusercontent.com/u/143798726?v=4",
"profile": "https://github.com/Hongmeiqi",
"contributions": [
"doc"
]
}
],
"contributorsPerLine": 7,
Expand Down
1 change: 1 addition & 0 deletions all_contributors.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lorenzofavaro"><img src="https://avatars.githubusercontent.com/u/44714920?v=4?s=100" width="100px;" alt="Lorenzo"/><br /><sub><b>Lorenzo</b></sub></a><br /><a href="https://github.com/pybamm-team/PyBaMM/commits?author=lorenzofavaro" title="Code">💻</a> <a href="https://github.com/pybamm-team/PyBaMM/commits?author=lorenzofavaro" title="Tests">⚠️</a> <a href="https://github.com/pybamm-team/PyBaMM/commits?author=lorenzofavaro" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AndyLiuElysia"><img src="https://avatars.githubusercontent.com/u/143705453?v=4?s=100" width="100px;" alt="AndyLiuElysia"/><br /><sub><b>AndyLiuElysia</b></sub></a><br /><a href="https://github.com/pybamm-team/PyBaMM/commits?author=AndyLiuElysia" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Hongmeiqi"><img src="https://avatars.githubusercontent.com/u/143798726?v=4?s=100" width="100px;" alt="Hongmeiqi"/><br /><sub><b>Hongmeiqi</b></sub></a><br /><a href="https://github.com/pybamm-team/PyBaMM/commits?author=Hongmeiqi" title="Documentation">📖</a></td>
</tr>
</tbody>
</table>
Expand Down
8 changes: 4 additions & 4 deletions docs/source/examples/notebooks/models/MSMR.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"$$ \\text{Li}^{+} + \\text{e}^{-} + \\text{H}_{j} \\rightleftharpoons (\\text{Li--H})_{j}.$$\n",
"For each species $j$, a vacant host site $\\text{H}_{j}$ can accommodate one lithium leading to a filled host site $(\\text{Li--H})_{j}$. The OCV for this reaction is written as\n",
"$$ U_j = U_j^0 + \\frac{\\omega_j}{f}\\log\\left(\\frac{X_j - x_j}{x_j}\\right),$$\n",
"where $f = (RT)/F$, and $R$, $T$, and $F$ are the universal gas constant, temperature in Kelvin, and Faraday’s constant, respectively. Here $X_j$ represents the total fraction of available host sites which can be occupied by species $j$, $x_j$ is the fraction of filled sites occupied by species $j$, $U_j^0$ is a concentration independent standard electrode potential, and the $\\omega_j$ is an unitless parameter that describes the level of disorder of the reaction represented by gallery $j$. \n",
"where $f = F/(RT)$, and $R$, $T$, and $F$ are the universal gas constant, temperature in Kelvin, and Faraday’s constant, respectively. Here $X_j$ represents the total fraction of available host sites which can be occupied by species $j$, $x_j$ is the fraction of filled sites occupied by species $j$, $U_j^0$ is a concentration independent standard electrode potential, and the $\\omega_j$ is an unitless parameter that describes the level of disorder of the reaction represented by gallery $j$. \n",
"\n",
"The equation for each reaction can be inverted to give \n",
"$$x_j = \\frac{X_j}{1+\\exp[f(U-U_j^0)/\\omega_j]}.$$\n",
Expand Down Expand Up @@ -539,7 +539,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "dev",
"display_name": "venv",
"language": "python",
"name": "python3"
},
Expand All @@ -553,11 +553,11 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.16"
"version": "3.11.6"
},
"vscode": {
"interpreter": {
"hash": "bca2b99bfac80e18288b793d52fa0653ab9b5fe5d22e7b211c44eb982a41c00c"
"hash": "9ff3d0c7e37de5f5aa47f4f719e4c84fc6cba7b39c571a05173422444e82fa58"
}
}
},
Expand Down

0 comments on commit f214f3c

Please sign in to comment.