# HG changeset patch # User paugier <pierre.augier@univ-grenoble-alpes.fr> # Date 1654253314 -7200 # Fri Jun 03 12:48:34 2022 +0200 # Node ID 9ce8d65dcd39fcba888de898b782be4545a95ea9 # Parent 2ef91f8f9085c63dca8c1425f3d153809e3d9b2f 2022strat_turb_toro: better tables diff --git a/2022strat_turb_toro/py/save_ratio_length_scales_vs_Fh.py b/2022strat_turb_toro/py/save_ratio_length_scales_vs_Fh.py --- a/2022strat_turb_toro/py/save_ratio_length_scales_vs_Fh.py +++ b/2022strat_turb_toro/py/save_ratio_length_scales_vs_Fh.py @@ -7,7 +7,9 @@ tmp = df[df.Re > 2000].copy() tmp["lz1/lx1"] = tmp.lz1 / tmp.lx1 -ax = plot(tmp, "Fh", "lz1/lx1", c=np.log10(tmp["R2"]), vmin=0.5, vmax=2, logy=True) +ax = plot( + tmp, "Fh", "lz1/lx1", c=np.log10(tmp["R2"]), vmin=0.5, vmax=2, logy=True +) xs = np.linspace(1e-2, 4e-2, 2) ax.plot(xs, 1.8e1 * xs**1, "b") diff --git a/2022strat_turb_toro/py/save_table_better_simuls.py b/2022strat_turb_toro/py/save_table_better_simuls.py --- a/2022strat_turb_toro/py/save_table_better_simuls.py +++ b/2022strat_turb_toro/py/save_table_better_simuls.py @@ -6,18 +6,20 @@ # fmt: off columns = [ - "N", "Rb", - "nx", "nz", - "k_max*eta", "epsK2/epsK", "k_max*lambda", + "N", "Rb", "Re", + "nx", "nz", "k_max*eta", + # "R4", + "epsK2/epsK", "k_max*lambda", "Fh", "R2", "Re_lambda", # "R4", # "Uh2", "epsK", # "Gamma", "I_velocity", "I_dissipation", ] header = [ - "$N$", "$\R_i$", - "$n_x$", "$n_z$", - r"$\kmax\eta$", r"$\epsK_2/\epsK$", r"$\kmax\lambda$", + "$N$", "$\R_i$", "$Re_i$", + "$n_x$", "$n_z$",r"$\kmax\eta$", + # "$\R_4$", + r"$\epsK_2/\epsK$", r"$\kmax\lambda$", "$F_h$", r"$\R_2$", r"$Re_\lambda$" # r"$\R_4$", # "${U_h}^2$", r"$\epsK$", @@ -25,10 +27,13 @@ ] # fmt: on +column_format = "rrr|" + 9 * "r" + df.to_latex( buf=tmp_dir / "table_better_simuls.tex", columns=columns, formatters=formatters, + column_format=column_format, index=False, header=header, escape=False, diff --git a/2022strat_turb_toro/py/save_table_simuls_regimes.py b/2022strat_turb_toro/py/save_table_simuls_regimes.py --- a/2022strat_turb_toro/py/save_table_simuls_regimes.py +++ b/2022strat_turb_toro/py/save_table_simuls_regimes.py @@ -5,6 +5,7 @@ # fmt: off columns = [ "letter", "regime", + "N", "Rb", 'nx', 'nz', 'k_max*eta', 'epsK2/epsK', 'Fh', 'R2', @@ -14,6 +15,7 @@ ] header = [ "", "regime", + "$N$", "$\R_i$", '$n_x$', '$n_z$', r'$\kmax\eta$', r'$\epsK_2/\epsK$', '$F_h$', r'$\R_2$', diff --git a/2022strat_turb_toro/py/util.py b/2022strat_turb_toro/py/util.py --- a/2022strat_turb_toro/py/util.py +++ b/2022strat_turb_toro/py/util.py @@ -168,8 +168,8 @@ "D": (40, 1), "L": (40, 20), "O": (10, 160), - "W": (3, 450), - "P": (0.25, 64000), + "W": (3, 900), + "P": (0.66, 18000), } paths_simuls_regimes = { @@ -182,13 +182,23 @@ def formatter_R(v): - if v > 10: + if v % 1 == 0 or v >= 100: return f"{v:.0f}" else: return f"{v:.1f}" +def formatter_N(v): + if v % 1 == 0: + return f"{v:.0f}" + elif v < 10: + return f"{v:.2f}" + else: + return f"{v:.1f}" + + formatters = { + "N": formatter_N, "Rb": formatter_R, "k_max*eta": lambda v: f"{v:.2f}", "k_max*lambda": lambda v: f"{v:.2f}", @@ -197,6 +207,8 @@ "R2": formatter_R, "R4": lambda v: f"{v:.0f}", "Re_lambda": formatter_R, + "Re": formatter_R, + "R4": lambda v: f"{v:.1e}", } Fh_limit = 0.06 diff --git a/2022strat_turb_toro/py/util_dataframe.py b/2022strat_turb_toro/py/util_dataframe.py --- a/2022strat_turb_toro/py/util_dataframe.py +++ b/2022strat_turb_toro/py/util_dataframe.py @@ -12,4 +12,4 @@ df = get_customized_dataframe(paths) -df["k_max*lambda"] = df["k_max"]* df["lambda"] +df["k_max*lambda"] = df["k_max"] * df["lambda"]