diff --git a/pyTurbulence/solver.py b/pyTurbulence/solver.py index 42127a96884266ad2ea22b52ec7fee5fc398f4a7..bc1f9f70f1160e0e5476420f39b97ed2bc982ccc 100644 --- a/pyTurbulence/solver.py +++ b/pyTurbulence/solver.py @@ -22,7 +22,7 @@ def solve(user_params)->dict: - "k0" (int): Peak wavenumber (default: 4). - "domain_size" (list, tuple, np.ndarray): Size of the simulation domain, should be a 3D vector (default: [2Ï€, 2Ï€, 2Ï€]). - "domain_resolution" (list, tuple, np.ndarray): Resolution of the domain, should be a 3D vector (default: [64, 64, 64]). - - "Spectrum" (str): Type of spectrum for turbulence generation. Options: "PassotPouquet", "Gaussian" (default: "PassotPouquet"). + - "Spectrum" (str): Type of spectrum for turbulence generation. Options: "PassotPouquet" (default: "PassotPouquet"). - "gamma" (float): Heat capacity ratio, typically between 1 and 2 (default: 1.4). - "case" (int): Type of turbulent fields to generate. Options: 0, 1 (default: 1). 0: incompressible - 1: compressible. - "output_dir" (str): Directory to store output results (default: "results"). @@ -210,7 +210,7 @@ def _validate_params(params) -> dict: # Define allowed values for specific parameters allowed_values = { - "Spectrum": {"PassotPouquet", "Gaussian"}, # Allowed spectrum types + "Spectrum": {"PassotPouquet"}, # Allowed spectrum types "case": {0, 1}, # Allowed integer cases } diff --git a/pyTurbulence/spectrum.py b/pyTurbulence/spectrum.py index 8fbf2a79970c50cb9ad33d41917b92ab5c4611d6..d2c1e80482a0638796d453b7d78f450e44129e2c 100644 --- a/pyTurbulence/spectrum.py +++ b/pyTurbulence/spectrum.py @@ -26,8 +26,6 @@ def energy_spectrum(spectrum: str, k: np.ndarray, urms: float, k0: float) -> np. E_k = np.empty_like(k) if spectrum == "PassotPouquet": E_k = (urms**2 * 16. * np.sqrt(2. / np.pi) * k**4 / k0**5) * np.exp(-2. * (k / k0)**2) - if spectrum == "Gaussian": - E_k = 0.00013*k**4*np.exp(-2.*k**2/k0**2) return E_k def compute_tke_spectrum(u : np.ndarray,v : np.ndarray,w : np.ndarray, diff --git a/test/test_Spectrum.py b/test/test_Spectrum.py index 061a579a80eceb03303d8749560872f800dc51ec..972fbb65d4fcfb8b3c89ff59965f04c06854dcf1 100644 --- a/test/test_Spectrum.py +++ b/test/test_Spectrum.py @@ -14,15 +14,4 @@ def test_energy_spectrum_passot_pouquet(): assert np.isclose(k0_spectrum, k0,rtol=1e-2), "Test failed: PassotPouquet spectrum does not match expected k0" assert np.isclose(TKE_spectrum, TKE, rtol=1e-2), "Test failed: PassotPouquet spectrum does not conserve TKE" -def test_energy_spectrum_constant(): - k = np.linspace(0,1024,1024) - TKE = 0.5 - k0 = 4.0 - spectrum = energy_spectrum("Constant", k, TKE, k0) - TKE_spectrum = np.trapz(spectrum, k) - idxMax = np.argmax(spectrum) - k0_spectrum = k[idxMax] - assert np.isclose(k0_spectrum, k0,1e-2), "Test failed: Constant spectrum does not match expected k0" - test_energy_spectrum_passot_pouquet() -test_energy_spectrum_constant() \ No newline at end of file