Skip to content

Commit 96bc382

Browse files
author
mlund
committed
More ruff
1 parent 93f6075 commit 96bc382

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

assets/convert-calvados3.ipynb

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"source": [
3131
"%matplotlib inline\n",
3232
"\n",
33-
"import matplotlib\n",
3433
"import numpy as np\n",
3534
"import matplotlib.pyplot as plt\n",
3635
"import pandas as pd\n",
@@ -50,14 +49,16 @@
5049
" if not os.path.isfile(csvfile):\n",
5150
" urllib.request.urlretrieve(\n",
5251
" \"https://raw.githubusercontent.com/KULL-Centre/CALVADOS/refs/heads/main/examples/single_MDP/input/residues_CALVADOS3.csv\",\n",
53-
" csvfile)\n",
54-
" df = pd.read_csv(csvfile,\n",
55-
" usecols=[\"three\", \"MW\", \"sigmas\", \"sigmas\", \"q\", \"lambdas\"])\n",
56-
" df.columns = ['name', 'mass', 'hydrophobicity', 'sigma', 'charge']\n",
52+
" csvfile,\n",
53+
" )\n",
54+
" df = pd.read_csv(\n",
55+
" csvfile, usecols=[\"three\", \"MW\", \"sigmas\", \"sigmas\", \"q\", \"lambdas\"]\n",
56+
" )\n",
57+
" df.columns = [\"name\", \"mass\", \"hydrophobicity\", \"sigma\", \"charge\"]\n",
5758
" df[\"hydrophobicity\"] = df[\"hydrophobicity\"].map(\"!Lambda {:.5}\".format)\n",
58-
" df[\"ε\"] = 0.8368 # kJ/mol\n",
59+
" df[\"ε\"] = 0.8368 # kJ/mol\n",
5960
" df[\"sigma\"] *= 10 # nm -> angstrom\n",
60-
" df.to_json('calvados3.json', orient=\"records\", force_ascii=False)\n",
61+
" df.to_json(\"calvados3.json\", orient=\"records\", force_ascii=False)\n",
6162
" return df"
6263
]
6364
},
@@ -87,26 +88,29 @@
8788
"metadata": {},
8889
"outputs": [],
8990
"source": [
90-
"σ = 6.0 # angstrom\n",
91-
"ε = 0.8368 # kJ/mol\n",
91+
"σ = 6.0 # angstrom\n",
92+
"ε = 0.8368 # kJ/mol\n",
9293
"λ = 0.5\n",
93-
"rc = 3 * σ # angstrom\n",
94+
"rc = 3 * σ # angstrom\n",
95+
"\n",
9496
"\n",
9597
"def lj(r):\n",
96-
" return 4 * ε * ( (σ/r)**12 - (σ/r)**6 )\n",
98+
" return 4 * ε * ((σ / r) ** 12 - (σ / r) ** 6)\n",
99+
"\n",
97100
"\n",
98101
"def ah(r):\n",
99102
" if r > rc:\n",
100103
" return 0.0\n",
101-
" if r <= σ * 2**(1/6):\n",
102-
" return lj(r) - λ * lj(rc) + ε * (1-λ)\n",
104+
" if r <= σ * 2 ** (1 / 6):\n",
105+
" return lj(r) - λ * lj(rc) + ε * (1 - λ)\n",
103106
" return λ * (lj(r) - lj(rc))\n",
104107
"\n",
105-
"r = np.linspace(0.9*σ, rc, 50)\n",
108+
"\n",
109+
"r = np.linspace(0.9 * σ, rc, 50)\n",
106110
"f = np.vectorize(ah)\n",
107111
"\n",
108-
"plt.plot(r/σ, lj(r)/ε, label='Lennard-Jones')\n",
109-
"plt.plot(r/σ, f(r)/ε, label='Ashbaugh-Hatch')\n",
112+
"plt.plot(r / σ, lj(r) / ε, label=\"Lennard-Jones\")\n",
113+
"plt.plot(r / σ, f(r) / ε, label=\"Ashbaugh-Hatch\")\n",
110114
"\n",
111115
"plt.xlabel(\"r/σ\")\n",
112116
"plt.ylabel(\"u(r)/ε\")\n",

0 commit comments

Comments
 (0)