Skip to content
Snippets Groups Projects
Commit fb7a5498 authored by Pierre Augier's avatar Pierre Augier
Browse files

Update tuto_user.ipynb.

parent 15b218c6
No related branches found
No related tags found
No related merge requests found
......@@ -16,9 +16,6 @@
libraries (in contrast, the Python packages should automatically be
installed by the installer)!
Optional dependencies
---------------------
- optionally, mpi4py (which depends on a MPI implementation).
......
......@@ -510,7 +510,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.9"
"version": "2.7.8"
}
},
"nbformat": 4,
......
This diff is collapsed.
......@@ -202,9 +202,6 @@
E = dico_results['E']
Z = dico_results['Z']
PK_tot = dico_results['PK_tot']
PZ_tot = dico_results['PZ_tot']
epsK = dico_results['epsK']
epsK_hypo = dico_results['epsK_hypo']
epsK_tot = dico_results['epsK_tot']
......@@ -214,10 +211,10 @@
epsZ_tot = dico_results['epsZ_tot']
width_axe = 0.85
height_axe = 0.4
height_axe = 0.39
x_left_axe = 0.12
z_bottom_axe = 0.55
size_axe = [x_left_axe, z_bottom_axe,
width_axe, height_axe]
fig, ax1 = self.output.figure_axe(size_axe=size_axe)
......@@ -218,14 +215,13 @@
x_left_axe = 0.12
z_bottom_axe = 0.55
size_axe = [x_left_axe, z_bottom_axe,
width_axe, height_axe]
fig, ax1 = self.output.figure_axe(size_axe=size_axe)
ax1.set_xlabel('t')
ax1.set_ylabel('E(t)')
ax1.hold(True)
fig.suptitle('Energy and enstrophy')
ax1.set_ylabel('$E(t)$')
ax1.plot(t, E, 'k', linewidth=2)
z_bottom_axe = 0.08
size_axe[1] = z_bottom_axe
ax2 = fig.add_axes(size_axe)
......@@ -227,10 +223,9 @@
ax1.plot(t, E, 'k', linewidth=2)
z_bottom_axe = 0.08
size_axe[1] = z_bottom_axe
ax2 = fig.add_axes(size_axe)
ax2.set_xlabel('t')
ax2.set_ylabel('Z(t)')
ax2.hold(True)
ax2.set_ylabel('$Z(t)$')
ax2.set_xlabel('$t$')
ax2.plot(t, Z, 'k', linewidth=2)
......@@ -235,5 +230,5 @@
ax2.plot(t, Z, 'k', linewidth=2)
z_bottom_axe = 0.55
z_bottom_axe = 0.54
size_axe[1] = z_bottom_axe
fig, ax1 = self.output.figure_axe(size_axe=size_axe)
......@@ -238,5 +233,5 @@
size_axe[1] = z_bottom_axe
fig, ax1 = self.output.figure_axe(size_axe=size_axe)
ax1.set_xlabel('t')
ax1.set_ylabel('P_E(t), epsK(t)')
fig.suptitle('Dissipation of energy and enstrophy')
ax1.set_ylabel('$\epsilon_K(t)$')
ax1.hold(True)
......@@ -242,5 +237,5 @@
ax1.hold(True)
ax1.plot(t, PK_tot, 'c', linewidth=2)
ax1.plot(t, epsK, 'r', linewidth=2)
ax1.plot(t, epsK_hypo, 'g', linewidth=2)
ax1.plot(t, epsK_tot, 'k', linewidth=2)
......@@ -248,6 +243,6 @@
z_bottom_axe = 0.08
size_axe[1] = z_bottom_axe
ax2 = fig.add_axes(size_axe)
ax2.set_xlabel('t')
ax2.set_ylabel('P_Z(t), epsZ(t)')
ax2.set_xlabel('$t$')
ax2.set_ylabel('$\epsilon_Z(t)$')
ax2.hold(True)
......@@ -253,5 +248,4 @@
ax2.hold(True)
ax2.plot(t, PZ_tot, 'c', linewidth=2)
ax2.plot(t, epsZ, 'r', linewidth=2)
ax2.plot(t, epsZ_hypo, 'g', linewidth=2)
ax2.plot(t, epsZ_tot, 'k', linewidth=2)
......@@ -255,3 +249,11 @@
ax2.plot(t, epsZ, 'r', linewidth=2)
ax2.plot(t, epsZ_hypo, 'g', linewidth=2)
ax2.plot(t, epsZ_tot, 'k', linewidth=2)
if self.sim.params.FORCING:
PK_tot = dico_results['PK_tot']
PZ_tot = dico_results['PZ_tot']
ax1.plot(t, PK_tot, 'c', linewidth=2)
ax2.plot(t, PZ_tot, 'c', linewidth=2)
ax1.set_ylabel('P_E(t), epsK(t)')
ax2.set_ylabel('P_Z(t), epsZ(t)')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment