diff --git a/Jenkinsfile b/Jenkinsfile index f40513d..3123d02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { kubernetes { - label 'pynam' // all your pods will be named with this prefix, followed by a unique id + label 'pyewjn' // all your pods will be named with this prefix, followed by a unique id idleMinutes 5 // how long the pod will live after no jobs have run on it yamlFile 'jenkins/ci-agent-pod.yaml' // path to the pod definition relative to the root of our project defaultContainer 'poetry' // define a default container if more than a few stages use it, will default to jnlp container @@ -30,12 +30,12 @@ pipeline { } stage('lint') { steps { - sh 'poetry run flake8 pynam tests' + sh 'poetry run flake8 pyewjn tests' } } stage('mypy') { steps { - sh 'poetry run mypy pynam' + sh 'poetry run mypy pyewjn' } } } @@ -43,7 +43,7 @@ pipeline { stage('Deploy') { environment { - PYPI=credentials("pypi-pynam") + PYPI=credentials("pypi-pyewjn") } when { diff --git a/README.md b/README.md index cc6e970..caadd9b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# pynam +# pyewjn python port of `nam_analysis` diff --git a/do.sh b/do.sh index 2ab1420..ebe78d5 100644 --- a/do.sh +++ b/do.sh @@ -16,8 +16,8 @@ fmt() { test() { echo "I am ${FUNCNAME[0]}ing" - poetry run flake8 pynam tests - poetry run mypy pynam + poetry run flake8 pyewjn tests + poetry run mypy pyewjn poetry run pytest } diff --git a/pynam/__init__.py b/pyewjn/__init__.py similarity index 100% rename from pynam/__init__.py rename to pyewjn/__init__.py diff --git a/pynam/baskets.py b/pyewjn/baskets.py similarity index 100% rename from pynam/baskets.py rename to pyewjn/baskets.py diff --git a/pyewjn/dielectric/__init__.py b/pyewjn/dielectric/__init__.py new file mode 100644 index 0000000..df3c171 --- /dev/null +++ b/pyewjn/dielectric/__init__.py @@ -0,0 +1,4 @@ +from pyewjn.dielectric.nam_dielectric_coefficient_approximator import get_nam_dielectric +from pyewjn.dielectric.lindhard_dielectric import get_lindhard_dielectric + +__all__ = ["get_nam_dielectric", "get_lindhard_dielectric"] diff --git a/pynam/dielectric/lindhard_dielectric.py b/pyewjn/dielectric/lindhard_dielectric.py similarity index 96% rename from pynam/dielectric/lindhard_dielectric.py rename to pyewjn/dielectric/lindhard_dielectric.py index a7c34c4..46cbe12 100644 --- a/pynam/dielectric/lindhard_dielectric.py +++ b/pyewjn/dielectric/lindhard_dielectric.py @@ -1,5 +1,5 @@ import numpy as np -from pynam.baskets import CalculationConstants, CalculationParams +from pyewjn.baskets import CalculationConstants, CalculationParams LINDHARD_SERIES_THRESHOLD = 1e4 diff --git a/pynam/dielectric/low_k_nam.py b/pyewjn/dielectric/low_k_nam.py similarity index 89% rename from pynam/dielectric/low_k_nam.py rename to pyewjn/dielectric/low_k_nam.py index 318cdfe..59629d7 100644 --- a/pynam/dielectric/low_k_nam.py +++ b/pyewjn/dielectric/low_k_nam.py @@ -1,7 +1,7 @@ import numpy as np from numpy.lib.scimath import sqrt as csqrt -import pynam.util +import pyewjn.util def g(w, wp): @@ -35,7 +35,7 @@ def i2(w, wp, k, v): def a(w, k, v, t): - return pynam.util.complex_quad( + return pyewjn.util.complex_quad( lambda wp: np.tanh((w + wp) / (2 * t)) * (i1(w, wp, k, v)), 1 - w, 1 )[0] @@ -47,7 +47,7 @@ def b_int(wp, w, k, v, t): def b(w, k, v, t, b_max=np.inf): - return pynam.util.complex_quad(lambda wp: b_int(wp, w, k, v, t), 1, b_max)[0] + return pyewjn.util.complex_quad(lambda wp: b_int(wp, w, k, v, t), 1, b_max)[0] def sigma_nam_alk(w, k, v, t): diff --git a/pynam/dielectric/nam_dielectric_coefficient_approximator.py b/pyewjn/dielectric/nam_dielectric_coefficient_approximator.py similarity index 93% rename from pynam/dielectric/nam_dielectric_coefficient_approximator.py rename to pyewjn/dielectric/nam_dielectric_coefficient_approximator.py index 951c803..13b0f09 100644 --- a/pynam/dielectric/nam_dielectric_coefficient_approximator.py +++ b/pyewjn/dielectric/nam_dielectric_coefficient_approximator.py @@ -1,8 +1,8 @@ import numpy as np -import pynam.dielectric.sigma_nam -import pynam.dielectric.low_k_nam +import pyewjn.dielectric.sigma_nam +import pyewjn.dielectric.low_k_nam -from pynam.baskets import CalculationParams, CalculationConstants +from pyewjn.baskets import CalculationParams, CalculationConstants from typing import Tuple @@ -70,7 +70,7 @@ def get_small_momentum_coefficients( dedim_params: DedimensionalisedParameters, ) -> Tuple[float, float]: prefactor = 4j * np.pi * dedim_params.b - s = pynam.dielectric.low_k_nam.sigma_nam_alk( + s = pyewjn.dielectric.low_k_nam.sigma_nam_alk( dedim_params.xi, 0, dedim_params.nu, dedim_params.t ) conductivity = prefactor * s @@ -81,7 +81,7 @@ def get_big_momentum_coefficients( dedim_params: DedimensionalisedParameters, ) -> Tuple[float, float]: prefactor = 4j * np.pi * dedim_params.b * FIXED_LARGE_MOMENTUM / dedim_params.a - s = pynam.dielectric.sigma_nam.sigma_nam( + s = pyewjn.dielectric.sigma_nam.sigma_nam( dedim_params.xi, FIXED_LARGE_MOMENTUM, dedim_params.nu, dedim_params.t ) conductivity = prefactor * s diff --git a/pynam/dielectric/sigma_nam.py b/pyewjn/dielectric/sigma_nam.py similarity index 90% rename from pynam/dielectric/sigma_nam.py rename to pyewjn/dielectric/sigma_nam.py index e194928..ef86bbd 100644 --- a/pynam/dielectric/sigma_nam.py +++ b/pyewjn/dielectric/sigma_nam.py @@ -1,7 +1,7 @@ import numpy as np from numpy.lib.scimath import sqrt as csqrt -import pynam.util +import pyewjn.util def g(w, wp): @@ -41,7 +41,7 @@ def i2(w, wp, k, v): def a(w, k, v, t): - result = pynam.util.complex_quad( + result = pyewjn.util.complex_quad( lambda wp: np.tanh((w + wp) / (2 * t)) * (i1(w, wp, k, v)), 1 - w, 1, @@ -58,7 +58,7 @@ def b_int(wp, w, k, v, t): def b(w, k, v, t, b_max=np.inf): - return pynam.util.complex_quad(lambda wp: b_int(wp, w, k, v, t), 1, b_max)[0] + return pyewjn.util.complex_quad(lambda wp: b_int(wp, w, k, v, t), 1, b_max)[0] def sigma_nam(w, k, v, t): diff --git a/pynam/noise/__init__.py b/pyewjn/noise/__init__.py similarity index 100% rename from pynam/noise/__init__.py rename to pyewjn/noise/__init__.py diff --git a/pynam/noise/chi.py b/pyewjn/noise/chi.py similarity index 84% rename from pynam/noise/chi.py rename to pyewjn/noise/chi.py index 22e2a5a..290c5af 100644 --- a/pynam/noise/chi.py +++ b/pyewjn/noise/chi.py @@ -3,11 +3,11 @@ from typing import Callable import numpy as np import scipy.integrate -import pynam.noise.im_ref +import pyewjn.noise.im_ref def get_chi_zz_e(eps: Callable[[float], complex]) -> Callable[[float], float]: - im_ref_p = pynam.noise.im_ref.get_im_ref_p(eps) + im_ref_p = pyewjn.noise.im_ref.get_im_ref_p(eps) def chi_zz_e(z: float) -> float: def integrand(y: float) -> float: diff --git a/pynam/noise/im_ref.py b/pyewjn/noise/im_ref.py similarity index 78% rename from pynam/noise/im_ref.py rename to pyewjn/noise/im_ref.py index 0029857..8574800 100644 --- a/pynam/noise/im_ref.py +++ b/pyewjn/noise/im_ref.py @@ -2,11 +2,11 @@ from typing import Callable import numpy as np -import pynam.noise.zeta +import pyewjn.noise.zeta def get_im_ref_p(eps: Callable[[float], complex]) -> Callable[[float], float]: - zeta_p = pynam.noise.zeta.get_zeta_p_function(eps) + zeta_p = pyewjn.noise.zeta.get_zeta_p_function(eps) def im_ref_p(u: float) -> float: zeta_p_val = zeta_p(u) diff --git a/pynam/noise/zeta.py b/pyewjn/noise/zeta.py similarity index 92% rename from pynam/noise/zeta.py rename to pyewjn/noise/zeta.py index b8858af..5c82506 100644 --- a/pynam/noise/zeta.py +++ b/pyewjn/noise/zeta.py @@ -1,4 +1,4 @@ -import pynam.util +import pyewjn.util from typing import Callable import numpy as np @@ -64,16 +64,16 @@ def get_zeta_p_function(eps: Callable[[float], complex]): def zeta_p(u: float) -> complex: # zeta_p_integrand = get_zeta_p_integrand(eps) - i1_small = pynam.util.complex_quad( + i1_small = pyewjn.util.complex_quad( lambda x: integrand1_small_x(x, u), 0, SMALL_X_BOUNDARY, epsabs=1e-12 ) - i1_big = pynam.util.complex_quad( + i1_big = pyewjn.util.complex_quad( lambda x: integrand1_big_x(x, u), SMALL_X_BOUNDARY, np.inf, epsabs=1e-12 ) - i2_small = pynam.util.complex_quad( + i2_small = pyewjn.util.complex_quad( lambda x: integrand2_small_x(x, u), 0, SMALL_X_BOUNDARY, epsabs=1e-12 ) - i2_big = pynam.util.complex_quad( + i2_big = pyewjn.util.complex_quad( lambda x: integrand2_big_x(x, u), SMALL_X_BOUNDARY, np.inf, epsabs=1e-12 ) diff --git a/pyewjn/util/__init__.py b/pyewjn/util/__init__.py new file mode 100644 index 0000000..2633293 --- /dev/null +++ b/pyewjn/util/__init__.py @@ -0,0 +1,3 @@ +from pyewjn.util.complex_integrate import complex_quad, complex_quadrature + +__all__ = ["complex_quad", "complex_quadrature"] diff --git a/pynam/util/complex_integrate.py b/pyewjn/util/complex_integrate.py similarity index 100% rename from pynam/util/complex_integrate.py rename to pyewjn/util/complex_integrate.py diff --git a/pynam/dielectric/__init__.py b/pynam/dielectric/__init__.py deleted file mode 100644 index bc84679..0000000 --- a/pynam/dielectric/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from pynam.dielectric.nam_dielectric_coefficient_approximator import get_nam_dielectric -from pynam.dielectric.lindhard_dielectric import get_lindhard_dielectric - -__all__ = ["get_nam_dielectric", "get_lindhard_dielectric"] diff --git a/pynam/util/__init__.py b/pynam/util/__init__.py deleted file mode 100644 index 39dccdb..0000000 --- a/pynam/util/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from pynam.util.complex_integrate import complex_quad, complex_quadrature - -__all__ = ["complex_quad", "complex_quadrature"] diff --git a/pyproject.toml b/pyproject.toml index c6d4545..d060481 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.poetry] -name = "pynam" +name = "pyewjn" version = "0.2.0" description = "" authors = ["Deepak "] @@ -23,7 +23,7 @@ build-backend = "poetry.masonry.api" [tool.pytest.ini_options] testpaths = ["tests"] -addopts = "--junitxml pytest.xml --cov pynam --cov-report=xml:coverage.xml --cov-fail-under=50 --cov-report=html" +addopts = "--junitxml pytest.xml --cov pyewjn --cov-report=xml:coverage.xml --cov-fail-under=50 --cov-report=html" junit_family = "xunit1" [tool.mypy] diff --git a/tests/dielectric/test_lindhard_dielectric.py b/tests/dielectric/test_lindhard_dielectric.py index 541bb43..feb7884 100644 --- a/tests/dielectric/test_lindhard_dielectric.py +++ b/tests/dielectric/test_lindhard_dielectric.py @@ -1,12 +1,12 @@ -import pynam.dielectric +import pyewjn.dielectric import numpy as np import pytest -from pynam.baskets import CalculationParams +from pyewjn.baskets import CalculationParams def get_common_lindhard_dielectric(): params = CalculationParams(omega=1e9, omega_p=3.5e15, tau=1e-14, v_f=2e6) - return pynam.dielectric.get_lindhard_dielectric(params) + return pyewjn.dielectric.get_lindhard_dielectric(params) @pytest.mark.parametrize( @@ -52,4 +52,4 @@ def zeta_p_i_epsilon(): params = CalculationParams( omega=1e9, omega_p=3.544907701811032e15, tau=1e-14, v_f=2e6 ) - return pynam.dielectric.get_lindhard_dielectric(params) + return pyewjn.dielectric.get_lindhard_dielectric(params) diff --git a/tests/dielectric/test_low_k_nam.py b/tests/dielectric/test_low_k_nam.py index 784f79f..7660664 100644 --- a/tests/dielectric/test_low_k_nam.py +++ b/tests/dielectric/test_low_k_nam.py @@ -1,4 +1,4 @@ -import pynam.dielectric.low_k_nam +import pyewjn.dielectric.low_k_nam import numpy as np import pytest @@ -9,7 +9,7 @@ import pytest ) def test_g(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.low_k_nam.g(*test_input), + pyewjn.dielectric.low_k_nam.g(*test_input), expected, decimal=7, err_msg="g function is off", @@ -22,7 +22,7 @@ def test_g(test_input, expected): ) def test_f(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.low_k_nam.f(*test_input), + pyewjn.dielectric.low_k_nam.f(*test_input), expected, decimal=7, err_msg="f function is off", @@ -35,7 +35,7 @@ def test_f(test_input, expected): ) def test_i1(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.low_k_nam.i1(*test_input), + pyewjn.dielectric.low_k_nam.i1(*test_input), expected, decimal=7, err_msg="i1 function is off", @@ -48,7 +48,7 @@ def test_i1(test_input, expected): ) def test_i2(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.low_k_nam.i2(*test_input), + pyewjn.dielectric.low_k_nam.i2(*test_input), expected, decimal=7, err_msg="i1 function is off", @@ -62,7 +62,7 @@ def test_i2(test_input, expected): ], ) def test_a(test_input, expected): - actual = np.real_if_close(pynam.dielectric.low_k_nam.a(*test_input)) + actual = np.real_if_close(pyewjn.dielectric.low_k_nam.a(*test_input)) np.testing.assert_almost_equal( actual, expected, decimal=6, err_msg="a function is off" ) @@ -76,7 +76,7 @@ def test_a(test_input, expected): ], ) def test_b_int(test_input, expected): - actual = np.real_if_close(pynam.dielectric.low_k_nam.b_int(*test_input)) + actual = np.real_if_close(pyewjn.dielectric.low_k_nam.b_int(*test_input)) np.testing.assert_almost_equal( actual, expected, decimal=6, err_msg="b int function is off" ) @@ -90,7 +90,7 @@ def test_b_int(test_input, expected): ], ) def test_b(test_input, expected): - actual = np.real_if_close(pynam.dielectric.low_k_nam.b(*test_input)) + actual = np.real_if_close(pyewjn.dielectric.low_k_nam.b(*test_input)) np.testing.assert_almost_equal( actual, expected, decimal=6, err_msg="b function is off" ) @@ -104,14 +104,14 @@ def test_b(test_input, expected): ], ) def test_sigma_alk(test_input, expected): - actual = np.real_if_close(pynam.dielectric.low_k_nam.sigma_nam_alk(*test_input)) + actual = np.real_if_close(pyewjn.dielectric.low_k_nam.sigma_nam_alk(*test_input)) np.testing.assert_almost_equal( actual, expected, decimal=6, err_msg="b function is off" ) def test_sigma_alk_benchmark(benchmark): - result = benchmark(pynam.dielectric.low_k_nam.sigma_nam_alk, 1, 2, 3, 4) + result = benchmark(pyewjn.dielectric.low_k_nam.sigma_nam_alk, 1, 2, 3, 4) np.testing.assert_almost_equal( result, 0.98358 + 0.648221j, decimal=6, err_msg="b function is off" ) diff --git a/tests/dielectric/test_nam_dielectric_coefficient_approximator.py b/tests/dielectric/test_nam_dielectric_coefficient_approximator.py index 365ab26..dbe7199 100644 --- a/tests/dielectric/test_nam_dielectric_coefficient_approximator.py +++ b/tests/dielectric/test_nam_dielectric_coefficient_approximator.py @@ -1,7 +1,7 @@ import pytest import numpy as np -import pynam.dielectric.nam_dielectric_coefficient_approximator -from pynam.baskets import CalculationParams +import pyewjn.dielectric.nam_dielectric_coefficient_approximator +from pyewjn.baskets import CalculationParams @pytest.mark.parametrize( @@ -24,7 +24,7 @@ from pynam.baskets import CalculationParams ], ) def test_dedimensionalise_parameters(test_input, expected): - actual_parameters = pynam.dielectric.nam_dielectric_coefficient_approximator.get_dedimensionalised_parameters( + actual_parameters = pyewjn.dielectric.nam_dielectric_coefficient_approximator.get_dedimensionalised_parameters( *test_input ) @@ -72,7 +72,7 @@ def test_dedimensionalise_parameters(test_input, expected): ], ) def test_nam_coefficients(test_input, expected): - actual_coefficients = pynam.dielectric.nam_dielectric_coefficient_approximator.get_nam_dielectric_coefficients( + actual_coefficients = pyewjn.dielectric.nam_dielectric_coefficient_approximator.get_nam_dielectric_coefficients( *test_input ) @@ -112,7 +112,7 @@ def test_nam_coefficients(test_input, expected): def test_nam_eps(): u_c = 1e15 eps_to_test = ( - pynam.dielectric.nam_dielectric_coefficient_approximator.get_nam_dielectric( + pyewjn.dielectric.nam_dielectric_coefficient_approximator.get_nam_dielectric( u_c, CalculationParams( omega=1e9, omega_p=3.54491e15, tau=1e-14, v_f=2e6, t_rel=0.8, t_c=1e11 diff --git a/tests/dielectric/test_sigma_nam.py b/tests/dielectric/test_sigma_nam.py index 4a3d594..c3abd2f 100644 --- a/tests/dielectric/test_sigma_nam.py +++ b/tests/dielectric/test_sigma_nam.py @@ -1,4 +1,4 @@ -import pynam.dielectric.sigma_nam +import pyewjn.dielectric.sigma_nam import numpy as np import pytest @@ -9,7 +9,7 @@ import pytest ) def test_g(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.sigma_nam.g(*test_input), + pyewjn.dielectric.sigma_nam.g(*test_input), expected, decimal=7, err_msg="g function is off", @@ -21,7 +21,7 @@ def test_g(test_input, expected): ) def test_s(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.sigma_nam.s(*test_input), + pyewjn.dielectric.sigma_nam.s(*test_input), expected, decimal=7, err_msg="s function is off", @@ -41,7 +41,7 @@ def test_s(test_input, expected): ) def test_f(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.sigma_nam.f(*test_input), + pyewjn.dielectric.sigma_nam.f(*test_input), expected, decimal=7, err_msg="f function is off", @@ -62,7 +62,7 @@ def test_f(test_input, expected): ) def test_i1(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.sigma_nam.i1(*test_input), + pyewjn.dielectric.sigma_nam.i1(*test_input), expected, decimal=7, err_msg="i1 function is off", @@ -83,7 +83,7 @@ def test_i1(test_input, expected): ) def test_i2(test_input, expected): np.testing.assert_almost_equal( - pynam.dielectric.sigma_nam.i2(*test_input), + pyewjn.dielectric.sigma_nam.i2(*test_input), expected, decimal=7, err_msg="i1 function is off", @@ -101,7 +101,7 @@ def test_i2(test_input, expected): ], ) def test_a(test_input, expected): - actual = np.real_if_close(pynam.dielectric.sigma_nam.a(*test_input)) + actual = np.real_if_close(pyewjn.dielectric.sigma_nam.a(*test_input)) np.testing.assert_allclose(actual, expected, rtol=1e-5, err_msg="a function is off") @@ -117,7 +117,7 @@ def test_a(test_input, expected): ], ) def test_b_int(test_input, expected): - actual = np.real_if_close(pynam.dielectric.sigma_nam.b_int(*test_input)) + actual = np.real_if_close(pyewjn.dielectric.sigma_nam.b_int(*test_input)) np.testing.assert_almost_equal( actual, expected, decimal=6, err_msg="b int function is off" ) @@ -131,7 +131,7 @@ def test_b_int(test_input, expected): ], ) def test_b(test_input, expected): - actual = np.real_if_close(pynam.dielectric.sigma_nam.b(*test_input)) + actual = np.real_if_close(pyewjn.dielectric.sigma_nam.b(*test_input)) np.testing.assert_almost_equal( actual, expected, decimal=6, err_msg="b function is off" ) @@ -149,14 +149,14 @@ def test_b(test_input, expected): ], ) def test_sigma_nam(test_input, expected): - actual = np.real_if_close(pynam.dielectric.sigma_nam.sigma_nam(*test_input)) + actual = np.real_if_close(pyewjn.dielectric.sigma_nam.sigma_nam(*test_input)) np.testing.assert_allclose( actual, expected, rtol=1e-3, err_msg="sigma_nam function is off" ) def test_sigma_nam_benchmark(benchmark): - result = benchmark(pynam.dielectric.sigma_nam.sigma_nam, 1, 2, 3, 4) + result = benchmark(pyewjn.dielectric.sigma_nam.sigma_nam, 1, 2, 3, 4) np.testing.assert_almost_equal( result, 0.984117 + 0.647951j, diff --git a/tests/noise/test_chi.py b/tests/noise/test_chi.py index 84ad9e6..bc86256 100644 --- a/tests/noise/test_chi.py +++ b/tests/noise/test_chi.py @@ -1,9 +1,9 @@ import numpy as np import pytest -import pynam.dielectric -import pynam.noise.chi -from pynam.baskets import CalculationParams +import pyewjn.dielectric +import pyewjn.noise.chi +from pyewjn.baskets import CalculationParams @pytest.fixture @@ -11,8 +11,8 @@ def chi_zz_e_lindhard(): params = CalculationParams( omega=1e9, v_f=2e6, omega_p=3.544907701811032e15, tau=1e-14 ) - eps_l = pynam.dielectric.get_lindhard_dielectric(params) - return pynam.noise.chi.get_chi_zz_e(eps_l) + eps_l = pyewjn.dielectric.get_lindhard_dielectric(params) + return pyewjn.noise.chi.get_chi_zz_e(eps_l) @pytest.mark.parametrize( diff --git a/tests/noise/test_im_ref.py b/tests/noise/test_im_ref.py index 6304d09..fbb11e2 100644 --- a/tests/noise/test_im_ref.py +++ b/tests/noise/test_im_ref.py @@ -1,9 +1,9 @@ import numpy as np import pytest -import pynam.dielectric -import pynam.noise.im_ref -from pynam.baskets import CalculationParams +import pyewjn.dielectric +import pyewjn.noise.im_ref +from pyewjn.baskets import CalculationParams @pytest.fixture @@ -11,8 +11,8 @@ def im_ref_p_lindhard(): params = CalculationParams( omega=1e9, v_f=2e6, omega_p=3.544907701811032e15, tau=1e-14 ) - eps_l = pynam.dielectric.get_lindhard_dielectric(params) - return pynam.noise.im_ref.get_im_ref_p(eps_l) + eps_l = pyewjn.dielectric.get_lindhard_dielectric(params) + return pyewjn.noise.im_ref.get_im_ref_p(eps_l) @pytest.mark.parametrize( diff --git a/tests/noise/test_zeta.py b/tests/noise/test_zeta.py index 7315581..af2d04f 100644 --- a/tests/noise/test_zeta.py +++ b/tests/noise/test_zeta.py @@ -1,9 +1,9 @@ import numpy as np import pytest -import pynam.dielectric -import pynam.noise.zeta -from pynam.baskets import CalculationParams +import pyewjn.dielectric +import pyewjn.noise.zeta +from pyewjn.baskets import CalculationParams @pytest.fixture @@ -11,8 +11,8 @@ def zeta_p_integrand_lindhard(): params = CalculationParams( omega=1e9, v_f=2e6, omega_p=3.544907701811032e15, tau=1e-14 ) - eps_l = pynam.dielectric.get_lindhard_dielectric(params) - return pynam.noise.zeta.get_zeta_p_integrand(eps_l) + eps_l = pyewjn.dielectric.get_lindhard_dielectric(params) + return pyewjn.noise.zeta.get_zeta_p_integrand(eps_l) @pytest.mark.parametrize( @@ -41,8 +41,8 @@ def zeta_p_lindhard(): params = CalculationParams( omega=1e9, v_f=2e6, omega_p=3.544907701811032e15, tau=1e-14 ) - eps_l = pynam.dielectric.get_lindhard_dielectric(params) - return pynam.noise.zeta.get_zeta_p_function(eps_l) + eps_l = pyewjn.dielectric.get_lindhard_dielectric(params) + return pyewjn.noise.zeta.get_zeta_p_function(eps_l) @pytest.mark.parametrize( diff --git a/tests/test_pynam.py b/tests/test_pynam.py index d5628b3..74cdb09 100644 --- a/tests/test_pynam.py +++ b/tests/test_pynam.py @@ -1,4 +1,4 @@ -from pynam import __version__ +from pyewjn import __version__ def test_version(): diff --git a/tests/util/test_complex_integrate.py b/tests/util/test_complex_integrate.py index 3068b25..a791455 100644 --- a/tests/util/test_complex_integrate.py +++ b/tests/util/test_complex_integrate.py @@ -1,9 +1,9 @@ import numpy as np -import pynam.util.complex_integrate +import pyewjn.util.complex_integrate def test_complex_quad(): - actual = pynam.util.complex_integrate.complex_quad( + actual = pyewjn.util.complex_integrate.complex_quad( lambda x: x**2 + 1j * x**3, 0, 6 )[0] # int_1^6 dx x^2 + i x^3 should equal (1/3)6^3 + (i/4)6^4 @@ -17,7 +17,7 @@ def test_complex_quad(): def test_complex_quadrature(): - actual = pynam.util.complex_integrate.complex_quadrature( + actual = pyewjn.util.complex_integrate.complex_quadrature( lambda x: x**2 + 1j * x**3, 0, 6 )[0] # int_1^6 dx x^2 + i x^3 should equal (1/3)6^3 + (i/4)6^4