diff --git a/bench/old/compare_fluidfft.py b/bench/old/compare_fluidfft.py index 3b00de54..23406244 100644 --- a/bench/old/compare_fluidfft.py +++ b/bench/old/compare_fluidfft.py @@ -14,7 +14,6 @@ def modif_params(params, old=False): - params.short_name_type_run = "profile" nh = 512 * 2 diff --git a/bench/profiling/util_bench.py b/bench/profiling/util_bench.py index 712b8a16..467d2080 100644 --- a/bench/profiling/util_bench.py +++ b/bench/profiling/util_bench.py @@ -83,7 +83,6 @@ def modif_params_profile3d(params, nh=256, nz=32): def profile(sim, nb_dim=2): - t0 = time() cProfile.runctx( @@ -111,7 +110,6 @@ def profile(sim, nb_dim=2): def bench(sim): - t_as_str = time_as_str() t0 = time() sim.time_stepping.start() @@ -183,7 +181,6 @@ def print_analysis(s): continue if k == "fft2d": - if ( "util_pythran" in key[2] or "operators.py" in key[0] @@ -255,7 +252,6 @@ def print_analysis3d(s): for k in times.keys(): if k in name or k in key[0]: - if k == "fft3d": if "pythran" in key[0] or "pythran" in key[2]: continue diff --git a/bench/util.py b/bench/util.py index b2a4740e..e81170de 100644 --- a/bench/util.py +++ b/bench/util.py @@ -161,7 +161,6 @@ def parser_to_params(parser): def init_cluster(params, Cluster, prefix="snic", subdir="benchmarks"): - cluster = Cluster() if cluster.name_cluster == "beskow": cluster.default_project = "2017-12-20" diff --git a/doc/examples/clusters/jean_zay/scripts/run_simul.py b/doc/examples/clusters/jean_zay/scripts/run_simul.py index f4e94d72..b74e9c67 100755 --- a/doc/examples/clusters/jean_zay/scripts/run_simul.py +++ b/doc/examples/clusters/jean_zay/scripts/run_simul.py @@ -11,7 +11,6 @@ from fluidsim.util.scripts.turb_trandom_anisotropic import main if __name__ == "__main__": - params, sim = main( N=10, forced_field="polo", diff --git a/doc/examples/clusters/jean_zay/scripts/submit_check_fluidfft.py b/doc/examples/clusters/jean_zay/scripts/submit_check_fluidfft.py index 91c7ed33..6a8ca767 100644 --- a/doc/examples/clusters/jean_zay/scripts/submit_check_fluidfft.py +++ b/doc/examples/clusters/jean_zay/scripts/submit_check_fluidfft.py @@ -12,7 +12,6 @@ libraries = ["fftw1d", "fftwmpi3d", "pfft", "p3dfft"] for lib in libraries: - cluster.submit_script( f"check_fluidfft.py fft3d.mpi_with_{lib}", name_run=f"check_fluidfft_{lib}", diff --git a/doc/examples/clusters/licallo/scripts/submit_check_fluidfft.py b/doc/examples/clusters/licallo/scripts/submit_check_fluidfft.py index 7fd1f941..e30c4b0a 100644 --- a/doc/examples/clusters/licallo/scripts/submit_check_fluidfft.py +++ b/doc/examples/clusters/licallo/scripts/submit_check_fluidfft.py @@ -12,7 +12,6 @@ libraries = ["fftw1d", "fftwmpi3d"] # , "pfft", "p3dfft"] for lib in libraries: - cluster.submit_script( f"check_fluidfft.py fft3d.mpi_with_{lib}", name_run=f"check_fluidfft_{lib}", diff --git a/doc/examples/clusters/occigen/scripts/run_simul.py b/doc/examples/clusters/occigen/scripts/run_simul.py index 787036da..e6d9efbd 100644 --- a/doc/examples/clusters/occigen/scripts/run_simul.py +++ b/doc/examples/clusters/occigen/scripts/run_simul.py @@ -69,7 +69,6 @@ def main(args): - params = Simul.create_default_params() diameter = args.diameter # m diff --git a/doc/examples/clusters/occigen/scripts/submit_check_fluidfft.py b/doc/examples/clusters/occigen/scripts/submit_check_fluidfft.py index 14d99b6a..a2a79079 100644 --- a/doc/examples/clusters/occigen/scripts/submit_check_fluidfft.py +++ b/doc/examples/clusters/occigen/scripts/submit_check_fluidfft.py @@ -12,7 +12,6 @@ libraries = ["fftw1d", "fftwmpi3d", "p3dfft", "pfft"] for lib in libraries: - cluster.submit_script( f"check_fluidfft.py fft3d.mpi_with_{lib}", name_run=f"check_fluidfft_{lib}", diff --git a/doc/examples/clusters/occigen/scripts/submit_restart.py b/doc/examples/clusters/occigen/scripts/submit_restart.py index 5c06bcf2..e56279f7 100644 --- a/doc/examples/clusters/occigen/scripts/submit_restart.py +++ b/doc/examples/clusters/occigen/scripts/submit_restart.py @@ -15,7 +15,6 @@ for path in paths: - command = f"run_simul_restart.py -p {path}" print(f"submitting:\npython {command}") diff --git a/doc/examples/clusters/occigen/scripts/submit_simul_20200518.py b/doc/examples/clusters/occigen/scripts/submit_simul_20200518.py index b955c1c2..44e2bfa2 100644 --- a/doc/examples/clusters/occigen/scripts/submit_simul_20200518.py +++ b/doc/examples/clusters/occigen/scripts/submit_simul_20200518.py @@ -28,7 +28,6 @@ def submit_simul(N, diameter, speed): - command = ( f"run_simul.py -N {N} -D {diameter} -s {speed} " f"-nypc {ny_per_cylinder} " diff --git a/doc/examples/forcing_anisotropic_3d/run_simul_polo.py b/doc/examples/forcing_anisotropic_3d/run_simul_polo.py index c5555f01..1fce576a 100755 --- a/doc/examples/forcing_anisotropic_3d/run_simul_polo.py +++ b/doc/examples/forcing_anisotropic_3d/run_simul_polo.py @@ -11,5 +11,4 @@ from fluidsim.util.scripts.turb_trandom_anisotropic import main if __name__ == "__main__": - params, sim = main(N=10) diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/compress.py b/doc/examples/forcing_anisotropic_3d/toro2022/compress.py index 4ade4508..a87bb3a7 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/compress.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/compress.py @@ -17,7 +17,6 @@ base_command = "h5repack -f SHUF -f GZIP=4" for path_sim in paths: - if path_sim.name in simuls_not_finished: continue diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/occigen/postrun_from_legi.py b/doc/examples/forcing_anisotropic_3d/toro2022/occigen/postrun_from_legi.py index 23d0217d..a483ab28 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/occigen/postrun_from_legi.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/occigen/postrun_from_legi.py @@ -96,7 +96,6 @@ paths_ipynb = sorted(path_base.glob("results_papermill/analyze_*.ipynb")) for path_ipynb in paths_ipynb: - path_pdf = path_ipynb.with_suffix(".pdf") date_in = modification_date(path_ipynb) try: diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/occigen/submit_from_file896.py b/doc/examples/forcing_anisotropic_3d/toro2022/occigen/submit_from_file896.py index d08c04e7..0b8e7be9 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/occigen/submit_from_file896.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/occigen/submit_from_file896.py @@ -34,7 +34,6 @@ def type_fft_from_N(N): for path_init_dir in paths_in: - name_old_sim = path_init_dir.name N_str = re.search(r"_N(.*?)_", name_old_sim).group(1) diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/occigen/util.py b/doc/examples/forcing_anisotropic_3d/toro2022/occigen/util.py index 00dc7ae2..30178e25 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/occigen/util.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/occigen/util.py @@ -32,7 +32,6 @@ def run(command): def get_info_jobs(): - process = run(f"squeue -u {user}") lines = process.stdout.split("\n")[1:] jobs_id = [line.split()[0] for line in lines if line] @@ -71,7 +70,6 @@ def lprod(a, b): def submit_from_file(nh, nh_small, t_end, nb_nodes_from_N, type_fft_from_N): - print("path_base:", path_base, sep="\n") paths_in = sorted( @@ -151,7 +149,6 @@ def submit_from_file(nh, nh_small, t_end, nb_nodes_from_N, type_fft_from_N): def submit_restart(nh, t_end, nb_nodes_from_N, max_elapsed_time="23:30:00"): - nb_cores_per_node = 28 max_elapsed_time = pytimeparse.parse(max_elapsed_time) diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/pyfig/util.py b/doc/examples/forcing_anisotropic_3d/toro2022/pyfig/util.py index aa3e252d..1c9aaa67 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/pyfig/util.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/pyfig/util.py @@ -80,7 +80,6 @@ def customize(result, sim): def get_customized_dataframe(paths): - df = get_dataframe_from_paths( paths, tmin="t_start+2", use_cache=1, customize=customize ) diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/run_simul_toro.py b/doc/examples/forcing_anisotropic_3d/toro2022/run_simul_toro.py index bd916fc3..94dc5ce8 100755 --- a/doc/examples/forcing_anisotropic_3d/toro2022/run_simul_toro.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/run_simul_toro.py @@ -12,7 +12,6 @@ from fluidsim.util.scripts.turb_trandom_anisotropic import main if __name__ == "__main__": - params, sim = main( forced_field="toro", F=1.0, diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/submit320.py b/doc/examples/forcing_anisotropic_3d/toro2022/submit320.py index 78073748..bff3f987 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/submit320.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/submit320.py @@ -15,7 +15,6 @@ walltime = "04:00:00" for N, Rb in sorted(couples320): - ratio_nh_nz = get_ratio_nh_nz(N) nz = nh // ratio_nh_nz @@ -55,7 +54,6 @@ continue else: - t_start, t_last = times_start_last_from_path(path) if t_last >= t_end: params = f"{N=} {Rb=} {nh=}" diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/submit640.py b/doc/examples/forcing_anisotropic_3d/toro2022/submit640.py index e081496e..cccb7e9a 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/submit640.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/submit640.py @@ -42,14 +42,12 @@ def filter_path(paths, Rb, N): for N, Rb in sorted(couples640): - name_1st_run = f"from_modified_resol_nx{nh}_Rb{Rb}_N{N}" job_id = get_job_id(name_1st_run) try: path = filter_path(paths, Rb, N) except IndexError: if job_id is None: - try: path_init = filter_path(paths_init, Rb, N) except IndexError: diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/create_init_tgcc.py b/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/create_init_tgcc.py index 12a80281..b5e418b5 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/create_init_tgcc.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/create_init_tgcc.py @@ -6,7 +6,6 @@ path_legi = path_base / "aniso" for name in new_simuls.init: - if name.startswith("("): continue nh = int(name.split("_", 1)[1].split("x", 1)[0]) diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/modif_resolutions_legi.py b/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/modif_resolutions_legi.py index 4df10fd6..3e92025d 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/modif_resolutions_legi.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/modif_resolutions_legi.py @@ -6,7 +6,6 @@ for name, nh_after, nz_after in zip( new_simuls.init, new_simuls.nh, new_simuls.nz ): - if name.startswith("("): continue diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/submit_from_file.py b/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/submit_from_file.py index bfbfd318..f2b2c1ee 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/submit_from_file.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/submit_from_file.py @@ -26,7 +26,6 @@ if sim.init.startswith("("): raise NotImplementedError else: - path_simul_init = next(path_init_tgcc.glob(f"*{sim.name}*")) print(path_simul_init) diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/summary_simuls.py b/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/summary_simuls.py index 4d94f3b2..bb4bd570 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/summary_simuls.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/tgcc/summary_simuls.py @@ -163,7 +163,6 @@ nz_better = nz init = name[28:] for nh, nz in nhnz_new_simuls: - if nh > 2000: t_simul = 2.5 else: diff --git a/doc/examples/forcing_anisotropic_3d/toro2022/util.py b/doc/examples/forcing_anisotropic_3d/toro2022/util.py index fa84e4aa..da42fb1f 100644 --- a/doc/examples/forcing_anisotropic_3d/toro2022/util.py +++ b/doc/examples/forcing_anisotropic_3d/toro2022/util.py @@ -91,7 +91,6 @@ def get_ratio_nh_nz(N): def customize(result, sim): - EKh = result["EKh"] EKz = result["EKz"] EK = EKh + EKz diff --git a/doc/examples/milestone/run_simul.py b/doc/examples/milestone/run_simul.py index c2d3e85a..a97d6183 100644 --- a/doc/examples/milestone/run_simul.py +++ b/doc/examples/milestone/run_simul.py @@ -86,7 +86,6 @@ def main(args): - params = Simul.create_default_params() diameter = args.diameter # m diff --git a/doc/examples/simul_ns2dbouss_staticlayer.py b/doc/examples/simul_ns2dbouss_staticlayer.py index 0919b4c8..7277290b 100644 --- a/doc/examples/simul_ns2dbouss_staticlayer.py +++ b/doc/examples/simul_ns2dbouss_staticlayer.py @@ -78,7 +78,6 @@ # monkey-patching for forcing if rank == 0: - forcing_maker = sim.forcing.forcing_maker oper = forcing_maker.oper_coarse Y = oper.Y diff --git a/doc/examples/taylor-green_forcing/run_simul.py b/doc/examples/taylor-green_forcing/run_simul.py index e4f3761d..b1e9e49f 100644 --- a/doc/examples/taylor-green_forcing/run_simul.py +++ b/doc/examples/taylor-green_forcing/run_simul.py @@ -26,7 +26,6 @@ def main(args): - F0 = 1.0 L = 1.0 V0 = sqrt(F0 * L) diff --git a/doc/examples/time_stepping/3d/analyse_profiles.py b/doc/examples/time_stepping/3d/analyse_profiles.py index cad92676..a8a6cb18 100644 --- a/doc/examples/time_stepping/3d/analyse_profiles.py +++ b/doc/examples/time_stepping/3d/analyse_profiles.py @@ -74,7 +74,6 @@ def get_dataframe(path_dir): coefs = df_1scheme.coef_dealiased.unique() coefs.sort() for coef in coefs: - df_tmp = df_1scheme[df_1scheme.coef_dealiased == coef] if coef == 2 / 3: str_coef = "2/3" diff --git a/doc/examples/time_stepping/3d/launch_profiles_with_dask.py b/doc/examples/time_stepping/3d/launch_profiles_with_dask.py index 595ae22d..42c9979c 100644 --- a/doc/examples/time_stepping/3d/launch_profiles_with_dask.py +++ b/doc/examples/time_stepping/3d/launch_profiles_with_dask.py @@ -30,7 +30,6 @@ def submit(nx, coef_dealiasing, scheme): if __name__ == "__main__": - cluster = LocalCluster(n_workers=2, threads_per_worker=1) client = Client(cluster) diff --git a/doc/examples/time_stepping/3d/run_simul.py b/doc/examples/time_stepping/3d/run_simul.py index bfc5c904..889f9da2 100644 --- a/doc/examples/time_stepping/3d/run_simul.py +++ b/doc/examples/time_stepping/3d/run_simul.py @@ -120,7 +120,6 @@ def init_params(args): - params = Simul.create_default_params() if args.truncation_shape == "cubic": @@ -207,7 +206,6 @@ def init_state(sim, args): def init_new_simul(args): - params = init_params(args) if args.only_print_params: diff --git a/doc/examples/time_stepping/3d/submit_profiles.py b/doc/examples/time_stepping/3d/submit_profiles.py index 09ef4b71..bcf7886e 100644 --- a/doc/examples/time_stepping/3d/submit_profiles.py +++ b/doc/examples/time_stepping/3d/submit_profiles.py @@ -6,7 +6,6 @@ def submit_profiles_1coef(coef): - nxs = coef * nxs_base t_end = 0.5 / coef diff --git a/doc/examples/time_stepping/3d/util_submit.py b/doc/examples/time_stepping/3d/util_submit.py index d751dd5c..3c8dd737 100644 --- a/doc/examples/time_stepping/3d/util_submit.py +++ b/doc/examples/time_stepping/3d/util_submit.py @@ -85,7 +85,6 @@ def submit_profile( nb_pairs=1, nb_steps=None, ): - if nx < 480: nb_cores_per_node = 10 else: diff --git a/doc/examples/time_stepping/3d/which_params.py b/doc/examples/time_stepping/3d/which_params.py index 7afca692..cbd7ed9d 100644 --- a/doc/examples/time_stepping/3d/which_params.py +++ b/doc/examples/time_stepping/3d/which_params.py @@ -25,7 +25,6 @@ def compute(nx, nb_processes=20, verbose=True): - nb_points = np.empty_like(coefficients, dtype=int) nb_points[0] = nx @@ -59,7 +58,6 @@ def compute(nx, nb_processes=20, verbose=True): if __name__ == "__main__": - print("coef dealisasing", coefficients) for nx, nb_proc in zip(nx_bigs, nb_procs): diff --git a/doc/examples/time_stepping/phase_shifting.py b/doc/examples/time_stepping/phase_shifting.py index 8038e3ac..bdb6ef1d 100644 --- a/doc/examples/time_stepping/phase_shifting.py +++ b/doc/examples/time_stepping/phase_shifting.py @@ -15,7 +15,6 @@ class Resolution: def __init__(self, nx=32): - # Create parameters params = Simul.create_default_params() @@ -61,7 +60,6 @@ def one_time_step( verbose=False, plot_fig=False, ): - params = self.params sim = self.sim @@ -139,7 +137,6 @@ def plot(x, y, *args, **kwargs): if __name__ == "__main__": - type_time_schemes = ["RK2", "RK2_phaseshift", "Euler", "Euler_phaseshift"] dt = 0.01 diff --git a/doc/examples/time_stepping/versus_dt.py b/doc/examples/time_stepping/versus_dt.py index 70279e70..8aa7165d 100644 --- a/doc/examples/time_stepping/versus_dt.py +++ b/doc/examples/time_stepping/versus_dt.py @@ -19,7 +19,6 @@ def make_figures(coef_dealiasing=0.66, nx=32): - resolution = Resolution(nx) one_time_step = resolution.one_time_step @@ -32,7 +31,6 @@ def make_figures(coef_dealiasing=0.66, nx=32): max_ratio = 0.0 for scheme in schemes: - ratios = np.empty_like(steps) errors = np.empty_like(steps) diff --git a/doc/ipynb/executed/parametric_study_ns3dstrat/run_simul.py b/doc/ipynb/executed/parametric_study_ns3dstrat/run_simul.py index 01265438..b48a8bf1 100644 --- a/doc/ipynb/executed/parametric_study_ns3dstrat/run_simul.py +++ b/doc/ipynb/executed/parametric_study_ns3dstrat/run_simul.py @@ -65,7 +65,6 @@ def main(args): - params = Simul.create_default_params() diameter = args.diameter # m diff --git a/doc/test_cases/Taylor_Green_vortices/run_simul.py b/doc/test_cases/Taylor_Green_vortices/run_simul.py index bc9a10f4..9e472fc1 100644 --- a/doc/test_cases/Taylor_Green_vortices/run_simul.py +++ b/doc/test_cases/Taylor_Green_vortices/run_simul.py @@ -38,7 +38,6 @@ def init_simul(params): - sim = Simul(params) X, Y, Z = sim.oper.get_XYZ_loc() @@ -56,7 +55,6 @@ def init_simul(params): def run_simul(sim): - sim.time_stepping.start() from fluiddyn.util.mpi import printby0 @@ -84,7 +82,6 @@ def run_simul(sim): if __name__ == "__main__": - sim = init_simul(params) # only useful to plot fields before time_stepping diff --git a/doc/test_cases/Taylor_Green_vortices/run_simul_les_smago.py b/doc/test_cases/Taylor_Green_vortices/run_simul_les_smago.py index ec2b5071..a726bb7a 100644 --- a/doc/test_cases/Taylor_Green_vortices/run_simul_les_smago.py +++ b/doc/test_cases/Taylor_Green_vortices/run_simul_les_smago.py @@ -47,7 +47,6 @@ def init_simul(params): - sim = Simul(params) X, Y, Z = sim.oper.get_XYZ_loc() @@ -65,7 +64,6 @@ def init_simul(params): if __name__ == "__main__": - sim = init_simul(params) # only useful to plot fields before time_stepping diff --git a/fluidsim/base/forcing/anisotropic.py b/fluidsim/base/forcing/anisotropic.py index e6c8f548..21e08de3 100644 --- a/fluidsim/base/forcing/anisotropic.py +++ b/fluidsim/base/forcing/anisotropic.py @@ -74,7 +74,6 @@ def __init__(self, sim): raise NotImplementedError def _create_params_coarse(self, fft_size): - params_coarse = super()._create_params_coarse(fft_size) self.angle = angle = ensure_radians(self.params.forcing[self.tag].angle) @@ -165,7 +164,6 @@ def _compute_cond_no_forcing(self): ndim = 3 if delta_angle is None: - self.khmin_forcing = np.sin(angle) * self.kmin_forcing self.kvmin_forcing = np.cos(angle) * self.kmin_forcing @@ -197,7 +195,6 @@ def _compute_cond_no_forcing(self): COND_NO_F[:, self.oper_coarse.shapeK_loc[1] - 1] = True else: - if ndim == 2: K = np.sqrt(self.oper_coarse.KX**2 + self.oper_coarse.KY**2) Kv = self.oper_coarse.KY diff --git a/fluidsim/base/forcing/base.py b/fluidsim/base/forcing/base.py index 8da4fa25..ca6c709d 100644 --- a/fluidsim/base/forcing/base.py +++ b/fluidsim/base/forcing/base.py @@ -111,7 +111,6 @@ def __init__(self, sim): dict_classes = sim.info.solver.classes.Forcing.import_classes() if self.type_forcing not in dict_classes: - # temporary trick to open old simulations if self.type_forcing == "random" and "tcrandom" in dict_classes: self.type_forcing = "tcrandom" diff --git a/fluidsim/base/forcing/kolmogorov.py b/fluidsim/base/forcing/kolmogorov.py index b931505f..3f1878cd 100644 --- a/fluidsim/base/forcing/kolmogorov.py +++ b/fluidsim/base/forcing/kolmogorov.py @@ -53,7 +53,6 @@ def complete_params_with_default(cls, params): ) def __init__(self, sim): - if len(sim.oper.axes) == 3: self._key_forced_default = "vx_fft" else: diff --git a/fluidsim/base/forcing/milestone.py b/fluidsim/base/forcing/milestone.py index 718f3581..fbe46ce3 100644 --- a/fluidsim/base/forcing/milestone.py +++ b/fluidsim/base/forcing/milestone.py @@ -25,7 +25,6 @@ def step(x, limit, smoothness): class PeriodicUniform: def __init__(self, speed_max, length, length_acc, lx): - self.speed_max = speed_max sign = np.sign(speed_max) @@ -45,7 +44,6 @@ def __init__(self, speed_max, length, length_acc, lx): self.x_2 = self.x_3 = self.x_0 + sign * (length_acc + x_uni) def get_speed(self, time): - speed_max = self.speed_max acc = self.acc t_1 = self.t_1 @@ -74,7 +72,6 @@ def get_speed(self, time): return -speed_max + acc * t def get_locations(self, time): - speed_max = self.speed_max acc = self.acc t_1 = self.t_1 @@ -236,7 +233,6 @@ def __init__(self, sim): self.get_speed = self.get_speed_sinusoidal elif type_movement == "periodic_uniform": - params_pu = self.params_milestone.movement.periodic_uniform periodic_uniform = PeriodicUniform( params_pu.speed, @@ -258,7 +254,6 @@ def get_locations(time): raise NotImplementedError def get_solid_field(self, time): - if mpi.rank > 0 and (self._is_using_coarse_oper or self.ndim == 3): return (None,) * 3 @@ -299,7 +294,6 @@ def get_speed_sinusoidal(self, time): return self._half_length * self._omega * cos(self._omega * time - pi / 2) def check_plot_solid(self, time): - solid, x_coors, y_coors = self.get_solid_field(time) fig, ax = plt.subplots() @@ -318,7 +312,6 @@ def check_plot_solid(self, time): fig.colorbar(pcmesh) def check_plot_forcing(self, time): - self.compute(time) try: @@ -352,7 +345,6 @@ def check_plot_forcing(self, time): fig.colorbar(pcmesh) def check_with_animation(self, number_frames=40, interval=500): - oper_c = self.oper_coarse lx = oper_c.Lx @@ -428,7 +420,6 @@ def _full_from_coarse(self, solid): return self.solid def compute(self, time=None): - sim = self.sim if time is None: @@ -457,7 +448,6 @@ def compute(self, time=None): if __name__ == "__main__": - # from time import perf_counter from fluidsim.solvers.ns2d.with_uxuy import Simul diff --git a/fluidsim/base/forcing/specific.py b/fluidsim/base/forcing/specific.py index 9df0412a..8fbaa411 100644 --- a/fluidsim/base/forcing/specific.py +++ b/fluidsim/base/forcing/specific.py @@ -65,7 +65,6 @@ def _complete_params_with_default(cls, params): params.forcing.available_types.append(cls.tag) def __init__(self, sim): - self.sim = sim self.oper = sim.oper self.params = sim.params @@ -163,7 +162,6 @@ def _check_forcing_shape(shape_forcing, shape): ) def __init__(self, sim): - super().__init__(sim) params = sim.params @@ -455,7 +453,6 @@ def _complete_params_with_default(cls, params): params.forcing._set_doc("How the forcing is normalized") def __init__(self, sim): - super().__init__(sim) params_norm = self.params.forcing.normalized @@ -747,7 +744,6 @@ def _complete_params_with_default(cls, params): params.forcing._set_child("random", {"only_positive": False}) def __init__(self, sim): - super().__init__(sim) if self.params.forcing.random.only_positive: @@ -790,11 +786,9 @@ def _complete_params_with_default(cls, params): ) def __init__(self, sim): - super().__init__(sim) if mpi.rank == 0: - self._forcing_state_file_path = ( Path(sim.output.path_run) / "_forcing_state.txt" ) diff --git a/fluidsim/base/init_fields.py b/fluidsim/base/init_fields.py index a4ae2641..e5fa97d2 100644 --- a/fluidsim/base/init_fields.py +++ b/fluidsim/base/init_fields.py @@ -102,7 +102,6 @@ def _complete_params_with_default(params, info_solver): iter_complete_params(params, info_solver, dict_classes.values()) def __init__(self, sim): - self.sim = sim params = sim.params oper = sim.oper @@ -139,7 +138,6 @@ def __init__(self, sim): class InitFieldsFromFile(SpecificInitFields): - tag = "from_file" @classmethod @@ -153,7 +151,6 @@ def _complete_params_with_default(cls, params): ) def __call__(self): - # Warning: this function is for 2d pseudo-spectral solver! # We have to write something more general. @@ -301,7 +298,6 @@ def __call__(self): def fill_field_fft_2d(field_fft_in, field_fft_out): - [nk0_seq, nk1_seq] = field_fft_out.shape [nk0_seq_in, nk1_seq_in] = field_fft_in.shape @@ -319,7 +315,6 @@ def fill_field_fft_2d(field_fft_in, field_fft_out): def fill_field_fft_3d(field_fft_in, field_fft_out, oper_in, oper_out): - [nk0, nk1, nk2] = field_fft_out.shape [nk0_in, nk1_in, nk2_in] = field_fft_in.shape @@ -343,7 +338,6 @@ def fill_field_fft_3d(field_fft_in, field_fft_out, oper_in, oper_out): class InitFieldsFromSimul(SpecificInitFields): - tag = "from_simul" def __call__(self): @@ -390,7 +384,6 @@ def _make_state_spect_3d(self, sim_in): return state_spect def _get_state_from_simul(self, sim_in): - # Warning: this function is for 2d pseudo-spectral solver! # We have to write something more general. # It should be done directly in the operators. @@ -440,7 +433,6 @@ def _get_state_from_simul(self, sim_in): class InitFieldsInScript(SpecificInitFields): - tag = "in_script" def __call__(self): @@ -452,7 +444,6 @@ def __call__(self): class InitFieldsConstant(SpecificInitFields): - tag = "constant" @classmethod diff --git a/fluidsim/base/output/__init__.py b/fluidsim/base/output/__init__.py index f72fa986..2205c181 100644 --- a/fluidsim/base/output/__init__.py +++ b/fluidsim/base/output/__init__.py @@ -226,7 +226,6 @@ def create_description_xmf_file(path=None): def run(): - parser = argparse.ArgumentParser( prog="fluidsim-create-xml-description", description=create_description_xmf_file.__doc__, diff --git a/fluidsim/base/output/base.py b/fluidsim/base/output/base.py index 47118615..99b5b7b1 100644 --- a/fluidsim/base/output/base.py +++ b/fluidsim/base/output/base.py @@ -192,7 +192,6 @@ def post_init(self): super().post_init() if mpi.rank == 0: - objects_to_print = { "sim.oper": sim.oper, "sim.state": sim.state, @@ -264,7 +263,6 @@ def _save_info_solver_params_xml(self, replace=False): ) def init_with_initialized_state(self): - if ( hasattr(self, "_has_been_initialized_with_state") and self._has_been_initialized_with_state @@ -313,7 +311,6 @@ def init_with_initialized_state(self): self.print_size_in_Mo(self.sim.state.state_phys, "state_phys") def one_time_step(self): - for k in self.params.periods_print._get_key_attribs(): period = self.params.periods_print.__dict__[k] if period != 0: @@ -459,7 +456,6 @@ def customize(result, sim): ) def _compute_mean_values(self, tmin, tmax): - result = {} try: @@ -538,7 +534,6 @@ def __init__( has_to_plot_saved=False, arrays_1st_time=None, ): - sim = output.sim params = sim.params diff --git a/fluidsim/base/output/cross_corr3d.py b/fluidsim/base/output/cross_corr3d.py index 2725528b..86de1171 100644 --- a/fluidsim/base/output/cross_corr3d.py +++ b/fluidsim/base/output/cross_corr3d.py @@ -27,7 +27,6 @@ def _make_small_key(key): class CrossCorrelations(BaseSpectra): - _tag = "cross_corr" def compute(self): diff --git a/fluidsim/base/output/horiz_means.py b/fluidsim/base/output/horiz_means.py index 9964989d..e75f8050 100644 --- a/fluidsim/base/output/horiz_means.py +++ b/fluidsim/base/output/horiz_means.py @@ -74,7 +74,6 @@ def get_modif_info_solver(cls): """ def modif_info_solver(info_solver): - info_solver.classes.Output.classes._set_child( cls._tag, attribs={ diff --git a/fluidsim/base/output/increments.py b/fluidsim/base/output/increments.py index cb7ddb4f..a58505e4 100644 --- a/fluidsim/base/output/increments.py +++ b/fluidsim/base/output/increments.py @@ -450,7 +450,6 @@ def load_pdf_from_file( return pdf_timemean, values_inc_timemean, nb_rx_to_plot def plot_pdf(self, tmin=0, tmax=None, key_var="ux", order=0, nb_rx_to_plot=5): - irx_to_plot = np.arange( 0, self.rxs.size, self.rxs.size / nb_rx_to_plot ).astype(int) @@ -479,7 +478,6 @@ def plot_pdf(self, tmin=0, tmax=None, key_var="ux", order=0, nb_rx_to_plot=5): colors = ["k", "y", "r", "b", "g", "m", "c"] for irxp, irx in enumerate(irx_to_plot): - print("color = {}, rx = {}".format(colors[irxp], self.rxs[irx])) val_inc = values_inc_timemean[irxp] diff --git a/fluidsim/base/output/phys_fields.py b/fluidsim/base/output/phys_fields.py index 928d0ee6..49a7ffea 100644 --- a/fluidsim/base/output/phys_fields.py +++ b/fluidsim/base/output/phys_fields.py @@ -346,7 +346,6 @@ class SetOfPhysFieldFiles(SetOfPhysFieldFilesBase): def _get_field_to_plot_from_file( self, path_file, key, equation, skip_vars=() ): - with h5py.File(path_file, "r") as file: time = file["state_phys"].attrs["time"] dset = file["state_phys"][key] diff --git a/fluidsim/base/output/print_stdout.py b/fluidsim/base/output/print_stdout.py index ef5642bb..fc923e0a 100644 --- a/fluidsim/base/output/print_stdout.py +++ b/fluidsim/base/output/print_stdout.py @@ -63,7 +63,6 @@ def __init__(self, output): self.file.seek(0, 2) # go to the end of the file def complete_init_with_state(self): - self.energy0 = self.output.compute_energy() if self.period_print == 0: diff --git a/fluidsim/base/output/prob_dens_func.py b/fluidsim/base/output/prob_dens_func.py index d54e750e..5cfcb396 100644 --- a/fluidsim/base/output/prob_dens_func.py +++ b/fluidsim/base/output/prob_dens_func.py @@ -88,7 +88,6 @@ def compute(self): def load(self): """load the saved pdf and return a dictionary.""" with h5py.File(self.path_file, "r") as h5file: - dset_pdf_eta = h5file["pdf_eta"] dset_bin_edges_eta = h5file["bin_edges_eta"] diff --git a/fluidsim/base/output/spatial_means.py b/fluidsim/base/output/spatial_means.py index 44628210..d0281c3f 100644 --- a/fluidsim/base/output/spatial_means.py +++ b/fluidsim/base/output/spatial_means.py @@ -73,7 +73,6 @@ def __init__(self, output): self.t_last_save = self.sim.time_stepping.t def _init_files(self, arrays_1st_time=None): - if mpi.rank == 0: if not os.path.exists(self.path_file): self.file = open(self.path_file, "w") diff --git a/fluidsim/base/output/spect_energy_budget.py b/fluidsim/base/output/spect_energy_budget.py index d3bc864b..0c350347 100644 --- a/fluidsim/base/output/spect_energy_budget.py +++ b/fluidsim/base/output/spect_energy_budget.py @@ -46,7 +46,6 @@ def _complete_params_with_default(params): params.output._set_child(tag, attribs={"HAS_TO_PLOT_SAVED": False}) def __init__(self, output): - params = output.sim.params self.nx = params.oper.nx diff --git a/fluidsim/base/output/spectra3d.py b/fluidsim/base/output/spectra3d.py index 06dc114e..d1405dd7 100644 --- a/fluidsim/base/output/spectra3d.py +++ b/fluidsim/base/output/spectra3d.py @@ -251,7 +251,6 @@ def load1d_mean(self, tmin=None, tmax=None, verbose=True): return results def load_kzkh_mean(self, tmin=None, tmax=None, key_to_load=None): - if not os.path.exists(self.path_file_kzkh): raise RuntimeError( self.path_file_kzkh diff --git a/fluidsim/base/output/time_signals_fft.py b/fluidsim/base/output/time_signals_fft.py index 9e27dca3..0354ee31 100644 --- a/fluidsim/base/output/time_signals_fft.py +++ b/fluidsim/base/output/time_signals_fft.py @@ -273,14 +273,12 @@ def compute(self): return dict_results def load(self): - if not os.path.exists(self.path_file): raise ValueError( "no file time_sigK.h5 in\n" + self.output.dir_save_run ) with h5py.File(self.path_file, "r+") as file: - dset_times = file["times"] times = dset_times[...] @@ -331,7 +329,6 @@ def plot(self): period_shell = 2 * np.pi / omega_shell for ish in range(nb_shells): - fig, ax1 = self.output.figure_axe() ax1.set_xlabel("$t/T$") ax1.set_ylabel("signals (s$^{-1}$)") @@ -361,7 +358,6 @@ def plot(self): ax1.loglog(kh_shell, omega_shell, "o", linewidth=2) def time_spectrum(self, sig_long): - Nt = sig_long.size stepit0 = int(np.fix(self.nt / 2.0)) diff --git a/fluidsim/base/preprocess/test.py b/fluidsim/base/preprocess/test.py index 65966eec..2c6f63eb 100644 --- a/fluidsim/base/preprocess/test.py +++ b/fluidsim/base/preprocess/test.py @@ -9,12 +9,10 @@ @skip_if_no_fluidfft class TestPreprocessPS(TestSimul): - Simul = SimulBasePseudoSpectral @classmethod def init_params(cls): - cls.params = params = SimulBasePseudoSpectral.create_default_params() params.short_name_type_run = "test_preprocess_ps" nh = 16 diff --git a/fluidsim/base/solvers/base.py b/fluidsim/base/solvers/base.py index da458105..6b644135 100644 --- a/fluidsim/base/solvers/base.py +++ b/fluidsim/base/solvers/base.py @@ -237,7 +237,6 @@ def tendencies_nonlin(self, variables=None, old=None): if __name__ == "__main__": - params = Simul.create_default_params() params.short_name_type_run = "test" diff --git a/fluidsim/base/solvers/finite_diff.py b/fluidsim/base/solvers/finite_diff.py index f8f3d44c..e4d061c1 100644 --- a/fluidsim/base/solvers/finite_diff.py +++ b/fluidsim/base/solvers/finite_diff.py @@ -5,7 +5,6 @@ class InfoSolverFiniteDiff(InfoSolverBase): """Contain the information on a solver.""" def _init_root(self): - super()._init_root() # self.classes.State.module_name = 'fluidsim.base.state' diff --git a/fluidsim/base/solvers/pseudo_spect.py b/fluidsim/base/solvers/pseudo_spect.py index 46cbba45..1a9e65d3 100644 --- a/fluidsim/base/solvers/pseudo_spect.py +++ b/fluidsim/base/solvers/pseudo_spect.py @@ -263,7 +263,6 @@ def tendencies_nonlin(self, variables=None, old=None): if __name__ == "__main__": - import fluiddyn as fld params = Simul.create_default_params() diff --git a/fluidsim/base/state.py b/fluidsim/base/state.py index 2a0f9bb8..000bf00d 100644 --- a/fluidsim/base/state.py +++ b/fluidsim/base/state.py @@ -237,7 +237,6 @@ def _complete_info_solver(info_solver): ) def __init__(self, sim, oper=None): - super().__init__(sim, oper) self.keys_state_spect = sim.info.solver.classes.State.keys_state_spect diff --git a/fluidsim/base/time_stepping/base.py b/fluidsim/base/time_stepping/base.py index e00a053e..f7fca70b 100644 --- a/fluidsim/base/time_stepping/base.py +++ b/fluidsim/base/time_stepping/base.py @@ -246,7 +246,6 @@ def one_time_step(self): class TimeSteppingBase(TimeSteppingBase0): def _init_compute_time_step(self): - params_ts = self.params.time_stepping if params_ts.USE_CFL: @@ -298,7 +297,6 @@ def _init_compute_time_step(self): self.deltat_max = params_ts.deltat_max def _init_time_scheme(self): - params_ts = self.params.time_stepping if params_ts.type_time_scheme == "RK2": @@ -341,7 +339,6 @@ def _compute_time_increment_CLF_uxuyuz(self): self._compute_time_increment_CLF_from_tmp(tmp) def _compute_time_increment_CLF_from_tmp(self, tmp): - if mpi.nb_proc > 1: tmp = mpi.comm.allreduce(tmp, op=mpi.MPI.MAX) diff --git a/fluidsim/base/time_stepping/pseudo_spect.py b/fluidsim/base/time_stepping/pseudo_spect.py index db9b9cad..b3db08de 100644 --- a/fluidsim/base/time_stepping/pseudo_spect.py +++ b/fluidsim/base/time_stepping/pseudo_spect.py @@ -188,7 +188,6 @@ def _init_freq_lin(self): self.freq_lin = freq_dissip def _init_time_scheme(self): - type_time_scheme = self.params.time_stepping.type_time_scheme if type_time_scheme.startswith("RK"): @@ -300,7 +299,6 @@ def _get_phaseshift(self): return self._phaseshift def _init_phaseshift_random(self): - params_phaseshift = self.params.time_stepping.phaseshift_random if params_phaseshift.nb_steps_compute_new_pair is None: if params_phaseshift.nb_pairs == 1: diff --git a/fluidsim/base/turb_model/base.py b/fluidsim/base/turb_model/base.py index 2b1fbbbf..6719efed 100644 --- a/fluidsim/base/turb_model/base.py +++ b/fluidsim/base/turb_model/base.py @@ -22,7 +22,6 @@ def modif_infosolver_turb_model(info_solver): - try: classes_TurbModel = getattr(info_solver.classes, "TurbModel") except AttributeError: @@ -105,7 +104,6 @@ def get_modif_info_solver(cls): """ def modif_info_solver(info_solver): - from fluidsim.base.turb_model.base import modif_infosolver_turb_model modif_infosolver_turb_model(info_solver) diff --git a/fluidsim/base/turb_model/smagorinsky.py b/fluidsim/base/turb_model/smagorinsky.py index 581c1940..5b47733b 100644 --- a/fluidsim/base/turb_model/smagorinsky.py +++ b/fluidsim/base/turb_model/smagorinsky.py @@ -53,7 +53,6 @@ def __init__(self, sim): self.C_nu_T = C * delta**2 * sqrt(2) def get_forcing(self, **kwargs): - ux_fft = kwargs["vx_fft"] uy_fft = kwargs["vy_fft"] uz_fft = kwargs["vz_fft"] diff --git a/fluidsim/base/turb_model/stress_tensor.py b/fluidsim/base/turb_model/stress_tensor.py index 27375555..5897ae54 100644 --- a/fluidsim/base/turb_model/stress_tensor.py +++ b/fluidsim/base/turb_model/stress_tensor.py @@ -26,7 +26,6 @@ def grad_from_arr_fft(self, arr_fft): return ifft(dx_arr_fft), ifft(dy_arr_fft), ifft(dz_arr_fft) def compute_stress_tensor(self, ux_fft, uy_fft, uz_fft): - dx_ux, dy_ux, dz_ux = self.grad_from_arr_fft(ux_fft) dx_uy, dy_uy, dz_uy = self.grad_from_arr_fft(uy_fft) dx_uz, dy_uz, dz_uz = self.grad_from_arr_fft(uz_fft) diff --git a/fluidsim/extend_simul/spatial_means_regions_milestone.py b/fluidsim/extend_simul/spatial_means_regions_milestone.py index 47e30899..e7d4690d 100644 --- a/fluidsim/extend_simul/spatial_means_regions_milestone.py +++ b/fluidsim/extend_simul/spatial_means_regions_milestone.py @@ -88,7 +88,6 @@ class SpatialMeansRegions(SimulExtender, SpecificOutput): _module_name = "fluidsim.extend_simul.spatial_means_regions_milestone" def __init__(self, output): - params = output.sim.params params_cls = params.output.spatial_means_regions @@ -120,7 +119,6 @@ def __init__(self, output): nx_loc = oper.shapeX_loc[2] for xmin, xmax in zip(self.xmin_given, self.xmax_given): - xmin, xmax = Lx * xmin, Lx * xmax ixmin = np.argmin(abs(x_seq - xmin)) diff --git a/fluidsim/operators/op_finitediff2d.py b/fluidsim/operators/op_finitediff2d.py index 10434e1d..031810ca 100644 --- a/fluidsim/operators/op_finitediff2d.py +++ b/fluidsim/operators/op_finitediff2d.py @@ -23,7 +23,6 @@ def _complete_params_with_default(params): params._set_child("oper", attribs=attribs) def __init__(self, params=None): - Lx = float(params.oper.Lx) Ly = float(params.oper.Ly) diff --git a/fluidsim/operators/operators2d.py b/fluidsim/operators/operators2d.py index f05f71ee..cd0803c9 100644 --- a/fluidsim/operators/operators2d.py +++ b/fluidsim/operators/operators2d.py @@ -83,7 +83,6 @@ def compute_increments_dim1(var: Af, irx: int): @boost class OperatorsPseudoSpectral2D(_Operators, OperatorBase): - _has_to_dealiase: bool where_dealiased: "uint8[:, :]" KX: Af @@ -114,7 +113,6 @@ def _complete_params_with_default(params): params._set_child("oper", attribs=attribs) def __init__(self, params): - self.params = params self.axes = ("y", "x") nx = int(params.oper.nx) @@ -608,7 +606,6 @@ def put_coarse_array_in_array_fft( arr[iky, ikxc] = arr_coarse[ikyc, ikxc] def get_grid1d_seq(self, axis="x"): - if axis not in ("x", "y"): raise ValueError diff --git a/fluidsim/operators/operators3d.py b/fluidsim/operators/operators3d.py index 179c54ba..1e95ed04 100644 --- a/fluidsim/operators/operators3d.py +++ b/fluidsim/operators/operators3d.py @@ -205,7 +205,6 @@ def _complete_params_with_default(params): ) def __init__(self, params=None): - self.params = params self.axes = ("z", "y", "x") @@ -559,7 +558,6 @@ def coarse_seq_from_fft_loc(self, f_fft, shapeK_coarse): fc_fft_tmp = np.zeros([nk0c, nk1c, nk2c], np.complex128) nk0, nk1, nk2 = self.shapeK_seq if self.shapeK_seq[1:2] == self.shapeK_loc[1:2]: - f1d_temp = np.empty([nk1c, nk2c], np.complex128) for ik0c in range(min(nk0c, nk0)): @@ -598,7 +596,6 @@ def coarse_seq_from_fft_loc(self, f_fft, shapeK_coarse): # copy into fc_fft fc_fft_tmp[ik0c] = f1d_temp.copy() else: - for ik0c in range(min(nk0c, nk0)): ik0 = _ik_from_ikc(ik0c, nk0c, nk0, is_x=(position_x_K == 0)) for ik1c in range(min(nk1c, nk1)): @@ -631,7 +628,6 @@ def coarse_seq_from_fft_loc(self, f_fft, shapeK_coarse): fc_fft_tmp[ik0c, ik1c, ik2c] = f0d_temp if rank == 0: - # print(f"{fc_fft_tmp = }") fc_fft = np.zeros(shapeK_coarse, dtype=np.complex128) @@ -680,7 +676,6 @@ def where_is_wavenumber(self, ik0, ik1, ik2): ik1_loc = ik1 ik2_loc = ik2 else: - iki_first = self.seq_indices_first_K rank_k_equal_rank = ( iki_first[0] <= ik0 < iki_first[0] + self.shapeK_loc[0] @@ -1003,7 +998,6 @@ def divhfft_from_vxvyfft(self, vx_fft: Ac, vy_fft: Ac): @boost def vxvyfft_from_rotzfft(self, rotz_fft: Ac): - inv_Kh_square_nozero = self.Kx**2 + self.Ky**2 inv_Kh_square_nozero[inv_Kh_square_nozero == 0] = 1e-14 inv_Kh_square_nozero = 1 / inv_Kh_square_nozero @@ -1014,7 +1008,6 @@ def vxvyfft_from_rotzfft(self, rotz_fft: Ac): @boost def vxvyfft_from_divhfft(self, divh_fft: Ac): - inv_Kh_square_nozero = self.Kx**2 + self.Ky**2 inv_Kh_square_nozero[inv_Kh_square_nozero == 0] = 1e-14 inv_Kh_square_nozero = 1 / inv_Kh_square_nozero @@ -1045,7 +1038,6 @@ def grad_fft_from_arr_fft(self, arr_fft: Ac): return dx_arr_fft, dy_arr_fft, dz_arr_fft def get_grid1d_seq(self, axis="x"): - if axis not in ("x", "y", "z"): raise ValueError diff --git a/fluidsim/operators/sphericalharmo.py b/fluidsim/operators/sphericalharmo.py index 822105be..664943fb 100644 --- a/fluidsim/operators/sphericalharmo.py +++ b/fluidsim/operators/sphericalharmo.py @@ -74,5 +74,4 @@ def get_grid1d_seq(self, axis="lat"): if __name__ == "__main__": - oper = OperatorsSphericalHarmonics() diff --git a/fluidsim/operators/test/test_operators2d.py b/fluidsim/operators/test/test_operators2d.py index 88d4299c..b3a1993a 100644 --- a/fluidsim/operators/test/test_operators2d.py +++ b/fluidsim/operators/test/test_operators2d.py @@ -165,7 +165,6 @@ def Oper(self): return OperatorsPseudoSpectral2D def test_coarse(self, allclose): - params = self.Oper._create_default_params() params.oper.nx = 16 params.oper.ny = 12 diff --git a/fluidsim/solvers/ad1d/pseudo_spect/solver.py b/fluidsim/solvers/ad1d/pseudo_spect/solver.py index 7c548e8b..8f506fe8 100644 --- a/fluidsim/solvers/ad1d/pseudo_spect/solver.py +++ b/fluidsim/solvers/ad1d/pseudo_spect/solver.py @@ -51,7 +51,6 @@ def _complete_params_with_default(params): params._set_attrib("U", 1.0) def tendencies_nonlin(self, state_spect=None, old=None): - if old is None: tendencies_fft = SetOfVariables( like=self.state.state_spect, info="tendencies_nonlin" diff --git a/fluidsim/solvers/ad1d/solver.py b/fluidsim/solvers/ad1d/solver.py index 904d5d4c..2ba43d0e 100644 --- a/fluidsim/solvers/ad1d/solver.py +++ b/fluidsim/solvers/ad1d/solver.py @@ -16,7 +16,6 @@ class InfoSolverAD1D(InfoSolverFiniteDiff): def _init_root(self): - super()._init_root() package = "fluidsim.solvers.ad1d" @@ -86,7 +85,6 @@ def linear_operator(self): if __name__ == "__main__": - import fluiddyn as fld params = Simul.create_default_params() diff --git a/fluidsim/solvers/ad1d/test_solver.py b/fluidsim/solvers/ad1d/test_solver.py index 466d226f..cad04b45 100644 --- a/fluidsim/solvers/ad1d/test_solver.py +++ b/fluidsim/solvers/ad1d/test_solver.py @@ -18,7 +18,6 @@ @unittest.skipIf(not scipy_installed, "No module named scipy.sparse") class TestSolverAD1D(TestSimul): - Simul = Simul @classmethod diff --git a/fluidsim/solvers/burgers1d/skew_sym/solver.py b/fluidsim/solvers/burgers1d/skew_sym/solver.py index ac8aff7c..7edd835e 100644 --- a/fluidsim/solvers/burgers1d/skew_sym/solver.py +++ b/fluidsim/solvers/burgers1d/skew_sym/solver.py @@ -27,7 +27,6 @@ class Simul(SimulBurgers): InfoSolver = InfoSolver def tendencies_nonlin(self, state_spect=None, old=None): - if state_spect is None: u_fft = self.state.state_spect.get_var("u_fft") signal = self.state.state_phys.get_var("u") diff --git a/fluidsim/solvers/burgers1d/solver.py b/fluidsim/solvers/burgers1d/solver.py index 38164a32..336522d3 100644 --- a/fluidsim/solvers/burgers1d/solver.py +++ b/fluidsim/solvers/burgers1d/solver.py @@ -66,7 +66,6 @@ class Simul(SimulBasePseudoSpectral): InfoSolver = InfoSolver def tendencies_nonlin(self, state_spect=None, old=None): - if state_spect is None: u_fft = self.state.state_spect.get_var("u_fft") signal = self.state.state_phys.get_var("u") diff --git a/fluidsim/solvers/burgers1d/test_solver.py b/fluidsim/solvers/burgers1d/test_solver.py index ae356104..1e7191aa 100644 --- a/fluidsim/solvers/burgers1d/test_solver.py +++ b/fluidsim/solvers/burgers1d/test_solver.py @@ -13,7 +13,6 @@ class TestSolverSquare1D(TestSimul): @classmethod def init_params(cls): - params = cls.params = cls.Simul.create_default_params() params.short_name_type_run = "test" diff --git a/fluidsim/solvers/models0d/lorenz/output/print_stdout.py b/fluidsim/solvers/models0d/lorenz/output/print_stdout.py index 77e2e742..6bb09d1b 100644 --- a/fluidsim/solvers/models0d/lorenz/output/print_stdout.py +++ b/fluidsim/solvers/models0d/lorenz/output/print_stdout.py @@ -25,7 +25,6 @@ class PrintStdOutLorenz(PrintStdOutBase): """ def complete_init_with_state(self): - if self.period_print == 0: return diff --git a/fluidsim/solvers/models0d/predaprey/output/print_stdout.py b/fluidsim/solvers/models0d/predaprey/output/print_stdout.py index 1bb38d9e..6d76f8a4 100644 --- a/fluidsim/solvers/models0d/predaprey/output/print_stdout.py +++ b/fluidsim/solvers/models0d/predaprey/output/print_stdout.py @@ -23,7 +23,6 @@ class PrintStdOutPredaPrey(PrintStdOutBase): """ def complete_init_with_state(self): - self.potential0 = self.output.compute_potential() if self.period_print == 0: diff --git a/fluidsim/solvers/nl1d/solver.py b/fluidsim/solvers/nl1d/solver.py index 088f1774..a988988c 100644 --- a/fluidsim/solvers/nl1d/solver.py +++ b/fluidsim/solvers/nl1d/solver.py @@ -52,7 +52,6 @@ def _complete_params_with_default(params): params._set_attrib("sigma", 1.0) def tendencies_nonlin(self, state_spect=None, old=None): - if state_spect is None: signal = self.state.state_phys.get_var("s") else: @@ -74,7 +73,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): if __name__ == "__main__": - from scipy.signal import gausspulse params = Simul.create_default_params() diff --git a/fluidsim/solvers/nl1d/test_solver.py b/fluidsim/solvers/nl1d/test_solver.py index 93009e93..aef786ab 100644 --- a/fluidsim/solvers/nl1d/test_solver.py +++ b/fluidsim/solvers/nl1d/test_solver.py @@ -22,7 +22,6 @@ class TestSolverSquare1D(TestSimul): @classmethod def init_params(cls): - params = cls.params = cls.Simul.create_default_params() params.short_name_type_run = "test" @@ -62,7 +61,6 @@ class TestTimeStepping(TestSimul): @classmethod def init_params(cls): - params = cls.params = cls.Simul.create_default_params() params.short_name_type_run = "test" diff --git a/fluidsim/solvers/ns2d/bouss/solver.py b/fluidsim/solvers/ns2d/bouss/solver.py index 06c8d796..2407fd19 100644 --- a/fluidsim/solvers/ns2d/bouss/solver.py +++ b/fluidsim/solvers/ns2d/bouss/solver.py @@ -28,7 +28,6 @@ def tendencies_nonlin_ns2dbouss( class InfoSolverNS2DBouss(InfoSolverNS2D): def _init_root(self): - super()._init_root() package = "fluidsim.solvers.ns2d.bouss" @@ -214,7 +213,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): if __name__ == "__main__": - from math import pi import fluiddyn as fld diff --git a/fluidsim/solvers/ns2d/bouss/state.py b/fluidsim/solvers/ns2d/bouss/state.py index c37d5215..f4cb1608 100644 --- a/fluidsim/solvers/ns2d/bouss/state.py +++ b/fluidsim/solvers/ns2d/bouss/state.py @@ -39,7 +39,6 @@ def _complete_info_solver(info_solver): ) def __init__(self, sim, oper=None): - super().__init__(sim, oper) self.field_tmp4 = np.empty_like(self.state_phys[0]) @@ -143,7 +142,6 @@ def init_from_rotfft(self, rot_fft): self.init_from_rotbfft(rot_fft, b_fft) def init_statespect_from(self, **kwargs): - # init_statespect_from looks if kwargs has two arguments. if len(kwargs) == 2: if "rot_fft" in kwargs and "b_fft" in kwargs: diff --git a/fluidsim/solvers/ns2d/bouss/test_solver.py b/fluidsim/solvers/ns2d/bouss/test_solver.py index 0bb9df41..c7873704 100644 --- a/fluidsim/solvers/ns2d/bouss/test_solver.py +++ b/fluidsim/solvers/ns2d/bouss/test_solver.py @@ -17,7 +17,6 @@ class TestSimulBase(Base): class TestForcingOutput(TestSimulBase): @classmethod def init_params(self): - params = super().init_params() params.forcing.enable = True params.forcing.type = "tcrandom" @@ -41,7 +40,6 @@ def init_params(self): child["HAS_TO_PLOT_SAVED"] = True def test_forcing_output(self): - sim = self.sim sim.time_stepping.start() diff --git a/fluidsim/solvers/ns2d/forcing.py b/fluidsim/solvers/ns2d/forcing.py index d0e7fd83..16ad79a2 100644 --- a/fluidsim/solvers/ns2d/forcing.py +++ b/fluidsim/solvers/ns2d/forcing.py @@ -32,7 +32,6 @@ def _complete_info_solver(info_solver): def compute_coef_ab_normalize( self, constant_rate_of, key_forced, f_fft, var_fft, deltat ): - if constant_rate_of not in ["energy", "energyK"]: raise ValueError diff --git a/fluidsim/solvers/ns2d/init_fields.py b/fluidsim/solvers/ns2d/init_fields.py index 5002f3ad..805913cd 100644 --- a/fluidsim/solvers/ns2d/init_fields.py +++ b/fluidsim/solvers/ns2d/init_fields.py @@ -55,7 +55,6 @@ def __call__(self): self.sim.state.init_from_rotfft(rot_fft) def compute_rotuxuy_fft(self): - params = self.sim.params oper = self.sim.oper diff --git a/fluidsim/solvers/ns2d/output/spatial_means.py b/fluidsim/solvers/ns2d/output/spatial_means.py index 89d71b55..1714bae9 100644 --- a/fluidsim/solvers/ns2d/output/spatial_means.py +++ b/fluidsim/solvers/ns2d/output/spatial_means.py @@ -95,7 +95,6 @@ def _save_one_time(self): os.fsync(self.file.fileno()) if self.has_to_plot and mpi.rank == 0: - self.ax_a.plot(tsim, energy, "k.") self.axe_b.plot(tsim, epsK_tot, "k.") diff --git a/fluidsim/solvers/ns2d/output/spatiotemporal_spectra.py b/fluidsim/solvers/ns2d/output/spatiotemporal_spectra.py index cf5d0dc6..edcbc4f6 100644 --- a/fluidsim/solvers/ns2d/output/spatiotemporal_spectra.py +++ b/fluidsim/solvers/ns2d/output/spatiotemporal_spectra.py @@ -88,7 +88,6 @@ def _sum_wavenumber2D(field, KX, kx_max): class SpatioTemporalSpectraNS2D(SpatioTemporalSpectraNS, SpatioTemporalSpectra2D): - compute_spectrum_kzkhomega = staticmethod(compute_spectrum_kzkhomega) _sum_wavenumber = staticmethod(_sum_wavenumber2D) diff --git a/fluidsim/solvers/ns2d/output/spect_energy_budget.py b/fluidsim/solvers/ns2d/output/spect_energy_budget.py index 61112b95..f3200263 100644 --- a/fluidsim/solvers/ns2d/output/spect_energy_budget.py +++ b/fluidsim/solvers/ns2d/output/spect_energy_budget.py @@ -93,7 +93,6 @@ def _online_plot_saving(self, dict_results): self.axe_b.plot(khE + khE[1], PiZ, "g") def plot(self, tmin=0, tmax=1000, delta_t=2): - with h5py.File(self.path_file, "r") as h5file: dset_times = h5file["times"] dset_khE = h5file["khE"] @@ -145,7 +144,6 @@ def plot(self, tmin=0, tmax=1000, delta_t=2): if delta_t != 0.0: for it in range(imin_plot, imax_plot, delta_i_plot): - transferE = dset_transferE[it] transferZ = dset_transferZ[it] diff --git a/fluidsim/solvers/ns2d/output/spectra.py b/fluidsim/solvers/ns2d/output/spectra.py index 9744c0cc..593eeb2a 100644 --- a/fluidsim/solvers/ns2d/output/spectra.py +++ b/fluidsim/solvers/ns2d/output/spectra.py @@ -51,7 +51,6 @@ def _online_plot_saving(self, dict_spectra1D, dict_spectra2D): ) def plot1d(self, tmin=0, tmax=1000, delta_t=2, coef_compensate=3): - with h5py.File(self.path_file1D, "r") as h5file: dset_times = h5file["times"] diff --git a/fluidsim/solvers/ns2d/solver.py b/fluidsim/solvers/ns2d/solver.py index ddd55a13..37ebb13d 100644 --- a/fluidsim/solvers/ns2d/solver.py +++ b/fluidsim/solvers/ns2d/solver.py @@ -208,7 +208,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): if __name__ == "__main__": - from math import pi import fluiddyn as fld diff --git a/fluidsim/solvers/ns2d/state.py b/fluidsim/solvers/ns2d/state.py index 50d813f3..342ea036 100644 --- a/fluidsim/solvers/ns2d/state.py +++ b/fluidsim/solvers/ns2d/state.py @@ -38,7 +38,6 @@ def _complete_info_solver(info_solver): ) def __init__(self, sim, oper=None): - super().__init__(sim, oper) self.field_tmp0 = np.empty_like(self.state_phys[0]) diff --git a/fluidsim/solvers/ns2d/strat/forcing.py b/fluidsim/solvers/ns2d/strat/forcing.py index d8bdee91..2d6f9af9 100644 --- a/fluidsim/solvers/ns2d/strat/forcing.py +++ b/fluidsim/solvers/ns2d/strat/forcing.py @@ -20,7 +20,6 @@ class ForcingNS2DStrat(ForcingNS2D): def compute_coef_ab_normalize( self, constant_rate_of, key_forced, f_fft, var_fft, deltat ): - if constant_rate_of not in ["energy", "energyK"]: raise ValueError diff --git a/fluidsim/solvers/ns2d/strat/init_fields.py b/fluidsim/solvers/ns2d/strat/init_fields.py index 1ae0ff8d..3748b253 100644 --- a/fluidsim/solvers/ns2d/strat/init_fields.py +++ b/fluidsim/solvers/ns2d/strat/init_fields.py @@ -87,7 +87,6 @@ def _complete_params_with_default(cls, params): ) def __call__(self): - params = self.sim.params linear_mode = self.put_ones_linear_mode() diff --git a/fluidsim/solvers/ns2d/strat/output/_old_miguel_frequency_spectra.py b/fluidsim/solvers/ns2d/strat/output/_old_miguel_frequency_spectra.py index cd670be2..4476e112 100644 --- a/fluidsim/solvers/ns2d/strat/output/_old_miguel_frequency_spectra.py +++ b/fluidsim/solvers/ns2d/strat/output/_old_miguel_frequency_spectra.py @@ -343,7 +343,6 @@ def compute_frequency_spectra(self): ) for index, file_path in enumerate(list_files): - # Generating counter print( "Computing frequency spectra = {}/{}".format( diff --git a/fluidsim/solvers/ns2d/strat/output/_old_miguel_spatio_temporal_spectra.py b/fluidsim/solvers/ns2d/strat/output/_old_miguel_spatio_temporal_spectra.py index 79723a41..79471ffa 100644 --- a/fluidsim/solvers/ns2d/strat/output/_old_miguel_spatio_temporal_spectra.py +++ b/fluidsim/solvers/ns2d/strat/output/_old_miguel_spatio_temporal_spectra.py @@ -392,7 +392,6 @@ def compute_frequency_spectra( # Compute temporal FT for index, time_start in enumerate(times_start): - # Compute index to start and to end FT it0 = np.argmin(abs(times - time_start)) it1 = it0 + windows_size diff --git a/fluidsim/solvers/ns2d/strat/output/phys_fields.py b/fluidsim/solvers/ns2d/strat/output/phys_fields.py index e7e291b6..2e114e34 100644 --- a/fluidsim/solvers/ns2d/strat/output/phys_fields.py +++ b/fluidsim/solvers/ns2d/strat/output/phys_fields.py @@ -16,7 +16,6 @@ class PhysFields2DStrat(PhysFieldsBase2D): """Class physical fields of solver ns2d.strat""" def update_animation(self, frame, **fargs): - super().update_animation(frame, **fargs) if hasattr(self, "ratio_omegas"): diff --git a/fluidsim/solvers/ns2d/strat/output/spatial_means.py b/fluidsim/solvers/ns2d/strat/output/spatial_means.py index 5c45f8ac..d5f88945 100644 --- a/fluidsim/solvers/ns2d/strat/output/spatial_means.py +++ b/fluidsim/solvers/ns2d/strat/output/spatial_means.py @@ -128,7 +128,6 @@ def _save_one_time(self): os.fsync(self.file.fileno()) if self.has_to_plot and mpi.rank == 0: - self.ax_a.plot(tsim, energy, "k.") self.axe_b.plot(tsim, epsK_tot, "k.") diff --git a/fluidsim/solvers/ns2d/strat/output/spect_energy_budget.py b/fluidsim/solvers/ns2d/strat/output/spect_energy_budget.py index 570b4d4c..9b2b3770 100644 --- a/fluidsim/solvers/ns2d/strat/output/spect_energy_budget.py +++ b/fluidsim/solvers/ns2d/strat/output/spect_energy_budget.py @@ -187,7 +187,6 @@ def compute(self): return dict_results def _online_plot_saving(self, dict_results): - transfer2D_EA = dict_results["transferEA_2d"] transfer2D_EK = dict_results["transferEK_2d"] transfer2D_E = transfer2D_EA + transfer2D_EK diff --git a/fluidsim/solvers/ns2d/strat/output/spectra.py b/fluidsim/solvers/ns2d/strat/output/spectra.py index 2c8dd25b..e36cd813 100644 --- a/fluidsim/solvers/ns2d/strat/output/spectra.py +++ b/fluidsim/solvers/ns2d/strat/output/spectra.py @@ -96,7 +96,6 @@ def load1d_means( ): means = {} with h5py.File(self.path_file1D, "r") as h5file: - # Open data from file dset_times = h5file["times"] dset_kxE = h5file["kxE"] @@ -336,7 +335,6 @@ def plot1d( # set_trace() def load2d_means(self, tmin=0, tmax=1000, delta_t=2): - means = {} # Load data from file with h5py.File(self.path_file2D, "r") as h5file: diff --git a/fluidsim/solvers/ns2d/strat/solver.py b/fluidsim/solvers/ns2d/strat/solver.py index 46a0a7cf..8520d395 100644 --- a/fluidsim/solvers/ns2d/strat/solver.py +++ b/fluidsim/solvers/ns2d/strat/solver.py @@ -29,7 +29,6 @@ def tendencies_nonlin_ns2dstrat( class InfoSolverNS2DStrat(InfoSolverNS2D): def _init_root(self): - super()._init_root() package = "fluidsim.solvers.ns2d.strat" @@ -227,7 +226,6 @@ def compute_dispersion_relation(self): if __name__ == "__main__": - from math import pi import fluiddyn as fld diff --git a/fluidsim/solvers/ns2d/strat/state.py b/fluidsim/solvers/ns2d/strat/state.py index 187a7966..b8775906 100644 --- a/fluidsim/solvers/ns2d/strat/state.py +++ b/fluidsim/solvers/ns2d/strat/state.py @@ -48,7 +48,6 @@ def _complete_info_solver(info_solver): ) def __init__(self, sim, oper=None): - super().__init__(sim, oper) self.field_tmp4 = np.empty_like(self.state_phys[0]) diff --git a/fluidsim/solvers/ns2d/strat/test_solver.py b/fluidsim/solvers/ns2d/strat/test_solver.py index 0e315b98..e6e68d64 100644 --- a/fluidsim/solvers/ns2d/strat/test_solver.py +++ b/fluidsim/solvers/ns2d/strat/test_solver.py @@ -126,7 +126,6 @@ def init_params(self): class TestForcingOutput(TestSimulBase): @classmethod def init_params(self): - params = super().init_params() # Time stepping parameters @@ -172,7 +171,6 @@ def init_params(self): child["HAS_TO_PLOT_SAVED"] = True def test_forcing_output(self): - sim = self.sim sim.time_stepping.start() @@ -193,7 +191,6 @@ def test_forcing_output(self): sim.output.compute_enstrophy() if mpi.nb_proc == 1: - plt.close("all") sim.output.plot_summary() diff --git a/fluidsim/solvers/ns2d/test_solver.py b/fluidsim/solvers/ns2d/test_solver.py index 489aee8f..d7dfe66e 100644 --- a/fluidsim/solvers/ns2d/test_solver.py +++ b/fluidsim/solvers/ns2d/test_solver.py @@ -23,7 +23,6 @@ def Simul(cls): @classmethod def init_params(cls): - params = ( cls.params ) = cls.Simul.create_default_params() # pylint: disable=maybe-no-member @@ -122,7 +121,6 @@ def test_(self): class TestForcingOutput(TestSimulBase): @classmethod def init_params(self): - params = super().init_params() params.oper.truncation_shape = "no_multiple_aliases" @@ -156,7 +154,6 @@ def init_params(self): child["HAS_TO_PLOT_SAVED"] = True def test_forcing_output(self): - sim = self.sim assert f"{sim.params.oper.nx}x{sim.params.oper.ny}" in sim.name_run diff --git a/fluidsim/solvers/ns2d/with_uxuy.py b/fluidsim/solvers/ns2d/with_uxuy.py index 96bffce9..d9f0f23b 100644 --- a/fluidsim/solvers/ns2d/with_uxuy.py +++ b/fluidsim/solvers/ns2d/with_uxuy.py @@ -66,7 +66,6 @@ def compute_energy_fft(self): class InfoSolver(InfoBase): def _init_root(self): - super()._init_root() module = "fluidsim.solvers.ns2d.with_uxuy" @@ -90,7 +89,6 @@ class Simul(SimulBase): InfoSolver = InfoSolver def tendencies_nonlin(self, state_spect=None, old=None): - # the operator and the fast Fourier transform oper = self.oper ifft_as_arg = oper.ifft_as_arg diff --git a/fluidsim/solvers/ns3d/bouss/solver.py b/fluidsim/solvers/ns3d/bouss/solver.py index be3d180d..61d90ec5 100644 --- a/fluidsim/solvers/ns3d/bouss/solver.py +++ b/fluidsim/solvers/ns3d/bouss/solver.py @@ -22,7 +22,6 @@ class InfoSolverNS3DBouss(InfoSolverNS3DStrat): def _init_root(self): - super()._init_root() package = "fluidsim.solvers.ns3d.bouss" @@ -176,7 +175,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): if __name__ == "__main__": - import numpy as np # import fluiddyn as fld diff --git a/fluidsim/solvers/ns3d/bouss/test_solver.py b/fluidsim/solvers/ns3d/bouss/test_solver.py index a929f671..7e1c0b7d 100644 --- a/fluidsim/solvers/ns3d/bouss/test_solver.py +++ b/fluidsim/solvers/ns3d/bouss/test_solver.py @@ -29,7 +29,6 @@ def init_params(self): periods[key] = 0.2 def test_output(self): - sim = self.sim sim.time_stepping.start() diff --git a/fluidsim/solvers/ns3d/forcing/milestone.py b/fluidsim/solvers/ns3d/forcing/milestone.py index ea21d022..5549d365 100644 --- a/fluidsim/solvers/ns3d/forcing/milestone.py +++ b/fluidsim/solvers/ns3d/forcing/milestone.py @@ -50,7 +50,6 @@ def _init_operators(self, sim): self.solid_fft = self.sim.oper.create_arrayK(value=0) def __init__(self, sim): - if mpi.rank == 0: from fluidsim.operators.operators2d import OperatorsPseudoSpectral2D @@ -70,7 +69,6 @@ def __init__(self, sim): super().__init__(sim) def _full_from_coarse(self, solid): - if self._is_using_coarse_oper: if mpi.rank == 0: solid_coarse_fft = self.oper_coarse.fft(solid) @@ -100,7 +98,6 @@ def _full_from_coarse(self, solid): return self.solid def compute(self, time=None): - sim = self.sim if time is None: @@ -124,7 +121,6 @@ def compute(self, time=None): if __name__ == "__main__": - from time import perf_counter import matplotlib.pyplot as plt diff --git a/fluidsim/solvers/ns3d/forcing/watu.py b/fluidsim/solvers/ns3d/forcing/watu.py index a18556ef..eaf748a7 100755 --- a/fluidsim/solvers/ns3d/forcing/watu.py +++ b/fluidsim/solvers/ns3d/forcing/watu.py @@ -72,7 +72,6 @@ def __init__(self, sim): if path_file.exists(): # load time signals with h5netcdf.File(str(path_file), "r") as file: - times = file["/times"][...] signals = file["/signals"][...] diff --git a/fluidsim/solvers/ns3d/output/spatial_means.py b/fluidsim/solvers/ns3d/output/spatial_means.py index 6ac1f744..2fbcc9cf 100644 --- a/fluidsim/solvers/ns3d/output/spatial_means.py +++ b/fluidsim/solvers/ns3d/output/spatial_means.py @@ -73,7 +73,6 @@ def _save_one_time(self): PK2 = self.sum_wavenumbers(PK2_fft) if mpi.rank == 0: - self.file.write( f"####\ntime = {tsim:11.5e}\n" f"E = {energy:11.5e}\n" @@ -98,7 +97,6 @@ def _save_one_time(self): os.fsync(self.file.fileno()) if self.has_to_plot and mpi.rank == 0: - self.ax_a.plot(tsim, energy, "k.") # self.axe_b.plot(tsim, epsK_tot, 'k.') diff --git a/fluidsim/solvers/ns3d/output/spatiotemporal_spectra.py b/fluidsim/solvers/ns3d/output/spatiotemporal_spectra.py index 7cf0a787..9298e42a 100644 --- a/fluidsim/solvers/ns3d/output/spatiotemporal_spectra.py +++ b/fluidsim/solvers/ns3d/output/spatiotemporal_spectra.py @@ -96,7 +96,6 @@ def _sum_wavenumber3D(field, KX, kx_max): class SpatioTemporalSpectraNS3D(SpatioTemporalSpectraNS, SpatioTemporalSpectra3D): - compute_spectrum_kzkhomega = staticmethod(compute_spectrum_kzkhomega) _sum_wavenumber = staticmethod(_sum_wavenumber3D) diff --git a/fluidsim/solvers/ns3d/output/spect_energy_budget.py b/fluidsim/solvers/ns3d/output/spect_energy_budget.py index dd813907..c1f968c7 100644 --- a/fluidsim/solvers/ns3d/output/spect_energy_budget.py +++ b/fluidsim/solvers/ns3d/output/spect_energy_budget.py @@ -80,7 +80,6 @@ def _complete_params_with_default(cls, params): ) def __init__(self, output): - params = output.sim.params self.nx = params.oper.nx @@ -110,7 +109,6 @@ def compute_spectra(self, name, quantity): } def compute(self): - results = {} state = self.sim.state @@ -245,7 +243,6 @@ def load_mean(self, tmin=0, tmax=None, keys_to_load=None, verbose=True): _key_plot_default_kzkh = "transfer_Kh" def plot_kzkh(self, tmin=0, tmax=None, key=None, ax=None): - with h5py.File(self.path_file, "r") as file: keys_saved = [ key @@ -276,7 +273,6 @@ def plot_kzkh(self, tmin=0, tmax=None, key=None, ax=None): ax.pcolormesh(kh, kz, spectrum, shading="nearest") def compute_fluxes_mean(self, tmin=None, tmax=None): - with h5py.File(self.path_file, "r") as file: keys_saved = [ key @@ -317,7 +313,6 @@ def compute_fluxes_mean(self, tmin=None, tmax=None): return dict_results def plot_fluxes(self, tmin=None, tmax=None, key_k="kh", ax=None): - data = self.compute_fluxes_mean(tmin, tmax) k_plot = data[key_k] diff --git a/fluidsim/solvers/ns3d/output/spectra.py b/fluidsim/solvers/ns3d/output/spectra.py index 2c289574..3b55fafd 100644 --- a/fluidsim/solvers/ns3d/output/spectra.py +++ b/fluidsim/solvers/ns3d/output/spectra.py @@ -122,7 +122,6 @@ def plot1d_times( only_time_average=False, cmap=None, ): - self._plot_times( tmin=tmin, tmax=tmax, @@ -155,7 +154,6 @@ def plot3d_times( only_time_average=False, cmap=None, ): - self._plot_times( tmin=tmin, tmax=tmax, @@ -189,7 +187,6 @@ def _plot_times( ndim=1, cmap=None, ): - if ndim not in [1, 3]: raise ValueError @@ -302,7 +299,6 @@ def plot1d( plot_forcing_region=False, plot_dissipative_scales=False, ): - ax = self._plot_ndim( tmin, tmax, @@ -320,7 +316,6 @@ def plot1d( ymin, ymax = ax.get_ybound() if plot_forcing_region: - with h5py.File(self.path_file1d, "r") as h5file: kx = h5file["kx"][...] ky = h5file["ky"][...] @@ -413,7 +408,6 @@ def plot3d( xlim=None, ylim=None, ): - ax = self._plot_ndim( tmin, tmax, @@ -531,7 +525,6 @@ def _plot_ndim( def _plot1d_direction( self, direction, imin_plot, imax_plot, coef_compensate, ax ): - with h5py.File(self.path_file1d, "r") as h5file: ks = h5file["k" + direction][...] spectrum = _get_averaged_spectrum( diff --git a/fluidsim/solvers/ns3d/solver.py b/fluidsim/solvers/ns3d/solver.py index 2f471e8d..f6745fd7 100644 --- a/fluidsim/solvers/ns3d/solver.py +++ b/fluidsim/solvers/ns3d/solver.py @@ -29,7 +29,6 @@ class InfoSolverNS3D(InfoSolverPseudoSpectral3D): def _init_root(self): - super()._init_root() package = "fluidsim.solvers.ns3d" @@ -145,7 +144,6 @@ def _complete_params_with_default(params): ) def _init_projection(self): - try: self.no_vz_kz0 = self.params.no_vz_kz0 except AttributeError: @@ -278,7 +276,6 @@ def project_state_spect(self, state_spect): if __name__ == "__main__": - import fluiddyn as fld params = Simul.create_default_params() diff --git a/fluidsim/solvers/ns3d/state.py b/fluidsim/solvers/ns3d/state.py index 9ae5fe35..f1bc4975 100755 --- a/fluidsim/solvers/ns3d/state.py +++ b/fluidsim/solvers/ns3d/state.py @@ -41,7 +41,6 @@ def _complete_info_solver(cls, info_solver): ) def __init__(self, sim, oper=None): - super().__init__(sim, oper) self.fields_tmp = tuple( diff --git a/fluidsim/solvers/ns3d/strat/output/spatial_means.py b/fluidsim/solvers/ns3d/strat/output/spatial_means.py index e9dbefdf..9e277efc 100644 --- a/fluidsim/solvers/ns3d/strat/output/spatial_means.py +++ b/fluidsim/solvers/ns3d/strat/output/spatial_means.py @@ -96,7 +96,6 @@ def _save_one_time(self): PA2 *= self.one_over_N2 if mpi.rank == 0: - self.file.write( f"####\ntime = {tsim:11.5e}\n" f"E = {energy:11.5e}\n" @@ -130,7 +129,6 @@ def _save_one_time(self): os.fsync(self.file.fileno()) if self.has_to_plot and mpi.rank == 0: - self.ax_a.plot(tsim, energy, "k.") # self.axe_b.plot(tsim, epsK_tot, 'k.') diff --git a/fluidsim/solvers/ns3d/strat/output/spect_energy_budget.py b/fluidsim/solvers/ns3d/strat/output/spect_energy_budget.py index feea471d..327fbc84 100644 --- a/fluidsim/solvers/ns3d/strat/output/spect_energy_budget.py +++ b/fluidsim/solvers/ns3d/strat/output/spect_energy_budget.py @@ -67,7 +67,6 @@ class SpectralEnergyBudgetNS3DStrat(SpectralEnergyBudgetNS3D): """ def compute(self): - results = super().compute() state = self.sim.state @@ -121,7 +120,6 @@ def compute(self): def plot_fluxes( self, tmin=None, tmax=None, key_k="kh", ax=None, plot_conversion=True ): - data = self.compute_fluxes_mean(tmin, tmax) k_plot = data[key_k] diff --git a/fluidsim/solvers/ns3d/strat/output/spectra.py b/fluidsim/solvers/ns3d/strat/output/spectra.py index 9b2039d3..50cb31aa 100644 --- a/fluidsim/solvers/ns3d/strat/output/spectra.py +++ b/fluidsim/solvers/ns3d/strat/output/spectra.py @@ -112,7 +112,6 @@ def plot_kzkh(self, tmin=0, tmax=None, key="Khd", ax=None): def _plot1d_direction( self, direction, imin_plot, imax_plot, coef_compensate, ax ): - with h5py.File(self.path_file1d, "r") as h5file: ks = h5file["k" + direction][...] diff --git a/fluidsim/solvers/ns3d/strat/solver.py b/fluidsim/solvers/ns3d/strat/solver.py index 12dc3453..5f51ea1e 100644 --- a/fluidsim/solvers/ns3d/strat/solver.py +++ b/fluidsim/solvers/ns3d/strat/solver.py @@ -35,7 +35,6 @@ def compute_fb_fft(div_vb_fft: Ac, N: "float or int", vz_fft: Ac): class InfoSolverNS3DStrat(InfoSolverNS3D): def _init_root(self): - super()._init_root() package = "fluidsim.solvers.ns3d.strat" @@ -232,7 +231,6 @@ def compute_dispersion_relation(self): if __name__ == "__main__": - import numpy as np import fluiddyn as fld diff --git a/fluidsim/solvers/ns3d/strat/test_solver.py b/fluidsim/solvers/ns3d/strat/test_solver.py index e47ce8aa..1ce064da 100644 --- a/fluidsim/solvers/ns3d/strat/test_solver.py +++ b/fluidsim/solvers/ns3d/strat/test_solver.py @@ -33,7 +33,6 @@ def init_params(cls): params.output.HAS_TO_SAVE = False def test_tendency(self): - sim = self.sim tend = sim.tendencies_nonlin(state_spect=sim.state.state_spect) @@ -105,7 +104,6 @@ def init_params(self): @pytest.mark.filterwarnings("ignore:divide by zero encountered in log10") def test_output(self): - sim = self.sim oper = sim.oper @@ -266,7 +264,6 @@ def init_params(self): params.output.spectra.kzkh_periodicity = 1 def test_noshearmodes(self): - sim = self.sim sim.time_stepping.start() diff --git a/fluidsim/solvers/ns3d/test_solver.py b/fluidsim/solvers/ns3d/test_solver.py index ffc8e6fa..b492a462 100644 --- a/fluidsim/solvers/ns3d/test_solver.py +++ b/fluidsim/solvers/ns3d/test_solver.py @@ -46,7 +46,6 @@ def _init_grid(params, nx): @classmethod def init_params(cls): - params = cls.params = cls.Simul.create_default_params() params.short_name_type_run = "test" @@ -79,7 +78,6 @@ def init_params(cls): params.output.HAS_TO_SAVE = False def test_tendency(self): - sim = self.sim tend = sim.tendencies_nonlin(state_spect=sim.state.state_spect) @@ -142,7 +140,6 @@ def init_params(cls): @pytest.mark.filterwarnings("ignore:divide by zero encountered in log10") def test_output(self): - sim = self.sim # put energy in vz @@ -161,7 +158,6 @@ def test_output(self): assert sim.time_stepping._get_phaseshift() is phaseshift if mpi.nb_proc == 1: - phys_fields = sim.output.phys_fields phys_fields.plot(equation=f"iz=0", numfig=1000) @@ -413,7 +409,6 @@ def init_params(self): params.init_fields.type = "in_script" def test_init_in_script(self): - sim = self.sim # here we have to initialize the flow fields @@ -563,7 +558,6 @@ def init_params(self): params.output.periods_save.phys_fields = 2.0 def test_forcing(self): - sim = self.sim sim.time_stepping.start() sim.state.check_energy_equal_phys_spect() diff --git a/fluidsim/solvers/plate2d/dimensional.py b/fluidsim/solvers/plate2d/dimensional.py index 5feda148..055cec50 100644 --- a/fluidsim/solvers/plate2d/dimensional.py +++ b/fluidsim/solvers/plate2d/dimensional.py @@ -85,7 +85,6 @@ def compute_nu4_dim(self, nu4): if __name__ == "__main__": - converter = Converter(C=0.648**2, h=4e-4) amplitude_z = 0.001 diff --git a/fluidsim/solvers/plate2d/output/correlations_freq.py b/fluidsim/solvers/plate2d/output/correlations_freq.py index 539dbb10..450b6aad 100644 --- a/fluidsim/solvers/plate2d/output/correlations_freq.py +++ b/fluidsim/solvers/plate2d/output/correlations_freq.py @@ -313,7 +313,6 @@ def _online_save(self): self.nb_means_times % 128 == 0 or np.log(self.nb_means_times) / np.log(2) % 1 == 0 ) and self.nb_means_times != 1: - correlations = { "corr4": self.corr4, "corr2": self.corr2, @@ -387,7 +386,6 @@ def _online_plot_saving(self, dict_results): fig1.colorbar(pc1) def compute_corr4_norm(self, it=-1): - with h5py.File(self.path_file, "r") as file: corr4 = file["corr4"][it] corr2 = file["corr2"][it] @@ -576,7 +574,6 @@ def plot_norm_pick_corr4(self): ax.set_xlabel("number of averages") def plot_convergence(self): - nb_means, dnormpickC4 = self._compute_dnormpickC4_over_dnbmean() fig = plt.figure() @@ -586,7 +583,6 @@ def plot_convergence(self): ax.set_xlabel("number of averages") def plot_corr2(self, nonorm=False, it=-1): - with h5py.File(self.path_file, "r") as file: corr2_in_file = file["corr2"] corr2 = corr2_in_file[it] @@ -625,7 +621,6 @@ def plot_corr2(self, nonorm=False, it=-1): plt.axis([fx.min(), fx.max(), fy.min(), fy.max()]) def plot_corr2_1d(self, it=-1): - with h5py.File(self.path_file, "r") as file: corr2 = file["corr2"][it] nb_means = file["nb_means"][it] @@ -644,7 +639,6 @@ def plot_corr2_1d(self, it=-1): ax.plot(self.omegas, np.log10(abs(corr2_diag))) def plot_corr4(self, it=-1): - nb_omegas1 = self.iomegas1.shape[0] nb_omegas = self.nb_omegas diff --git a/fluidsim/solvers/plate2d/output/spatial_means.py b/fluidsim/solvers/plate2d/output/spatial_means.py index c6251591..a5336e60 100644 --- a/fluidsim/solvers/plate2d/output/spatial_means.py +++ b/fluidsim/solvers/plate2d/output/spatial_means.py @@ -133,7 +133,6 @@ def _save_one_time(self): os.fsync(self.file.fileno()) if self.has_to_plot and mpi.rank == 0: - self.ax_a.plot(tsim, energy, "k.") self.ax_a.plot(tsim, energy_k, "r.") self.ax_a.plot(tsim, energy_l, "b.") @@ -201,7 +200,6 @@ def load(self): E_e[il] = float(words[14]) if self.sim.params.forcing.enable: - line = lines_P[il] words = line.split() P1[il] = float(words[2]) diff --git a/fluidsim/solvers/plate2d/output/spectra.py b/fluidsim/solvers/plate2d/output/spectra.py index dfaf6f60..19b4fc43 100644 --- a/fluidsim/solvers/plate2d/output/spectra.py +++ b/fluidsim/solvers/plate2d/output/spectra.py @@ -70,7 +70,6 @@ def _online_plot_saving(self, dict_spectra1D, dict_spectra2D): ) def plot1d(self, tmin=0, tmax=1000, delta_t=2, coef_compensate=3): - with h5py.File(self.path_file1D, "r") as h5file: dset_times = h5file["times"] diff --git a/fluidsim/solvers/plate2d/solver.py b/fluidsim/solvers/plate2d/solver.py index 711120d7..d1195936 100644 --- a/fluidsim/solvers/plate2d/solver.py +++ b/fluidsim/solvers/plate2d/solver.py @@ -285,7 +285,6 @@ def test_tendencies_nonlin( if __name__ == "__main__": - np.set_printoptions(precision=2) import fluiddyn as fld diff --git a/fluidsim/solvers/plate2d/test_dimensional.py b/fluidsim/solvers/plate2d/test_dimensional.py index a3fba66b..22c49c6a 100644 --- a/fluidsim/solvers/plate2d/test_dimensional.py +++ b/fluidsim/solvers/plate2d/test_dimensional.py @@ -5,7 +5,6 @@ class TestDimensional(TestCase): def test_converter(self): - conv = Converter(C=0.648**2, h=4e-4) time = 10.0 diff --git a/fluidsim/solvers/plate2d/test_solver.py b/fluidsim/solvers/plate2d/test_solver.py index 022c954c..32d92212 100644 --- a/fluidsim/solvers/plate2d/test_solver.py +++ b/fluidsim/solvers/plate2d/test_solver.py @@ -108,7 +108,6 @@ def init_params(cls): params.output.correl_freq.iomegas1 = [1, 2] def test_output(self): - sim = self.sim sim.time_stepping.start() diff --git a/fluidsim/solvers/sphere/ns2d/solver.py b/fluidsim/solvers/sphere/ns2d/solver.py index 86ddf6fd..3ae2b331 100644 --- a/fluidsim/solvers/sphere/ns2d/solver.py +++ b/fluidsim/solvers/sphere/ns2d/solver.py @@ -133,7 +133,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): Simul = SimulSphereNS2D if __name__ == "__main__": - params = Simul.create_default_params() params.short_name_type_run = "test" diff --git a/fluidsim/solvers/sphere/ns2d/test_solver.py b/fluidsim/solvers/sphere/ns2d/test_solver.py index d09656ab..bf349a0f 100644 --- a/fluidsim/solvers/sphere/ns2d/test_solver.py +++ b/fluidsim/solvers/sphere/ns2d/test_solver.py @@ -20,7 +20,6 @@ class TestSimulBase(TestSimul): @classmethod def init_params(cls): - params = cls.params = cls.Simul.create_default_params() params.short_name_type_run = "test" params.output.sub_directory = "unittests" diff --git a/fluidsim/solvers/sphere/sw1l/solver.py b/fluidsim/solvers/sphere/sw1l/solver.py index e9b791f8..f483b804 100644 --- a/fluidsim/solvers/sphere/sw1l/solver.py +++ b/fluidsim/solvers/sphere/sw1l/solver.py @@ -187,7 +187,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): if __name__ == "__main__": - params = Simul.create_default_params() params.short_name_type_run = "test" diff --git a/fluidsim/solvers/sphere/sw1l/test_solver.py b/fluidsim/solvers/sphere/sw1l/test_solver.py index 340e0376..0cc47a24 100644 --- a/fluidsim/solvers/sphere/sw1l/test_solver.py +++ b/fluidsim/solvers/sphere/sw1l/test_solver.py @@ -20,7 +20,6 @@ class TestSimulBase(TestSimul): @classmethod def init_params(cls): - params = cls.params = cls.Simul.create_default_params() params.short_name_type_run = "test" params.output.sub_directory = "unittests" diff --git a/fluidsim/solvers/sw1l/exactlin/modified/solver.py b/fluidsim/solvers/sw1l/exactlin/modified/solver.py index f5e07985..725a6696 100644 --- a/fluidsim/solvers/sw1l/exactlin/modified/solver.py +++ b/fluidsim/solvers/sw1l/exactlin/modified/solver.py @@ -121,7 +121,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): if __name__ == "__main__": - import fluiddyn as fld params = Simul.create_default_params() diff --git a/fluidsim/solvers/sw1l/exactlin/solver.py b/fluidsim/solvers/sw1l/exactlin/solver.py index bd9d8733..30ee592b 100644 --- a/fluidsim/solvers/sw1l/exactlin/solver.py +++ b/fluidsim/solvers/sw1l/exactlin/solver.py @@ -186,7 +186,6 @@ def compute_freq_complex(self, key): if __name__ == "__main__": - import fluiddyn as fld params = Simul.create_default_params() diff --git a/fluidsim/solvers/sw1l/modified/solver.py b/fluidsim/solvers/sw1l/modified/solver.py index b77a7776..ff1077c8 100644 --- a/fluidsim/solvers/sw1l/modified/solver.py +++ b/fluidsim/solvers/sw1l/modified/solver.py @@ -118,7 +118,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): if __name__ == "__main__": - import fluiddyn as fld params = Simul.create_default_params() diff --git a/fluidsim/solvers/sw1l/modified/state.py b/fluidsim/solvers/sw1l/modified/state.py index b960bddc..4a3e420c 100644 --- a/fluidsim/solvers/sw1l/modified/state.py +++ b/fluidsim/solvers/sw1l/modified/state.py @@ -97,7 +97,6 @@ def compute(self, key, SAVE_IN_DICT=True, RAISE_ERROR=True): return result def init_from_uxuyfft(self, ux_fft, uy_fft): - oper = self.oper ifft2 = oper.ifft2 diff --git a/fluidsim/solvers/sw1l/onlywaves/solver.py b/fluidsim/solvers/sw1l/onlywaves/solver.py index 21597241..4d28197f 100644 --- a/fluidsim/solvers/sw1l/onlywaves/solver.py +++ b/fluidsim/solvers/sw1l/onlywaves/solver.py @@ -183,7 +183,6 @@ def compute_freq_complex(self, key): if __name__ == "__main__": - import fluiddyn as fld params = Simul.create_default_params() diff --git a/fluidsim/solvers/sw1l/onlywaves/state.py b/fluidsim/solvers/sw1l/onlywaves/state.py index ff4b1f2f..fe92ac28 100644 --- a/fluidsim/solvers/sw1l/onlywaves/state.py +++ b/fluidsim/solvers/sw1l/onlywaves/state.py @@ -190,7 +190,6 @@ def return_statephys_from_statespect(self, state_spect=None): return state_phys def init_from_uxuyetafft(self, ux_fft, uy_fft, eta_fft): - (q_fft, ap_fft, am_fft) = self.oper.qapamfft_from_uxuyetafft( ux_fft, uy_fft, eta_fft ) @@ -213,7 +212,6 @@ def init_from_etafft(self, eta_fft): self.statephys_from_statespect() def init_from_uxuyfft(self, ux_fft, uy_fft): - oper = self.oper ifft2 = oper.ifft2 diff --git a/fluidsim/solvers/sw1l/operators.py b/fluidsim/solvers/sw1l/operators.py index d6e79808..ba2a2a19 100644 --- a/fluidsim/solvers/sw1l/operators.py +++ b/fluidsim/solvers/sw1l/operators.py @@ -56,7 +56,6 @@ def _qapamfft_from_uxuyetafft( ap_fft[i0, i1] = ux_fft[0, 0] + 1.0j * uy_fft[0, 0] am_fft[i0, i1] = ux_fft[0, 0] - 1.0j * uy_fft[0, 0] else: - rot_fft = 1j * ( KX[i0, i1] * uy_fft[i0, i1] - KY[i0, i1] * ux_fft[i0, i1] ) diff --git a/fluidsim/solvers/sw1l/output/_old_spect_energy_budg.py b/fluidsim/solvers/sw1l/output/_old_spect_energy_budg.py index 1ef83acb..91045ea0 100644 --- a/fluidsim/solvers/sw1l/output/_old_spect_energy_budg.py +++ b/fluidsim/solvers/sw1l/output/_old_spect_energy_budg.py @@ -12,7 +12,6 @@ class SpectralEnergyBudgetSW1LWaves(SpectralEnergyBudgetBase): def __init__(self, output): - params = output.sim.params self.c2 = params.c2 self.f = params.f @@ -388,7 +387,6 @@ def compute(self): return dict_results def _online_plot_saving(self, dict_results): - transfer2D_CPE = dict_results["transfer2D_CPE"] transfer2D_EKr = dict_results["transfer2D_EKr"] transfer2D_EKd = dict_results["transfer2D_EKd"] @@ -415,9 +413,7 @@ def _online_plot_saving(self, dict_results): self.axe_b.plot(khE + khE[1], PiCPE, "g") def plot(self, tmin=0, tmax=1000, delta_t=2): - with h5py.File(self.path_file, "r") as h5file: - dset_times = h5file["times"] times = dset_times[...] # nt = len(times) diff --git a/fluidsim/solvers/sw1l/output/spatial_means.py b/fluidsim/solvers/sw1l/output/spatial_means.py index 3bcbc220..7422bfa7 100644 --- a/fluidsim/solvers/sw1l/output/spatial_means.py +++ b/fluidsim/solvers/sw1l/output/spatial_means.py @@ -18,7 +18,6 @@ class SpatialMeansMSW1L(SpatialMeansJSON): """ def __init__(self, output): - params = output.sim.params self.c2 = params.c2 self.f = params.f @@ -179,7 +178,6 @@ def treat_dissipation_rates(self, energyK_fft, energyA_fft, CharneyPE_fft): def compute_dissipation_rates( self, f_d, f_d_hypo, energyK_fft, energyA_fft, CharneyPE_fft ): - epsK = self.sum_wavenumbers(f_d * 2 * energyK_fft) epsK_hypo = self.sum_wavenumbers(f_d_hypo * 2 * energyK_fft) epsA = self.sum_wavenumbers(f_d * 2 * energyA_fft) @@ -442,7 +440,6 @@ def compute_dissipation_rates( return dict_eps def compute_epsK(self, f_d, f_d_hypo, energyK_fft, dict_eps): - ux = self.sim.state.state_phys.get_var("ux") uy = self.sim.state.state_phys.get_var("uy") @@ -519,7 +516,6 @@ def treat_forcing(self): PK2 = self.sum_wavenumbers(PK2_fft) if mpi.rank == 0: - PK_tot = PK1 + PK2 PA_tot = PA1 + PA2 self._result.update( diff --git a/fluidsim/solvers/sw1l/output/spect_energy_budget.py b/fluidsim/solvers/sw1l/output/spect_energy_budget.py index 15b55985..aaada402 100644 --- a/fluidsim/solvers/sw1l/output/spect_energy_budget.py +++ b/fluidsim/solvers/sw1l/output/spect_energy_budget.py @@ -14,7 +14,6 @@ class SpectralEnergyBudgetSW1LBase(SpectralEnergyBudgetBase): """Save and plot spectral energy budgets.""" def __init__(self, output): - params = output.sim.params self.c2 = params.c2 self.f = params.f @@ -174,7 +173,6 @@ def compute(self): return dict_results def _online_plot_saving(self, dict_results): - transfer2D_CPE = dict_results["transfer2D_CPE"] transfer2D_EK = dict_results["transfer2D_EK"] transfer2D_EA = dict_results["transfer2D_EA"] @@ -190,9 +188,7 @@ def _online_plot_saving(self, dict_results): self.axe_b.plot(khE + khE[1], PiCPE, "g") def plot(self, tmin=0, tmax=1000, delta_t=2): - with h5py.File(self.path_file, "r") as h5file: - dset_times = h5file["times"] dset_khE = h5file["khE"] khE = dset_khE[...] @@ -478,7 +474,6 @@ def compute(self): return dict_results def _online_plot_saving(self, dict_results): - # Tens = dict_results["Tens"] Tq_GGG = dict_results["Tq_GGG"] Tq_AGG = dict_results["Tq_AGG"] @@ -549,9 +544,7 @@ def _online_plot_saving(self, dict_results): self.axe_b.set_ylabel(r"$\Sigma C(k_h)$") def plot(self, tmin=0, tmax=1000, delta_t=2): - with h5py.File(self.path_file, "r") as h5file: - dset_times = h5file["times"] dset_khE = h5file["khE"] khE = dset_khE[...] + 0.1 # Offset for semilog plots diff --git a/fluidsim/solvers/sw1l/output/spectra.py b/fluidsim/solvers/sw1l/output/spectra.py index b5733825..8e43eb72 100644 --- a/fluidsim/solvers/sw1l/output/spectra.py +++ b/fluidsim/solvers/sw1l/output/spectra.py @@ -152,7 +152,6 @@ def plot1d( ax: Optional[mpl.axes.Axes] = None, help_lines: bool = True, ): - with h5py.File(self.path_file1D, "r") as h5file: dset_times = h5file["times"] times = dset_times[...] @@ -261,7 +260,6 @@ def plot2d( ax: Optional[mpl.axes.Axes] = None, help_lines: bool = True, ): - with h5py.File(self.path_file2D, "r") as h5file: times = h5file["times"][...] diff --git a/fluidsim/solvers/sw1l/solver.py b/fluidsim/solvers/sw1l/solver.py index 116f7972..bc1ee6e5 100644 --- a/fluidsim/solvers/sw1l/solver.py +++ b/fluidsim/solvers/sw1l/solver.py @@ -249,7 +249,6 @@ def tendencies_nonlin(self, state_spect=None, old=None): if __name__ == "__main__": - import numpy as np import fluiddyn as fld diff --git a/fluidsim/solvers/sw1l/test_operators.py b/fluidsim/solvers/sw1l/test_operators.py index 5c5ec8e2..3ffd2582 100644 --- a/fluidsim/solvers/sw1l/test_operators.py +++ b/fluidsim/solvers/sw1l/test_operators.py @@ -9,7 +9,6 @@ def create_oper(type_fft=None, coef_dealiasing=2.0 / 3): - params = ParamContainer(tag="params") params._set_attrib("ONLY_COARSE_OPER", False) diff --git a/fluidsim/solvers/waves2d/solver.py b/fluidsim/solvers/waves2d/solver.py index 9d6c0e79..be988aaf 100644 --- a/fluidsim/solvers/waves2d/solver.py +++ b/fluidsim/solvers/waves2d/solver.py @@ -18,7 +18,6 @@ class InfoSolverWaves2d(InfoSolverPseudoSpectral): def _init_root(self): - super()._init_root() package = "fluidsim.solvers.waves2d" @@ -101,7 +100,6 @@ def _complete_params_with_default(params): params._set_attribs(attribs) def tendencies_nonlin(self, state_spect=None, old=None): - if old is None: tendencies_fft = SetOfVariables( like=self.state.state_spect, info="tendencies_nonlin" @@ -125,7 +123,6 @@ def compute_freq_complex(self, key): if __name__ == "__main__": - import fluiddyn as fld params = Simul.create_default_params() diff --git a/fluidsim/util/console/test_bench.py b/fluidsim/util/console/test_bench.py index 95944efd..5cb83628 100644 --- a/fluidsim/util/console/test_bench.py +++ b/fluidsim/util/console/test_bench.py @@ -43,7 +43,6 @@ def test2d(self): # Can plot only parallel benchmarks if mpi.rank == 0 and mpi.nb_proc != 1: - command = f"fluidsim-bench-analysis 24 -d 2 -i {path_tmp}" sys.argv = command.split() run_bench_analysis() diff --git a/fluidsim/util/mini_oper_modif_resol.py b/fluidsim/util/mini_oper_modif_resol.py index 308804e0..fb099be8 100644 --- a/fluidsim/util/mini_oper_modif_resol.py +++ b/fluidsim/util/mini_oper_modif_resol.py @@ -55,7 +55,6 @@ def fill_field_fft_3d(field_fft_in: A, field_fft_out: A): class MiniOperModifResol: def __init__(self, shape): - self.shape = shape dimension = self.dimension = len(shape) @@ -79,7 +78,6 @@ def __init__(self, shape): self.create_arrayK = self.oper_fft.create_arrayK def fill_field_fft(self, field_spect, field2_spect, oper): - if self.dimension == 2: return fill_field_fft_2d(field_spect, field2_spect) diff --git a/fluidsim/util/scripts/turb_trandom_anisotropic.py b/fluidsim/util/scripts/turb_trandom_anisotropic.py index 396ec635..734b4180 100644 --- a/fluidsim/util/scripts/turb_trandom_anisotropic.py +++ b/fluidsim/util/scripts/turb_trandom_anisotropic.py @@ -528,5 +528,4 @@ def main(args=None, **defaults): if __name__ == "__main__": - params, sim = main() diff --git a/fluidsim/util/testing.py b/fluidsim/util/testing.py index e5773a5a..2a00afbe 100644 --- a/fluidsim/util/testing.py +++ b/fluidsim/util/testing.py @@ -68,7 +68,6 @@ def getter(self, method): class TestCase(unittest.TestCase): - # True except if pytest is used... has_to_redirect_stdout = not any( any(test_tool in arg for arg in sys.argv) diff --git a/fluidsim/util/util.py b/fluidsim/util/util.py index d076b309..46aa1e9c 100644 --- a/fluidsim/util/util.py +++ b/fluidsim/util/util.py @@ -645,7 +645,6 @@ def times_start_last_from_path(path): return 666, 666 with open(path_file, "r") as file_stdout: - line = "" while not line.startswith("it ="): line = file_stdout.readline() @@ -765,7 +764,6 @@ def ensure_radians(angle): def get_last_time_spatial_means_from_path(path): - path_file = Path(path) / "spatial_means.txt" if path_file.exists(): diff --git a/lib/fluidsim_core/hexa_files.py b/lib/fluidsim_core/hexa_files.py index d1967a76..bd64db41 100644 --- a/lib/fluidsim_core/hexa_files.py +++ b/lib/fluidsim_core/hexa_files.py @@ -171,7 +171,6 @@ def __mul__(self, arg): __rmul__ = __mul__ def __add__(self, arg): - return self.__class__( self.key, arrays=[arr0 + arr1 for arr0, arr1 in zip(arg.arrays, self.arrays)], @@ -253,7 +252,6 @@ def _get_field_to_plot_from_file( def init_hexa_pcolormesh( self, ax, hexa_color, hexa_x, hexa_y, vmin=None, vmax=None, **kwargs ): - images = [] if vmax is None: @@ -262,10 +260,9 @@ def init_hexa_pcolormesh( if vmin is None: vmin = hexa_color.min() - for (arr, elem_x, elem_y) in zip( + for arr, elem_x, elem_y in zip( hexa_color.arrays, hexa_x.elements, hexa_y.elements ): - x_edges = elem_x["edges"] y_edges = elem_y["edges"] @@ -292,7 +289,7 @@ def on_move(event): elements_possibly_touched = [] - for (image, elem_x, elem_y) in zip( + for image, elem_x, elem_y in zip( images, hexa_x.elements, hexa_y.elements ): xmin, xmax = elem_x["lims"] @@ -335,7 +332,6 @@ def on_move(event): return images, cbar def init_quiver_1st_step(self, hexa_x, hexa_y, percentage_dx_quiver=4.0): - xmin = hexa_x.min() xmax = hexa_x.max() @@ -403,7 +399,6 @@ def compute_vectors_quiver(self, hexa_vx, hexa_vy, indices_vectors_in_elems): for indices_vectors_in_elem, arr_vx, arr_vy in zip( indices_vectors_in_elems, hexa_vx.arrays, hexa_vy.arrays ): - vmax_elem = np.max(np.sqrt(arr_vx**2 + arr_vy**2)) if vmax_elem > vmax: vmax = vmax_elem diff --git a/lib/fluidsim_core/info.py b/lib/fluidsim_core/info.py index d190428d..65a03bba 100644 --- a/lib/fluidsim_core/info.py +++ b/lib/fluidsim_core/info.py @@ -46,7 +46,6 @@ class InfoSolverCore(ParamContainer): """ def __init__(self, only_root=False, **kargs): - if len(kargs) == 0 or ("path_file" in kargs and "tag" not in kargs): kargs["tag"] = "solver" @@ -75,7 +74,6 @@ def __init__(self, only_root=False, **kargs): ) def _init_root(self): - self._set_attribs( { "module_name": "fluidsim_core.solver", diff --git a/lib/fluidsim_core/output/dataframe_from_paths.py b/lib/fluidsim_core/output/dataframe_from_paths.py index fc7f3e81..6c3c71f7 100644 --- a/lib/fluidsim_core/output/dataframe_from_paths.py +++ b/lib/fluidsim_core/output/dataframe_from_paths.py @@ -16,6 +16,7 @@ class DataframeMaker(ABC): """To produce a Pandas dataframe from a set of simulations""" + @abstractmethod def get_time_start_from_path(self, path): """ "Get first time""" diff --git a/lib/fluidsim_core/output/phys_fields.py b/lib/fluidsim_core/output/phys_fields.py index 449e63ca..b9b51c87 100644 --- a/lib/fluidsim_core/output/phys_fields.py +++ b/lib/fluidsim_core/output/phys_fields.py @@ -156,7 +156,6 @@ def get_field_to_plot( interpolate_time=True, skip_vars=(), ): - if time is None and idx_time is None: self.update_times() time = self.times[-1] @@ -174,7 +173,6 @@ def get_field_to_plot( ) if interpolate_time and time is not None: - idx_closest, time_closest = self.get_closest_time_file(time) if math.isclose(time, time_closest) or self.times.size == 1: diff --git a/lib/fluidsim_core/output/phys_fields_snek5000.py b/lib/fluidsim_core/output/phys_fields_snek5000.py index 5f3846a0..9cefb2e1 100644 --- a/lib/fluidsim_core/output/phys_fields_snek5000.py +++ b/lib/fluidsim_core/output/phys_fields_snek5000.py @@ -15,12 +15,10 @@ class PhysFields4Snek5000(PhysFieldsABC): - _cls_movies = MoviesBasePhysFieldsHexa _cls_set_of_files = SetOfPhysFieldFiles def __init__(self, output=None): - self.output = output self.params = output.params @@ -85,7 +83,6 @@ def get_vector_for_plot( @lru_cache(maxsize=None) def _get_axis_data(self, equation): - ( letter_x_axis, letter_y_axis, diff --git a/lib/fluidsim_core/scripts/restart.py b/lib/fluidsim_core/scripts/restart.py index f3030da7..2d922382 100644 --- a/lib/fluidsim_core/scripts/restart.py +++ b/lib/fluidsim_core/scripts/restart.py @@ -142,7 +142,6 @@ def main(self): params, sim = self.restart() if sim is not None and sim.time_stepping._has_to_stop: - if mpi.rank == 0: # processes with rank 0 exits early with exit code 99 or 0 exit_code = 99 diff --git a/lib/fluidsim_core/tests/conftest.py b/lib/fluidsim_core/tests/conftest.py index e82516ec..e34a531f 100644 --- a/lib/fluidsim_core/tests/conftest.py +++ b/lib/fluidsim_core/tests/conftest.py @@ -12,7 +12,6 @@ @pytest.fixture def path_sim(tmp_path): - path_dir = tmp_path / "session_00" path_dir.mkdir(exist_ok=True, parents=True) diff --git a/lib/fluidsim_core/tests/test_hexa_files.py b/lib/fluidsim_core/tests/test_hexa_files.py index c10ac1be..974f4516 100644 --- a/lib/fluidsim_core/tests/test_hexa_files.py +++ b/lib/fluidsim_core/tests/test_hexa_files.py @@ -15,7 +15,6 @@ class MockEvent: def test_setoffiles(false_output): - output = false_output assert output.path_run.exists() diff --git a/scripts/ns2d.strat/coeff_diss.py b/scripts/ns2d.strat/coeff_diss.py index 6e10f07f..f8e0e4aa 100644 --- a/scripts/ns2d.strat/coeff_diss.py +++ b/scripts/ns2d.strat/coeff_diss.py @@ -122,7 +122,6 @@ def compute_diff(idx_dealiasing, idy_dealiasing, dissE_kx, dissE_ky): def normalization_initialized_field(sim, coef_norm=1e-4): """Normalizes the initialized field. (ONLY if nx != ny)""" if sim.params.oper.nx != sim.params.oper.ny: - if not sim.params.forcing.key_forced == "ap_fft": raise ValueError("sim.params.forcing.key_forced should be ap_fft.") @@ -249,9 +248,7 @@ def check_dissipation(): should_I_stop = "non_stationarity" if ratio_x > threshold_ratio and ratio_y > threshold_ratio: - if delta_ikx > 0 and delta_iky > 0: - if delta_ikx > delta_iky: print("limited by y") norm = idy_dealiasing @@ -278,7 +275,6 @@ def check_dissipation(): should_I_stop = False factor = 1.0 else: - factor = 1 + (1 / min(ratio_x, ratio_y)) should_I_stop = False @@ -448,7 +444,6 @@ def check_dissipation(): p = 1 # Check ... while True: - if mpi.rank == 0: factor, should_I_stop = check_dissipation() else: diff --git a/scripts/ns2d.strat/find_dissipation.py b/scripts/ns2d.strat/find_dissipation.py index 66a331da..fd94da03 100644 --- a/scripts/ns2d.strat/find_dissipation.py +++ b/scripts/ns2d.strat/find_dissipation.py @@ -127,7 +127,6 @@ def compute_diff(idx_dealiasing, idy_dealiasing, dissE_kx, dissE_ky): def normalization_initialized_field(sim, coef_norm=1e-4): """Normalizes the initialized field. (ONLY if nx != ny)""" if sim.params.oper.nx != sim.params.oper.ny: - if not sim.params.forcing.key_forced == "ap_fft": raise ValueError("sim.params.forcing.key_forced should be ap_fft.") @@ -270,9 +269,7 @@ def check_dissipation(): should_I_stop = "non_stationarity" if ratio_x > threshold_ratio and ratio_y > threshold_ratio: - if delta_ikx > 0 and delta_iky > 0: - if delta_ikx > delta_iky: print("limited by y") norm = idy_dealiasing @@ -313,7 +310,6 @@ def check_dissipation(): should_I_stop = False factor = 1.0 else: - factor = 1 + (1 / min(ratio_x, ratio_y)) should_I_stop = False @@ -321,7 +317,6 @@ def check_dissipation(): if __name__ == "__main__": - # SIMULATION nx = 240 gamma = 0.5 @@ -518,7 +513,6 @@ def check_dissipation(): p = 1 # Check ... while True: - if mpi.rank == 0: factor, should_I_stop = check_dissipation() else: diff --git a/scripts/ns2d.strat/make_table_parameters.py b/scripts/ns2d.strat/make_table_parameters.py index 6cf89d6c..6f9c398a 100644 --- a/scripts/ns2d.strat/make_table_parameters.py +++ b/scripts/ns2d.strat/make_table_parameters.py @@ -45,7 +45,6 @@ ) for path in path_simulations: - # Load object simulations sim = load_sim_for_plot(path) diff --git a/scripts/ns2d.strat/make_video_spectrum_kykx.py b/scripts/ns2d.strat/make_video_spectrum_kykx.py index d08cdf41..401874a1 100644 --- a/scripts/ns2d.strat/make_video_spectrum_kykx.py +++ b/scripts/ns2d.strat/make_video_spectrum_kykx.py @@ -61,7 +61,6 @@ # Load data with h5py.File((path / "spectra_multidim.h5").as_posix(), "r") as f: - times = f["times"][...] itmin = np.argmin(abs(times - tmin)) itmax = np.argmin(abs(times - tmax)) @@ -209,6 +208,7 @@ colorbar = fig.colorbar(_im, cax=cbar_ax, format="%.1f") # colorbar.ax.ticklabel_format(style="sci") + # ax1.plot(times[0:2], energies_ap[0:2], color="red") # Define iterative function _update def _update(frame): diff --git a/scripts/ns2d.strat/ns2dstrat_lmode.py b/scripts/ns2d.strat/ns2dstrat_lmode.py index 651bfe68..91e91a14 100644 --- a/scripts/ns2d.strat/ns2dstrat_lmode.py +++ b/scripts/ns2d.strat/ns2dstrat_lmode.py @@ -13,7 +13,6 @@ def make_parameters_simulation( gamma, F, sigma, nu_8, t_end=10, NO_SHEAR_MODES=False ): - ## Operator parameters anisotropy_domain = 4 # anisotropy_domain = nx / nz nx = 240 @@ -84,7 +83,6 @@ def make_parameters_simulation( def modify_parameters(params): - # Output parameters params.output.HAS_TO_SAVE = True params.output.sub_directory = "find_diss_coef" @@ -94,7 +92,6 @@ def modify_parameters(params): if __name__ == "__main__": - ##### PARAMETERS ##### ###################### gamma = 0.2 # gamma = omega_l / omega_af diff --git a/scripts/ns2d.strat/plot_buoyancy_reynolds_anisotropy.py b/scripts/ns2d.strat/plot_buoyancy_reynolds_anisotropy.py index 6383f184..d26c0f3c 100644 --- a/scripts/ns2d.strat/plot_buoyancy_reynolds_anisotropy.py +++ b/scripts/ns2d.strat/plot_buoyancy_reynolds_anisotropy.py @@ -41,7 +41,6 @@ markers = [] for path in paths_simulations: - anisotropy, ratio_diss, F_h, Re_8, R_b = get_features_from_sim(path) res = _get_resolution_from_dir(path) diff --git a/scripts/ns2d.strat/plot_buoyancy_reynolds_dissipation.py b/scripts/ns2d.strat/plot_buoyancy_reynolds_dissipation.py index fa41adc2..e9e766a0 100644 --- a/scripts/ns2d.strat/plot_buoyancy_reynolds_dissipation.py +++ b/scripts/ns2d.strat/plot_buoyancy_reynolds_dissipation.py @@ -41,7 +41,6 @@ markers = [] for path in paths_simulations: - anisotropy, ratio_diss, F_h, Re_8, R_b, l_x, l_z = get_features_from_sim(path) res = _get_resolution_from_dir(path) diff --git a/scripts/ns2d.strat/plot_buoyancy_reynolds_froude.py b/scripts/ns2d.strat/plot_buoyancy_reynolds_froude.py index 35248dd6..053c0841 100644 --- a/scripts/ns2d.strat/plot_buoyancy_reynolds_froude.py +++ b/scripts/ns2d.strat/plot_buoyancy_reynolds_froude.py @@ -37,7 +37,6 @@ markers = [] for path in paths_simulations: - anisotropy, ratio_diss, F_h, Re_8, R_b = get_features_from_sim(path) res = _get_resolution_from_dir(path) diff --git a/scripts/ns2d.strat/plot_froude_anisotropy.py b/scripts/ns2d.strat/plot_froude_anisotropy.py index b3ac106e..f1ddbda6 100644 --- a/scripts/ns2d.strat/plot_froude_anisotropy.py +++ b/scripts/ns2d.strat/plot_froude_anisotropy.py @@ -41,7 +41,6 @@ markers = [] for path in paths_simulations: - anisotropy, ratio_diss, F_h, Re_8, R_b = get_features_from_sim(path) res = _get_resolution_from_dir(path) diff --git a/scripts/ns2d.strat/plot_froude_dissipation.py b/scripts/ns2d.strat/plot_froude_dissipation.py index 5538dc4b..f43cd412 100644 --- a/scripts/ns2d.strat/plot_froude_dissipation.py +++ b/scripts/ns2d.strat/plot_froude_dissipation.py @@ -41,7 +41,6 @@ markers = [] for path in paths_simulations: - anisotropy, ratio_diss, F_h, Re_8, R_b, l_x, l_z = get_features_from_sim(path) res = _get_resolution_from_dir(path) diff --git a/scripts/plot_results/plot_interm.py b/scripts/plot_results/plot_interm.py index a7cc07c1..0a2ea930 100644 --- a/scripts/plot_results/plot_interm.py +++ b/scripts/plot_results/plot_interm.py @@ -170,7 +170,6 @@ def expo_from_order(order, PLOT=False, PLOT_PDF=False): irx_to_plot = [10, 50, 100] for irxp, irx in enumerate(irx_to_plot): - val_inc = values_inc_timemean[irx] ax1.plot( diff --git a/scripts/plot_results/plot_time_means.py b/scripts/plot_results/plot_time_means.py index a6e16322..576b719d 100644 --- a/scripts/plot_results/plot_time_means.py +++ b/scripts/plot_results/plot_time_means.py @@ -26,7 +26,6 @@ if LOAD: - tuple_loop = [ (c2, name_solver) for c2 in values_c2 for name_solver in values_solver ] diff --git a/scripts/sphere.sw1l/galewsky2004.py b/scripts/sphere.sw1l/galewsky2004.py index 0bb33d13..75eb7db0 100644 --- a/scripts/sphere.sw1l/galewsky2004.py +++ b/scripts/sphere.sw1l/galewsky2004.py @@ -87,6 +87,7 @@ def ux_from_lats(phi): ug.shape = (oper.nlat, 1) ux = ug * oper.create_array_spat(value=1.0) # broadcast to shape (nlats,nlons) + # uy = self.state_phys.get_var("uy") def integrand_gh(phi, a, omega): """The balance equation (3) in Galewsky et al."""