diff --git a/fluidsim/base/preprocess/pseudo_spect.py b/fluidsim/base/preprocess/pseudo_spect.py index 14d9e24a0d472e40f823e9bae3ea651ed49f1bf4_Zmx1aWRzaW0vYmFzZS9wcmVwcm9jZXNzL3BzZXVkb19zcGVjdC5weQ==..c14af414f8d93b4b5774e4c98d01f2d8161bef06_Zmx1aWRzaW0vYmFzZS9wcmVwcm9jZXNzL3BzZXVkb19zcGVjdC5weQ== 100644 --- a/fluidsim/base/preprocess/pseudo_spect.py +++ b/fluidsim/base/preprocess/pseudo_spect.py @@ -153,7 +153,7 @@ viscosity_type, oper=self.oper, verbose=False, - *args + *args, ) for v in values: attr, order, nu = v @@ -280,9 +280,11 @@ length_scale = C * np.pi / k_max k_f = deltak * nk_f large_scale = np.pi / k_f + + k_diss = k_max / C / np.pi if verbose: print("Max. wavenumber =", np.pi / delta_x) print("Max. resolved wavenumber, k_max =", k_max) print("Grid spacing, delta_x =", delta_x) print("\nESTIMATED (P~eps)") print( @@ -283,12 +285,9 @@ if verbose: print("Max. wavenumber =", np.pi / delta_x) print("Max. resolved wavenumber, k_max =", k_max) print("Grid spacing, delta_x =", delta_x) print("\nESTIMATED (P~eps)") print( - "Kolmogorov wavenumber, k_d = ", - k_max / C, - "; k_d / k_f = ", - k_max / C / k_f, + f"Dissipation wavenumber, k_d = {k_diss}; k_d / k_f = {k_diss / k_f}" ) print( @@ -293,9 +292,6 @@ ) print( - "Kolmogorov length scale, L_d = ", - length_scale, - "; L_d / L_f = ", - length_scale / large_scale, + f"Dissipation length scale, L_d = {length_scale}; L_d / L_f = {length_scale / large_scale}" ) print("Viscosity scale:", viscosity_scale, "=", args) @@ -359,7 +355,7 @@ v.append(0.0) if verbose: - kolmo_len = np.mean(kolmo_len) - kolmo_k = np.pi / kolmo_len + length_scale = np.mean(kolmo_len) + k_diss = 1. / length_scale print("\nCALCULATED (eps={})".format(epsilon)) print( @@ -364,8 +360,5 @@ print("\nCALCULATED (eps={})".format(epsilon)) print( - "Kolmogorov wavenumber, k_d = ", - kolmo_k, - "; k_d / k_f = ", - kolmo_k / k_f, + f"Dissipation wavenumber, k_d = {k_diss}; k_d / k_f = {k_diss / k_f}" ) print( @@ -370,8 +363,5 @@ ) print( - "Kolmogorov length scale, L_d = ", - kolmo_len, - "; L_d / L_f = ", - kolmo_len / large_scale, + f"Dissipation length scale, L_d = {length_scale}; L_d / L_f = {length_scale / large_scale}" ) @@ -376,3 +366,3 @@ ) - return dict_visc.values() + return dict_visc