From ccfc0ecbf0b1b567c883de86042e9e192b3bdc9e Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Thu, 22 Sep 2016 12:25:57 +0100 Subject: [PATCH] Updated names of materials text files. --- docs/source/user_libs_austinman.rst | 10 +++++----- docs/source/user_libs_landmines.rst | 20 +++++++++---------- ...rials.txt => AustinManWoman_materials.txt} | 0 ...> AustinManWoman_materials_dispersive.txt} | 0 4 files changed, 15 insertions(+), 15 deletions(-) rename user_libs/AustinManWoman/{AustinManWoman_gprMax_materials.txt => AustinManWoman_materials.txt} (100%) rename user_libs/AustinManWoman/{AustinManWoman_gprMax_materials_dispersive.txt => AustinManWoman_materials_dispersive.txt} (100%) diff --git a/docs/source/user_libs_austinman.rst b/docs/source/user_libs_austinman.rst index b94f0dc9..52190c11 100644 --- a/docs/source/user_libs_austinman.rst +++ b/docs/source/user_libs_austinman.rst @@ -42,12 +42,12 @@ Package overview .. code-block:: none - AustinManWoman_gprMax_materials.txt - AustinManWoman_gprMax_materials_dispersive.txt + AustinManWoman_materials.txt + AustinManWoman_materials_dispersive.txt head_only_hdf5.py -* ``AustinManWoman_gprMax_materials.txt`` is a text file containing non-dispersive material properties at 900 MHz (http://niremf.ifac.cnr.it/tissprop/). -* ``AustinManWoman_gprMax_materials_dispersive.txt`` is a text file containing dispersive material properties using a 3-pole Debye model (http://dx.doi.org/10.1109/LMWC.2011.2180371). Note the main body tissues are described using a 3-pole Debye model, nbut ot all materials have a dispersive description. +* ``AustinManWoman_materials.txt`` is a text file containing non-dispersive material properties at 900 MHz (http://niremf.ifac.cnr.it/tissprop/). +* ``AustinManWoman_materials_dispersive.txt`` is a text file containing dispersive material properties using a 3-pole Debye model (http://dx.doi.org/10.1109/LMWC.2011.2180371). Note the main body tissues are described using a 3-pole Debye model, nbut ot all materials have a dispersive description. * ``head_only_hdf5.py`` is a script to assist with creating a model of only the head from a full body AustinMan/Woman model. How to use the models @@ -66,7 +66,7 @@ To insert a 2x2x2mm :math:`^3` AustinMan with the lower left corner 40mm from th .. code-block:: none - #geometry_objects_file: 0.04 0.04 0.04 ../user_libs/AustinManWoman/AustinMan_v2.3_2x2x2.h5 ../user_libs/AustinManWoman/AustinManWoman_gprMax_materials_dispersive.txt + #geometry_objects_file: 0.04 0.04 0.04 ../user_libs/AustinManWoman/AustinMan_v2.3_2x2x2.h5 ../user_libs/AustinManWoman/AustinManWoman_materials_dispersive.txt For further information on the ``#geometry_objects_file`` see the section on object contruction commands in the :ref:`Input commands section `. diff --git a/docs/source/user_libs_landmines.rst b/docs/source/user_libs_landmines.rst index 90f55887..ca51700f 100644 --- a/docs/source/user_libs_landmines.rst +++ b/docs/source/user_libs_landmines.rst @@ -30,22 +30,22 @@ Package overview .. code-block:: none can_1x1x1.h5 - can_gprMax_materials.txt + can_materials.txt PMA_1x1x1.h5 - PMA_gprMax_materials.txt + PMA_materials.txt PMN_1x1x1.h5 - PMN_gprMax_materials.txt + PMN_materials.txt TS50_1x1x1.h5 - TS50_gprMax_materials.txt + TS50_materials.txt * ``can_1x1x1.h5`` is a HDF5 file containing a description of the geometry of the metal can (false target) with a cubic spatial resolution of 1mm -* ``can_gprMax_materials.txt`` is a text file containing material properties associated with the metal can +* ``can_materials.txt`` is a text file containing material properties associated with the metal can * ``PMA_1x1x1.h5`` is a HDF5 file containing a description of the geometry of the PMA landmine with a cubic spatial resolution of 1mm -* ``PMA_gprMax_materials.txt`` is a text file containing material properties associated with the PMA landmine +* ``PMA_materials.txt`` is a text file containing material properties associated with the PMA landmine * ``PMN_1x1x1.h5`` is a HDF5 file containing a description of the geometry of the PMN landmine with a cubic spatial resolution of 1mm -* ``PMN_gprMax_materials.txt`` is a text file containing material properties associated with the PMN landmine +* ``PMN_materials.txt`` is a text file containing material properties associated with the PMN landmine * ``TS50_1x1x1.h5`` is a HDF5 file containing a description of the geometry of the TS-50 landmine with a cubic spatial resolution of 1mm -* ``TS50_gprMax_materials.txt`` is a text file containing material properties associated with the TS-50 landmine +* ``TS50_materials.txt`` is a text file containing material properties associated with the TS-50 landmine How to use the models ===================== @@ -63,7 +63,7 @@ The input file for inserting the PMN landmine, with the lower left corner 10mm f #domain: 0.136 0.176 0.070 #dx_dy_dz: 0.001 0.001 0.001 #time_window: 5e-9 - #geometry_objects_file: 0.010 0.010 0.010 ../user_libs/landmines/PMN_1x1x1.h5 ../user_libs/landmines/PMN_gprMax_materials.txt + #geometry_objects_file: 0.010 0.010 0.010 ../user_libs/landmines/PMN_1x1x1.h5 ../user_libs/landmines/PMN_materials.txt #geometry_view: 0 0 0 0.136 0.176 0.070 0.001 0.001 0.001 landmine_PMN_fs n For further information on the ``#geometry_objects_file`` see the section on object contruction commands in the :ref:`Input commands section `. @@ -76,4 +76,4 @@ For further information on the ``#geometry_objects_file`` see the section on obj .. figure:: images/user_libs/PMN.png :width: 600 px - FDTD geometry mesh showing the PMN landmine model. \ No newline at end of file + FDTD geometry mesh showing the PMN landmine model. diff --git a/user_libs/AustinManWoman/AustinManWoman_gprMax_materials.txt b/user_libs/AustinManWoman/AustinManWoman_materials.txt similarity index 100% rename from user_libs/AustinManWoman/AustinManWoman_gprMax_materials.txt rename to user_libs/AustinManWoman/AustinManWoman_materials.txt diff --git a/user_libs/AustinManWoman/AustinManWoman_gprMax_materials_dispersive.txt b/user_libs/AustinManWoman/AustinManWoman_materials_dispersive.txt similarity index 100% rename from user_libs/AustinManWoman/AustinManWoman_gprMax_materials_dispersive.txt rename to user_libs/AustinManWoman/AustinManWoman_materials_dispersive.txt