diff --git a/example.py b/example.py index 5af96c70d0d2389acfc4609ad0061b02a4028d39..42601fae1ac03ccf883287b13db93d07c11eda39 100644 --- a/example.py +++ b/example.py @@ -8,7 +8,7 @@ def main(): # Parameters params = { - "nbModes": 2048, + "nbModes": 256, "Mt": 0.23, "Pressure": 1.0, "Temperature": 1.0, diff --git a/test/test_PoissonSolver.py b/test/test_PoissonSolver.py index f6ab6aace24965fe41e6e3b0a11ab92aa9b0a871..de095da5da180932b979218c2f7389bb20c196d0 100644 --- a/test/test_PoissonSolver.py +++ b/test/test_PoissonSolver.py @@ -1,5 +1,6 @@ import numpy as np from pyTurbulence.poissonSolver import poisson_3d +import warnings def test_poisson(): # Define a more complex 3D source term diff --git a/test/test_SolenoidalPressure.py b/test/test_SolenoidalPressure.py index 4b44ab80269027696d4bb21d5697f2d9c5fa7ef4..d4ecb77f456231e699126a91c111250c5cd27fdb 100644 --- a/test/test_SolenoidalPressure.py +++ b/test/test_SolenoidalPressure.py @@ -1,6 +1,7 @@ import numpy as np from pyTurbulence.syntheticTurbulence import compute_solenoidal_pressure from pyTurbulence.poissonSolver import poisson_3d +import warnings def test_compute_solenoidal_pressure(): # Define a simple test case diff --git a/test/test_SolenoidalVelocity.py b/test/test_SolenoidalVelocity.py index d19796e10dd6868b0b63b50e8f7b83898c6558ba..e0b0ff484abbe62fe618dfa8af7621069cfc180c 100644 --- a/test/test_SolenoidalVelocity.py +++ b/test/test_SolenoidalVelocity.py @@ -1,6 +1,7 @@ import numpy as np from pyTurbulence.spectrum import energy_spectrum, compute_tke_spectrum, plot_spectrum from pyTurbulence.syntheticTurbulence import compute_solenoidal_velocities +import warnings def test_solenoidal_velocity(): k = np.linspace(0,1024,1024) @@ -16,22 +17,22 @@ def test_solenoidal_velocity(): k0_spectrum = k[idxMax] # Generate solenoidal field - nbModes = 1024 + nbModes = 2048 domain_size = (2. * np.pi, 2. * np.pi, 2. * np.pi) - domain_resolution = (64,64,64) + domain_resolution = (32,32,32) - u,v,w,_ = compute_solenoidal_velocities(name,nbModes, urms, k0, domain_size, domain_resolution) + u,v,w,wmax = compute_solenoidal_velocities(name,nbModes, urms, k0, domain_size, domain_resolution) # Compute TKE from generated field TKE_field = np.mean(0.5*(u.reshape(-1)**2 + v.reshape(-1)**2 + w.reshape(-1)**2)) # Generate spectrum from solenoidal field - _, wave_numbers, E_k = compute_tke_spectrum(u, v, w, domain_size[0], domain_size[1], domain_size[2]) + knyquist, wave_numbers, E_k = compute_tke_spectrum(u, v, w, domain_size[0], domain_size[1], domain_size[2]) idxMax = np.argmax(E_k) k0_field = wave_numbers[idxMax] assert np.isclose(TKE_field, TKE_spectrum, rtol=0.05), "Test failed: Generated field does not match expected TKE" - assert np.isclose(k0_field, k0_spectrum, rtol=0.01), "Test failed: Generated field does not conserve TKE" + assert np.isclose(k0_field, k0_spectrum, atol=1.1), "Test failed: Generated field does not conserve TKE" test_solenoidal_velocity() \ No newline at end of file diff --git a/test/test_Spectrum.py b/test/test_Spectrum.py index ab0419112b69f0e2f99eb449a0fba956ca40f27c..061a579a80eceb03303d8749560872f800dc51ec 100644 --- a/test/test_Spectrum.py +++ b/test/test_Spectrum.py @@ -1,5 +1,6 @@ import numpy as np from pyTurbulence.spectrum import energy_spectrum +import warnings def test_energy_spectrum_passot_pouquet(): k = np.linspace(0,1024,1024) diff --git a/test/test_ThermodynamicFields.py b/test/test_ThermodynamicFields.py index 8324299a7e09f9e06ca0cb8459a947565941959d..7083f3cc3469beb1087d993c7d4b46ce4a0a327b 100644 --- a/test/test_ThermodynamicFields.py +++ b/test/test_ThermodynamicFields.py @@ -1,5 +1,6 @@ import numpy as np from pyTurbulence.syntheticTurbulence import compute_thermodynamic_fields +import warnings def test_compute_thermodynamic_fields(): # Define test parameters