Corrected reading of Lorentz and Drude parameters.

docs/source/features.rst

@@ -16,7 +16,7 @@ The code has been completely re-written in Python/Cython. In the process a lot o
 * Scripting in the input file.
 * Built-in library of antenna models
 * Anisotropic material modelling.
-* Dispersive material modelling using multiple pole Debye, Lorenz or Drude formulations.
+* Dispersive material modelling using multiple pole Debye, Lorentz or Drude formulations.
 * Building heterogeneous objects using fractal distributions.
 * Building objects with rough surfaces.
 * Modelling soils with realistic dielectric and geometric properties.
@@ -28,7 +28,7 @@ New commands
 * ``#python`` and ``#end_python`` are used to define blocks of the input file where Python code will be executed. This allows the user to use scripting directly in the input file.
 * ``#material`` replaces ``#medium`` with a new syntax.
 * ``#add_dispersion_debye`` is used to add Debye dispersive properties to a ``#material``.
-* ``#add_dispersion_lorenz`` is used to add Lorenz dispersive properties to a ``#material``.
+* ``#add_dispersion_lorentz`` is used to add Lorentz dispersive properties to a ``#material``.
 * ``#add_dispersion_drude`` is used to add Drude dispersive properties to a ``#material``.
 * ``#soil_peplinski`` is a soil mixing model that can be used with ``#fractal_box`` to generate soil(s) with more realistic dielectric and geometric properties.
 * ``#cylindrical_sector`` (like a slice of pie shape) is a new object building command.
@@ -95,7 +95,7 @@ The input file has now been made scriptable by permitting blocks of Python code
 Dispersive media
 ----------------
 
-gprMax has always included the ability to represent dispersive materials using a single-pole Debye model. Many materials can be adequately represented using this approach for the typical frequency ranges associated with GPR. However, multi-pole Debye, Drude and Lorenz functions are often used to simulate the electric susceptibility of materials such as: water [PIE2009]_, human tissue [IRE2013]_, cold plasma [LI2013]_, gold [VIA2005]_, and soils [BER1998]_, [GIAK2012]_, [TEI1998]_. Electric susceptibility relates the polarization density to the electric field, and includes both the real and imaginary parts of the complex electric permittivity variation. In the new version of gprMax a recursive convolution based method is used to express dispersive properties as apparent current density sources [GIA2014]_. A major advantage of this implementation is that it creates an inclusive susceptibility function that holds, as special cases, Debye, Drude and Lorenz materials. For further details see the :ref:`material commands section <materials>`.
+gprMax has always included the ability to represent dispersive materials using a single-pole Debye model. Many materials can be adequately represented using this approach for the typical frequency ranges associated with GPR. However, multi-pole Debye, Drude and Lorentz functions are often used to simulate the electric susceptibility of materials such as: water [PIE2009]_, human tissue [IRE2013]_, cold plasma [LI2013]_, gold [VIA2005]_, and soils [BER1998]_, [GIAK2012]_, [TEI1998]_. Electric susceptibility relates the polarization density to the electric field, and includes both the real and imaginary parts of the complex electric permittivity variation. In the new version of gprMax a recursive convolution based method is used to express dispersive properties as apparent current density sources [GIA2014]_. A major advantage of this implementation is that it creates an inclusive susceptibility function that holds, as special cases, Debye, Drude and Lorentz materials. For further details see the :ref:`material commands section <materials>`.
 
 Realistic soils, heterogeneous objects and rough surfaces
 ---------------------------------------------------------

docs/source/input.rst

@@ -314,10 +314,10 @@ For example to create a model of water with a single Debye pole, :math:`\epsilon
     * Temporal values associated with pole frequencies and relaxation times should always be greater than the time step :math:`\Delta t` used in the model.
 
 
-#add_dispersion_lorenz:
+#add_dispersion_lorentz:
 -----------------------
 
-Allows you to add dispersive properties to an already defined ``#material`` based on a multiple pole Lorenz formulation (see :ref:`capabilities` section). For example, the susceptability function for a single-pole Lorentz material is given by:
+Allows you to add dispersive properties to an already defined ``#material`` based on a multiple pole Lorentz formulation (see :ref:`capabilities` section). For example, the susceptability function for a single-pole Lorentz material is given by:
 
 .. math::
 
@@ -335,21 +335,21 @@ The syntax of the command is:
 
 .. code-block:: none
 
-    #add_dispersion_lorenz: i1 f1 f2 f3 f4 f5 f6 ... str1
+    #add_dispersion_lorentz: i1 f1 f2 f3 f4 f5 f6 ... str1
 
-* ``i1`` is the number of Lorenz poles.
-* ``f1`` is the difference between the zero-frequency relative permittivity and the relative permittivity at infinite frequency, i.e. :math:`\Delta \epsilon_{rp1} = \epsilon_{rsp1} - \epsilon_{r \infty p1}` , for the first Lorenz pole.
-* ``f2`` is the frequency (Hertz), :math:`\omega_{p1}`, for the first Lorenz pole.
-* ``f3`` is the damping coefficient (Hertz), :math:`\delta_{p1}`, for the first Lorenz pole.
-* ``f4`` is the difference between the zero-frequency relative permittivity and the relative permittivity at infinite frequency, i.e. :math:`\Delta \epsilon_{rp2} = \epsilon_{rsp2} - \epsilon_{r \infty p2}` , for the second Lorenz pole.
-* ``f5`` is the frequency (Hertz), :math:`\omega_{p2}`, for the second Lorenz pole.
-* ``f6`` is the damping coefficient (Hertz), :math:`\delta_{p2}`, for the second Lorenz pole.
+* ``i1`` is the number of Lorentz poles.
+* ``f1`` is the difference between the zero-frequency relative permittivity and the relative permittivity at infinite frequency, i.e. :math:`\Delta \epsilon_{rp1} = \epsilon_{rsp1} - \epsilon_{r \infty p1}` , for the first Lorentz pole.
+* ``f2`` is the frequency (Hertz), :math:`\omega_{p1}`, for the first Lorentz pole.
+* ``f3`` is the damping coefficient (Hertz), :math:`\delta_{p1}`, for the first Lorentz pole.
+* ``f4`` is the difference between the zero-frequency relative permittivity and the relative permittivity at infinite frequency, i.e. :math:`\Delta \epsilon_{rp2} = \epsilon_{rsp2} - \epsilon_{r \infty p2}` , for the second Lorentz pole.
+* ``f5`` is the frequency (Hertz), :math:`\omega_{p2}`, for the second Lorentz pole.
+* ``f6`` is the damping coefficient (Hertz), :math:`\delta_{p2}`, for the second Lorentz pole.
 * ...
 * ``str1`` identifies the material to add the dispersive properties to.
 
 .. note::
 
-    * You can continue to add triplets of values for :math:`\Delta \epsilon_{rp}`, :math:`\omega_p` and :math:`\delta_p` for as many Lorenz poles as you have specified with ``i1``.
+    * You can continue to add triplets of values for :math:`\Delta \epsilon_{rp}`, :math:`\omega_p` and :math:`\delta_p` for as many Lorentz poles as you have specified with ``i1``.
     * The relative permittivity in the ``#material`` command should be given as the relative permittivity at infinite frequency, i.e. :math:`\epsilon_{r \infty}`.
     * Temporal values associated with pole frequencies and relaxation times should always be greater than the time step :math:`\Delta t` used in the model.