diff --git a/docs/inputs/level0/lennard-jones-fluid/improved-input/plot_mixing.ipynb b/docs/inputs/level0/lennard-jones-fluid/improved-input/plot_mixing.ipynb index dda943c4..28f7b23b 100644 --- a/docs/inputs/level0/lennard-jones-fluid/improved-input/plot_mixing.ipynb +++ b/docs/inputs/level0/lennard-jones-fluid/improved-input/plot_mixing.ipynb @@ -31,7 +31,7 @@ "git_path = git_repo.git.rev_parse(\"--show-toplevel\")\n", "sys.path.append(git_path+\"/docs/inputs/shared-pyplot-files/\")\n", "from pyplot_parameters import colors, complete_panel, save_figure, set_boundaries, \\\n", - " add_subplotlabels # set_boundaries\n", + " add_subplotlabels, import_ave_time # set_boundaries\n", "path_in_folder = current_path[len(git_path)+1:]\n", "level = path_in_folder.split(\"/\")[2][-1]\n", "tutorial_name = path_in_folder.split(\"/\")[3]\n", @@ -42,29 +42,7 @@ }, { "cell_type": "code", - "execution_count": 6, - "metadata": {}, - "outputs": [], - "source": [ - "def import_ave_time(filename):\n", - " assert filename[:6] == \"output\"\n", - " if os.path.exists(filename):\n", - " data = np.loadtxt(filename)\n", - " try:\n", - " time, data = data.T\n", - " except:\n", - " time, data, _ = data.T\n", - " if os.path.exists(\"data_plot/\") is False:\n", - " os.mkdir(\"data_plot/\")\n", - " np.savetxt(\"data_plot/\"+filename[7:], np.vstack([time, data]).T)\n", - " else:\n", - " time, data = np.loadtxt(\"data_plot/\"+filename[7:]).T\n", - " return time, data" - ] - }, - { - "cell_type": "code", - "execution_count": 9, + "execution_count": 3, "metadata": {}, "outputs": [], "source": [ @@ -77,7 +55,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 4, "metadata": {}, "outputs": [ { diff --git a/docs/inputs/shared-pyplot-files/pyplot_parameters.py b/docs/inputs/shared-pyplot-files/pyplot_parameters.py index 103a1b5c..9ad2c122 100644 --- a/docs/inputs/shared-pyplot-files/pyplot_parameters.py +++ b/docs/inputs/shared-pyplot-files/pyplot_parameters.py @@ -1,4 +1,5 @@ import os +import numpy as np import matplotlib.pyplot as plt import matplotlib.transforms as mtransforms from matplotlib.ticker import AutoMinorLocator @@ -136,4 +137,19 @@ def set_boundaries(plt, x_boundaries=None, x_ticks=None, y_boundaries=None, y_ti if y_boundaries is not None: plt.ylim(y_boundaries) if y_ticks is not None: - plt.yticks(y_ticks) \ No newline at end of file + plt.yticks(y_ticks) + +def import_ave_time(filename): + assert filename[:6] == "output" + if os.path.exists(filename): + data = np.loadtxt(filename) + try: + time, data = data.T + except: + time, data, _ = data.T + if os.path.exists("data_plot/") is False: + os.mkdir("data_plot/") + np.savetxt("data_plot/"+filename[7:], np.vstack([time, data]).T) + else: + time, data = np.loadtxt("data_plot/"+filename[7:]).T + return time, data \ No newline at end of file