Updates to old tests

Author: kargapolov

t-step-test-3d.ipynb

@@ -13,7 +13,7 @@
     "import time\n",
     "\n",
     "from lcode2dPy.plasma3d.initialization import init_plasma\n",
-    "from lcode2dPy.push_solver_3d import PushAndSolver3d\n",
+    "from lcode2dPy.push_solvers.push_solver_3d import PushAndSolver3d\n",
     "\n",
     "from lcode2dPy.beam3d import beam\n",
     "from lcode2dPy.beam_generator.beam_generator import *\n",

t-step-test1-3d-gpu.ipynb

@@ -9,7 +9,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -19,16 +19,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
     "# Import required modules\n",
-    "from lcode2dPy.simulation.three_dimensional import Cartesian3dSimulation\n",
-    "from lcode2dPy.diagnostics.diagnostics_3d import (DiagnosticsFXi,\n",
-    "                                                  DiagnosticsColormaps,\n",
-    "                                                  DiagnosticsTransverse,\n",
-    "                                                  SaveRunState)\n",
+    "from lcode2dPy import *\n",
     "\n",
     "# Set some parameters of the config:\n",
     "config = {\n",
@@ -52,10 +48,10 @@
     "beam_parameters = {'current': 0.01 * (2*pi), 'particles_in_layer': 5000}\n",
     "\n",
     "# Set diagnostics\n",
-    "diag = [DiagnosticsFXi(f_xi='Ez', output_period=0, saving_xi_period=25),\n",
-    "        DiagnosticsTransverse(output_period=0, colormaps='ne', saving_xi_period=25),\n",
+    "diag = [DiagnosticsFXi(f_xi='Ez', output_period=0),\n",
+    "        DiagnosticsTransverse(output_period=0, colormaps='rho'),\n",
     "        DiagnosticsColormaps(output_period=0, colormaps='Ez',\n",
-    "                             xi_from=0, xi_to=-30, saving_xi_period=10),\n",
+    "                             xi_from=0, xi_to=-30),\n",
     "        SaveRunState(saving_period=0, save_beam=True, save_plasma=True)]"
    ]
   },
@@ -135,7 +131,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.10.4"
   },
   "orig_nbformat": 4
  },

t-step-test1-3d.ipynb

@@ -2,23 +2,21 @@
  "cells": [
   {
    "cell_type": "markdown",
+   "metadata": {},
    "source": [
     "### Test 1 for lcode 3d with a single time step and an alternative beam generator."
-   ],
-   "metadata": {}
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "# Import required modules\n",
     "from math import pi, inf\n",
     "\n",
-    "from lcode2dPy.alt_beam_generator.beam_generator import generate_beam\n",
-    "from lcode2dPy.simulation.three_dimensional import Cartesian3dSimulation\n",
-    "from lcode2dPy.diagnostics.diagnostics_3d import (DiagnosticsFXi,\n",
-    "                                                  DiagnosticsColormaps,\n",
-    "                                                  SaveRunState)\n",
+    "from lcode2dPy import *\n",
     "\n",
     "# Set some parameters of the config:\n",
     "config = {\n",
@@ -40,47 +38,47 @@
     "diag = [DiagnosticsFXi(f_xi='Ez, Ex', output_period=0),\n",
     "        DiagnosticsColormaps(output_period=0, colormaps='Ez'),\n",
     "        SaveRunState(saving_period=0, save_beam=True)]"
-   ],
-   "outputs": [],
-   "metadata": {}
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "# Create a beam\n",
     "\n",
     "beam_parameters = {'current': 0.01 * (2*pi), 'particles_in_layer': 2000}\n",
     "\n",
     "beam_particles = generate_beam(config=config, beam_parameters=beam_parameters)\n",
     "beam_particles.save('beamfile_1')"
-   ],
-   "outputs": [],
-   "metadata": {}
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "sim = Cartesian3dSimulation(config=config, diagnostics=diag)\n",
     "sim.load_beamfile('beamfile_1.npz')\n",
     "# sim.load_plasmastate('plasmastate.npz')"
-   ],
-   "outputs": [],
-   "metadata": {}
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "sim.step()"
-   ],
-   "outputs": [],
-   "metadata": {}
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "# Should work correctly. Compare results with the test 1 result with a rigid beam:\n",
     "# xi         Ez_00\n",
@@ -110,16 +108,14 @@
     "# xi=+0.4600 -6.0912e-04\n",
     "# xi=+0.4800 -6.8855e-04\n",
     "# xi=+0.5000 -7.7437e-04"
-   ],
-   "outputs": [],
-   "metadata": {}
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "source": [],
+   "metadata": {},
    "outputs": [],
-   "metadata": {}
+   "source": []
   }
  ],
  "metadata": {
@@ -148,4 +144,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}