Skip to content

Commit f78ac3b

Browse files
committed
Fix flake8 linter issues
1 parent 474e259 commit f78ac3b

File tree

3 files changed

+31
-22
lines changed

3 files changed

+31
-22
lines changed

gbasis/evals/_deriv.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ def _eval_deriv_contractions(coords, orders, center, angmom_comps, alphas, prim_
145145
def _eval_first_second_order_deriv_contractions(
146146
coords, orders, center, angmom_comps, alphas, prim_coeffs, norm
147147
):
148-
r"""Return the evaluation of direct implementation of 1st and 2nd derivative orders
149-
of a Cartesian contraction.
148+
"""Return the evaluation of direct 1st and 2nd derivative orders of a Cartesian contraction.
150149
151150
Parameters
152151
----------
@@ -217,15 +216,17 @@ def _eval_first_second_order_deriv_contractions(
217216

218217
# Calling 1st and 2nd derivatives functions for different combination of orders
219218
if indices_first_deriv.any():
220-
first_deriv = _first_derivative(new_coords, gauss, indices_first_deriv, angmom_comps, alphas)
219+
first_deriv = _first_derivative(new_coords, gauss, indices_first_deriv,
220+
angmom_comps, alphas)
221221
if indices_second_deriv.any():
222-
second_deriv = _second_derivative(new_coords, gauss, indices_second_deriv, angmom_comps,
223-
alphas)
222+
second_deriv = _second_derivative(new_coords, gauss, indices_second_deriv,
223+
angmom_comps, alphas)
224224
elif indices_second_deriv.any():
225-
second_deriv = _second_derivative(new_coords, gauss, indices_second_deriv, angmom_comps, alphas)
225+
second_deriv = _second_derivative(new_coords, gauss, indices_second_deriv,
226+
angmom_comps, alphas)
226227
if indices_first_deriv.any():
227-
first_deriv = _first_derivative(new_coords, gauss, indices_first_deriv, angmom_comps,
228-
alphas)
228+
first_deriv = _first_derivative(new_coords, gauss, indices_first_deriv,
229+
angmom_comps, alphas)
229230
# Combining all the derivatives
230231
norm = norm.T[:, :, np.newaxis]
231232
output = np.tensordot(prim_coeffs, norm * zeroth_deriv * first_deriv * second_deriv, (0, 0))
@@ -234,7 +235,7 @@ def _eval_first_second_order_deriv_contractions(
234235

235236

236237
def _first_derivative(center_coords, gauss, indices_first_deriv, angmom_comps, alphas):
237-
r"""Helper function for calculation of explicit first derivative order for contracted gaussian
238+
r"""Help function for calculation of explicit first derivative order for contracted gaussian.
238239
239240
Parameters
240241
----------
@@ -296,7 +297,7 @@ def _first_derivative(center_coords, gauss, indices_first_deriv, angmom_comps, a
296297

297298

298299
def _second_derivative(center_coords, gauss, indices_second_deriv, angmom_comps, alphas):
299-
r"""Helper function for calculation of explicit second derivative order for contracted gaussian
300+
r"""Help function for calculation of explicit second derivative order for contracted gaussian.
300301
301302
Parameters
302303
----------
@@ -341,8 +342,8 @@ def _second_derivative(center_coords, gauss, indices_second_deriv, angmom_comps,
341342
n_2_indices = second_ang_comp >= 2
342343

343344
# angular momentum == 0
344-
total_n_0 = ((4 * alphas[:, None, None] ** 2) * (second_coords ** 2)) \
345-
- (2 * alphas[:, None, None])
345+
total_n_0 = ((4 * alphas[:, None, None] ** 2) * (second_coords ** 2)) - \
346+
(2 * alphas[:, None, None])
346347
raw_second_deriv = total_n_0[:, :, None, :] ** array_ones[None, :, :, None]
347348
# angular momentum == 1
348349
if any(second_ang_comp[0] == 1):
@@ -360,10 +361,11 @@ def _second_derivative(center_coords, gauss, indices_second_deriv, angmom_comps,
360361
power_part_1[power_part_1 < 0] = 0
361362
part1_n_2 = second_coords[:, None, :] ** (power_part_1[:, :, None])
362363
# Calculating
363-
# ..math:: 4 \alpha^{2}\left(x-X_{A}\right)^{4}-\alpha(4 n+2)\left(x-X_{A}\right)^{2}+n(n-1)
364+
# ..math:: 4 \alpha^{2}\left(x-X_{A}\right)^{4}-
365+
# \alpha(4 n+2)\left(x-X_{A}\right)^{2}+n(n-1)
364366
part2_1_n_2 = (4 * alphas[:, None, None] ** 2) * (second_coords ** 4)
365367
part2_2_n_2 = alphas[:, None, None, None] * (4 * second_ang_comp[:, :, None] + 2) \
366-
* second_coords[:, None, :] ** 2
368+
* second_coords[:, None, :] ** 2
367369
part2_3_n_2 = second_ang_comp * (second_ang_comp - 1)
368370
part2_n_2 = part2_1_n_2[:, :, None, :] - part2_2_n_2 + part2_3_n_2[None, :, :, None]
369371
total_n_2 = part1_n_2[None, :, :, :] * part2_n_2

gbasis/evals/density.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,14 @@ def evaluate_deriv_reduced_density_matrix(
177177
178178
"""
179179
deriv_orb_eval_one = evaluate_deriv_basis(
180-
basis, points, orders_one, transform=transform, coord_type=coord_type, deriv_type=deriv_type
180+
basis, points, orders_one, transform=transform, coord_type=coord_type, deriv_type=deriv_type
181181
)
182182
if np.array_equal(orders_one, orders_two):
183183
deriv_orb_eval_two = deriv_orb_eval_one
184184
else:
185185
deriv_orb_eval_two = evaluate_deriv_basis(
186-
basis, points, orders_two, transform=transform, coord_type=coord_type, deriv_type=deriv_type
186+
basis, points, orders_two, transform=transform, coord_type=coord_type,
187+
deriv_type=deriv_type
187188
)
188189
density = one_density_matrix.dot(deriv_orb_eval_two)
189190
density *= deriv_orb_eval_one
@@ -662,10 +663,12 @@ def evaluate_general_kinetic_energy_density(
662663
raise TypeError("`alpha` must be an int or float.")
663664

664665
general_kinetic_energy_density = evaluate_posdef_kinetic_energy_density(
665-
one_density_matrix, basis, points, transform=transform, coord_type=coord_type, deriv_type=deriv_type
666+
one_density_matrix, basis, points, transform=transform, coord_type=coord_type,
667+
deriv_type=deriv_type
666668
)
667669
if alpha != 0:
668670
general_kinetic_energy_density += alpha * evaluate_density_laplacian(
669-
one_density_matrix, basis, points, transform=transform, coord_type=coord_type, deriv_type=deriv_type
671+
one_density_matrix, basis, points, transform=transform, coord_type=coord_type,
672+
deriv_type=deriv_type
670673
)
671674
return general_kinetic_energy_density

tests/test_density_direct.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ def test_evaluate_deriv_density():
137137
)
138138

139139
assert np.allclose(
140-
evaluate_deriv_density(np.array([2, 3, 0]), density, basis, points, transform, deriv_type='direct'),
140+
evaluate_deriv_density(np.array([2, 3, 0]), density, basis, points,
141+
transform, deriv_type='direct'),
141142
np.einsum(
142143
"ij,ik,jk->k",
143144
density,
@@ -454,7 +455,10 @@ def test_evaluate_general_kinetic_energy_density():
454455
np.identity(40), basis, points, None, np.identity(40), deriv_type='direct'
455456
)
456457
assert np.allclose(
457-
evaluate_general_kinetic_energy_density(np.identity(40), basis, points, 1, np.identity(40), deriv_type='direct'),
458-
evaluate_posdef_kinetic_energy_density(np.identity(40), basis, points, np.identity(40), deriv_type='direct')
459-
+ evaluate_density_laplacian(np.identity(40), basis, points, np.identity(40), deriv_type='direct'),
458+
evaluate_general_kinetic_energy_density(np.identity(40), basis, points, 1,
459+
np.identity(40), deriv_type='direct'),
460+
evaluate_posdef_kinetic_energy_density(np.identity(40), basis, points,
461+
np.identity(40), deriv_type='direct')
462+
+ evaluate_density_laplacian(np.identity(40), basis, points,
463+
np.identity(40), deriv_type='direct'),
460464
)

0 commit comments

Comments
 (0)