3
0
mirror of https://github.com/triqs/dft_tools synced 2024-10-31 11:13:46 +01:00

Use scipy.integrate.simpson instead of scipy.integrate.simps (#255)

This commit is contained in:
Nils Wentzell 2024-07-01 06:50:33 -04:00 committed by Nils Wentzell
parent 0108b39c83
commit 011f69de57

View File

@ -764,7 +764,7 @@ def transport_coefficient(Gamma_w, omega, Om_mesh, spin_polarization, direction,
beta : double beta : double
Inverse temperature :math:`\beta`. Inverse temperature :math:`\beta`.
method : string method : string
Integration method: cubic spline and scipy.integrate.quad ('quad'), simpson rule ('simps'), trapezoidal rule ('trapz'), rectangular integration (otherwise) Integration method: cubic spline and scipy.integrate.quad ('quad'), simpson rule ('simpson'), trapezoidal rule ('trapz'), rectangular integration (otherwise)
Note that the sampling points of the the self-energy are used! Note that the sampling points of the the self-energy are used!
Returns Returns
@ -774,7 +774,7 @@ def transport_coefficient(Gamma_w, omega, Om_mesh, spin_polarization, direction,
""" """
from scipy.interpolate import interp1d from scipy.interpolate import interp1d
from scipy.integrate import simps, quad from scipy.integrate import simpson, quad
if not (mpi.is_master_node()): if not (mpi.is_master_node()):
return None return None
@ -796,9 +796,9 @@ def transport_coefficient(Gamma_w, omega, Om_mesh, spin_polarization, direction,
A = quad(A_int_interp, min(omega), max(omega), A = quad(A_int_interp, min(omega), max(omega),
epsabs=1.0e-12, epsrel=1.0e-12, limit=500) epsabs=1.0e-12, epsrel=1.0e-12, limit=500)
A = A[0] A = A[0]
elif method == 'simps': elif method == 'simpson':
# simpson rule for w-grid # simpson rule for w-grid
A = simps(A_int, omega) A = simpson(A_int, omega)
elif method == 'trapz': elif method == 'trapz':
# trapezoidal rule for w-grid # trapezoidal rule for w-grid
A = numpy.trapz(A_int, omega) A = numpy.trapz(A_int, omega)
@ -835,7 +835,7 @@ def conductivity_and_seebeck(Gamma_w, omega, Om_mesh, SP, directions, beta, meth
beta : double beta : double
Inverse temperature :math:`\beta`. Inverse temperature :math:`\beta`.
method : string method : string
Integration method: cubic spline and scipy.integrate.quad ('quad'), simpson rule ('simps'), trapezoidal rule ('trapz'), rectangular integration (otherwise) Integration method: cubic spline and scipy.integrate.quad ('quad'), simpson rule ('simpson'), trapezoidal rule ('trapz'), rectangular integration (otherwise)
Note that the sampling points of the the self-energy are used! Note that the sampling points of the the self-energy are used!
Returns Returns