diff --git a/turbox/turbox.py b/turbox/turbox.py index ac8632a..a2cb4f8 100644 --- a/turbox/turbox.py +++ b/turbox/turbox.py @@ -110,8 +110,12 @@ def build_turbox_data(pl, redo=False, cs0=0.28834810480560674): df = {} df["snapshots"] = pl.nums.values() - df["n0"] = pl.study.get_nml("galbox_params/dens0").values() - df["turbinit"] = pl.study.get_nml("galbox_params/turb").values() + try: + df["n0"] = pl.study.get_nml("galbox_params/dens0").values() + df["turbinit"] = pl.study.get_nml("galbox_params/turb").values() + except KeyError: + df["n0"] = pl.study.get_nml("init_params/d_region").values() + df["turbinit"] = 0 df["solver"] = pl.study.get_nml("hydro_params/riemann").values() df["slope"] = pl.study.get_nml("hydro_params/slope_type").values() df["res"] = pl.study.get_nml("amr_params/levelmin").values() @@ -131,7 +135,7 @@ def build_turbox_data(pl, redo=False, cs0=0.28834810480560674): pl.study.avg_time_sigma("y", overwrite_dep=False) pl.study.avg_time_sigma("z", overwrite_dep=False) pl.study.time(overwrite=True) - + df["time"] = np.empty(len(pl.runs), dtype=list) time = pl.study.get_value("/series/time", unit=U.Myr) for run in pl.runs: @@ -145,10 +149,10 @@ def build_turbox_data(pl, redo=False, cs0=0.28834810480560674): for run in sigma_ax: sigma_ax[run] = sigma_ax[run].T[0] sigma1d.append(sigma_ax) - + sigma3d = {} for run in pl.runs: - sigma3d[run] = np.sum([sigma1d_i[run]**2 for sigma1d_i in sigma1d], axis=0) + sigma3d[run] = np.sum([sigma1d_i[run] ** 2 for sigma1d_i in sigma1d], axis=0) sigma3d[run] = list(map(np.sqrt, sigma3d[run])) df["sigma"] = np.zeros(len(pl.runs))