From 36c0fe2490d48cd92de324fa621fb87ffa2613f8 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Fri, 13 Nov 2015 15:10:15 +0000 Subject: [PATCH] Corrected units for magnetic loss (from S/m to Ohms/m). --- docs/source/input.rst | 2 +- gprMax/gprMax.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/input.rst b/docs/source/input.rst index 8e0c56a4..6deab888 100644 --- a/docs/source/input.rst +++ b/docs/source/input.rst @@ -264,7 +264,7 @@ Allows you to introduce a material into the model described by a set of constitu * ``f1`` is the relative permittivity, :math:`\epsilon_r` * ``f2`` is the conductivity (Siemens/metre), :math:`\sigma` * ``f3`` is the relative permeability, :math:`\mu_r` -* ``f4`` is the magnetic conductivity, :math:`\sigma_*` +* ``f4`` is the magnetic loss (Ohms/metre), :math:`\sigma_*` * ``str1`` is an identifier for the material. For example ``#material: 3 0.01 1 0 my_sand`` creates a material called ``my_sand`` which has a relative permittivity (frequency independent) of :math:`\epsilon_r = 3`, a conductivity of :math:`\sigma = 0.01` S/m, and is non-magnetic, i.e. :math:`\mu_r = 1` and :math:`\sigma_* = 0` diff --git a/gprMax/gprMax.py b/gprMax/gprMax.py index a2761361..bd49624a 100644 --- a/gprMax/gprMax.py +++ b/gprMax/gprMax.py @@ -258,7 +258,7 @@ def run_model(args, modelrun, numbermodelruns, inputfile, inputdirectory): dielectricsmoothing = 'dielectric smoothing permitted.' else: dielectricsmoothing = 'dielectric smoothing not permitted.' - print('{:3}\t{:12}\tepsr={:4.2f}, sig={:.3e} S/m; mur={:4.2f}, sig*={:.3e} S/m; '.format(material.numID, material.ID, material.er, material.se, material.mr, material.sm) + tmp + dielectricsmoothing) + print('{:3}\t{:12}\tepsr={:4.2f}, sig={:.3e} S/m; mur={:4.2f}, sig*={:.3e} Ohms/m; '.format(material.numID, material.ID, material.er, material.se, material.mr, material.sm) + tmp + dielectricsmoothing) # Write files for any geometry views if G.geometryviews: