diff --git a/docs/source/user_libs_antennas.rst b/docs/source/user_libs_antennas.rst
index 4f49a34d..f93a857c 100644
--- a/docs/source/user_libs_antennas.rst
+++ b/docs/source/user_libs_antennas.rst
@@ -7,24 +7,29 @@ GPR antenna models
Information
===========
-**Author/Contact**: Craig Warren (Craig.Warren@ed.ac.uk), University of Edinburgh
+The module features models of antennas similar to commercial GPR antennas. The following antenna models are included:
+
+============ ============ ============= ===================== ============================================================================================= ================
+Manufacturer Model Dimensions Spatial resolution(s) Author/Contact Attribution/Cite
+============ ============ ============= ===================== ============================================================================================= ================
+GSSI 1.5GHz (Model 5100) 170x108x45mm 1mm and 2mm Craig Warren (craig.warren@northumbria.ac.uk), Northumbria University, UK 1
+MALA 1.2GHz 184x109x46mm 1mm and 2mm Craig Warren (craig.warren@northumbria.ac.uk), Northumbria University, UK 1
+GSSI 400MHz 300x300x170mm 1mm Sam Stadler (Sam.Stadler@liag-hannover.de), Leibniz Institute for Applied Geophysics, Germany 2
+============ ============ ============= ===================== ============================================================================================= ================
**License**: `Creative Commons Attribution-ShareAlike 4.0 International License `_
-**Attribution/cite**: Warren, C., Giannopoulos, A. (2011). Creating finite-difference time-domain models of commercial ground-penetrating radar antennas using Taguchi's optimization method. *Geophysics*, 76(2), G37-G47. (http://dx.doi.org/10.1190/1.3548506)
-
-The module currently features models of antennas similar to commercial GPR antennas:
-
-* `Geophysical Survey Systems, Inc. (GSSI) `_ 1.5 GHz (Model 5100) antenna. The dimensions of the GSSI 1.5GHz antenna model are: 170x108x45mm.
-* `MALA Geoscience `_ 1.2 GHz antenna. The dimensions of the MALA 1.2GHz antenna model are: 184x109x46mm.
-
-A description of how the models were created can be found at the reference given by the aforementioned attribution/cite.
+**Attributions/citations**
+1. Warren, C., Giannopoulos, A. (2011). Creating finite-difference time-domain models of commercial ground-penetrating radar antennas using Taguchi's optimization method. *Geophysics*, 76(2), G37-G47. (http://dx.doi.org/10.1190/1.3548506)
+2. Stadler, S. ()
Module overview
===============
-* ``antennas.py`` is a module containing the descriptions of the antennas.
+* ``GSSI.py`` is a module containing models of antennas similar to those manufactured by `Geophysical Survey Systems, Inc. (GSSI) `_.
+* ``MALA.py`` is a module containing models of antennas similar to those manufactured by `MALA Geoscience `_.
+Descriptions of how the models were created can be found in the aforementioned attributions.
How to use the module
=====================
@@ -39,7 +44,7 @@ To include an antenna model similar to a GSSI 1.5 GHz antenna at a location 0.12
.. code-block:: none
#python:
- from user_libs.antennas import antenna_like_GSSI_1500
+ from user_libs.antennas.GSSI import antenna_like_GSSI_1500
antenna_like_GSSI_1500(0.125, 0.094, 0.100, resolution=0.002)
#end_python:
diff --git a/user_libs/antennas/GSSI.py b/user_libs/antennas/GSSI.py
new file mode 100644
index 00000000..e33581c0
--- /dev/null
+++ b/user_libs/antennas/GSSI.py
@@ -0,0 +1,180 @@
+# Copyright (C) 2015-2018, Craig Warren
+#
+# This module is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
+# To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
+#
+# Please use the attribution at http://dx.doi.org/10.1190/1.3548506
+
+import os
+
+from gprMax.exceptions import CmdInputError
+from gprMax.input_cmd_funcs import *
+
+userlibdir = os.path.dirname(os.path.abspath(__file__))
+
+
+def antenna_like_GSSI_1500(x, y, z, resolution=0.001, rotate90=False, **kwargs):
+ """Inserts a description of an antenna similar to the GSSI 1.5GHz antenna. Can be used with 1mm (default) or 2mm spatial resolution. The external dimensions of the antenna are 170x108x45mm. One output point is defined between the arms of the receiever bowtie. The bowties are aligned with the y axis so the output is the y component of the electric field (x component if the antenna is rotated 90 degrees).
+
+ Args:
+ x, y, z (float): Coordinates of a location in the model to insert the antenna. Coordinates are relative to the geometric centre of the antenna in the x-y plane and the bottom of the antenna skid in the z direction.
+ resolution (float): Spatial resolution for the antenna model.
+ rotate90 (bool): Rotate model 90 degrees CCW in xy plane.
+ kwargs (dict): Optional variables, e.g. can be fed from an optimisation process.
+ """
+
+ # Antenna geometry properties
+ casesize = (0.170, 0.108, 0.043)
+ casethickness = 0.002
+ shieldthickness = 0.002
+ foamsurroundthickness = 0.003
+ pcbthickness = 0.002
+ skidthickness = 0.004
+ bowtiebase = 0.022
+ bowtieheight = 0.014
+ patchheight = 0.015
+
+ # Set origin for rotation to geometric centre of antenna in x-y plane if required, and set output component for receiver
+ if rotate90:
+ rotate90origin = (x, y)
+ output = 'Ex'
+ else:
+ rotate90origin = ()
+ output = 'Ey'
+
+ # Unknown properties
+ if kwargs:
+ excitationfreq = kwargs['excitationfreq']
+ sourceresistance = kwargs['sourceresistance']
+ absorberEr = kwargs['absorberEr']
+ absorbersig = kwargs['absorbersig']
+ rxres = 50
+ else:
+ # excitationfreq = 1.5e9 # GHz
+ # sourceresistance = 50 # Ohms
+ # absorberEr = 1.7
+ # absorbersig = 0.59
+
+ # Values from http://hdl.handle.net/1842/4074
+ excitationfreq = 1.71e9
+ # sourceresistance = 4
+ sourceresistance = 230 # Correction for old (< 123) GprMax3D bug
+ # absorberEr = 1.58
+ # absorbersig = 0.428
+ rxres = 925 # Resistance at Rx bowtie
+
+ x = x - (casesize[0] / 2)
+ y = y - (casesize[1] / 2)
+
+ # Coordinates of source excitation point in antenna
+ tx = x + 0.114, y + 0.053, z + skidthickness
+
+ if resolution == 0.001:
+ dx = 0.001
+ dy = 0.001
+ dz = 0.001
+ elif resolution == 0.002:
+ dx = 0.002
+ dy = 0.002
+ dz = 0.002
+ foamsurroundthickness = 0.002
+ patchheight = 0.016
+ tx = x + 0.114, y + 0.052, z + skidthickness
+ else:
+ raise CmdInputError('This antenna module can only be used with a spatial discretisation of 1mm or 2mm')
+
+ # Material definitions
+ # material(absorberEr, absorbersig, 1, 0, 'absorber')
+ material(1, 0, 1, 0, 'absorber')
+ print('#add_dispersion_debye: 3 3.7733 1.00723e-11 3.14418 1.55686e-10 20.2441 3.44129e-10 absorber') # Eccosorb LS22 3-pole Debye model (https://bitbucket.org/uoyaeg/aegboxts/wiki/Home)
+ material(3, 0, 1, 0, 'pcb')
+ material(2.35, 0, 1, 0, 'hdpe')
+ material(3, (1 / rxres) * (dy / (dx * dz)), 1, 0, 'rxres')
+
+ # Antenna geometry
+ # Plastic case
+ box(x, y, z + skidthickness, x + casesize[0], y + casesize[1], z + skidthickness + casesize[2], 'hdpe', rotate90origin=rotate90origin)
+ box(x + casethickness, y + casethickness, z + skidthickness, x + casesize[0] - casethickness, y + casesize[1] - casethickness, z + skidthickness + casesize[2] - casethickness, 'free_space', rotate90origin=rotate90origin)
+
+ # Metallic enclosure
+ box(x + 0.025, y + casethickness, z + skidthickness, x + casesize[0] - 0.025, y + casesize[1] - casethickness, z + skidthickness + 0.027, 'pec', rotate90origin=rotate90origin)
+
+ # Absorber material, and foam (modelled as PCB material) around edge of absorber
+ box(x + 0.025 + shieldthickness, y + casethickness + shieldthickness, z + skidthickness, x + 0.025 + shieldthickness + 0.057, y + casesize[1] - casethickness - shieldthickness, z + skidthickness + 0.027 - shieldthickness - 0.001, 'pcb', rotate90origin=rotate90origin)
+ box(x + 0.025 + shieldthickness + foamsurroundthickness, y + casethickness + shieldthickness + foamsurroundthickness, z + skidthickness, x + 0.025 + shieldthickness + 0.057 - foamsurroundthickness, y + casesize[1] - casethickness - shieldthickness - foamsurroundthickness, z + skidthickness + 0.027 - shieldthickness, 'absorber', rotate90origin=rotate90origin)
+ box(x + 0.086, y + casethickness + shieldthickness, z + skidthickness, x + 0.086 + 0.057, y + casesize[1] - casethickness - shieldthickness, z + skidthickness + 0.027 - shieldthickness - 0.001, 'pcb', rotate90origin=rotate90origin)
+ box(x + 0.086 + foamsurroundthickness, y + casethickness + shieldthickness + foamsurroundthickness, z + skidthickness, x + 0.086 + 0.057 - foamsurroundthickness, y + casesize[1] - casethickness - shieldthickness - foamsurroundthickness, z + skidthickness + 0.027 - shieldthickness, 'absorber', rotate90origin=rotate90origin)
+
+ # PCB
+ box(x + 0.025 + shieldthickness + foamsurroundthickness, y + casethickness + shieldthickness + foamsurroundthickness, z + skidthickness, x + 0.086 - shieldthickness - foamsurroundthickness, y + casesize[1] - casethickness - shieldthickness - foamsurroundthickness, z + skidthickness + pcbthickness, 'pcb', rotate90origin=rotate90origin)
+ box(x + 0.086 + foamsurroundthickness, y + casethickness + shieldthickness + foamsurroundthickness, z + skidthickness, x + 0.086 + 0.057 - foamsurroundthickness, y + casesize[1] - casethickness - shieldthickness - foamsurroundthickness, z + skidthickness + pcbthickness, 'pcb', rotate90origin=rotate90origin)
+
+ # PCB components
+ if resolution == 0.001:
+ # Rx & Tx bowties
+ a = 0
+ b = 0
+ while b < 13:
+ plate(x + 0.045 + a * dx, y + 0.039 + b * dx, z + skidthickness, x + 0.065 - a * dx, y + 0.039 + b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.045 + a * dx, y + 0.067 - b * dx, z + skidthickness, x + 0.065 - a * dx, y + 0.067 - b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.104 + a * dx, y + 0.039 + b * dx, z + skidthickness, x + 0.124 - a * dx, y + 0.039 + b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.104 + a * dx, y + 0.067 - b * dx, z + skidthickness, x + 0.124 - a * dx, y + 0.067 - b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ b += 1
+ if a == 2 or a == 4 or a == 7:
+ plate(x + 0.045 + a * dx, y + 0.039 + b * dx, z + skidthickness, x + 0.065 - a * dx, y + 0.039 + b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.045 + a * dx, y + 0.067 - b * dx, z + skidthickness, x + 0.065 - a * dx, y + 0.067 - b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.104 + a * dx, y + 0.039 + b * dx, z + skidthickness, x + 0.124 - a * dx, y + 0.039 + b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.104 + a * dx, y + 0.067 - b * dx, z + skidthickness, x + 0.124 - a * dx, y + 0.067 - b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ b += 1
+ a += 1
+ # Rx extension section (upper y)
+ plate(x + 0.044, y + 0.068, z + skidthickness, x + 0.044 + bowtiebase, y + 0.068 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ # Tx extension section (upper y)
+ plate(x + 0.103, y + 0.068, z + skidthickness, x + 0.103 + bowtiebase, y + 0.068 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+
+ # Edges that represent wire between bowtie halves in 1mm model
+ edge(tx[0] - 0.059, tx[1] - dy, tx[2], tx[0] - 0.059, tx[1], tx[2], 'pec', rotate90origin=rotate90origin)
+ edge(tx[0] - 0.059, tx[1] + dy, tx[2], tx[0] - 0.059, tx[1] + 0.002, tx[2], 'pec', rotate90origin=rotate90origin)
+ edge(tx[0], tx[1] - dy, tx[2], tx[0], tx[1], tx[2], 'pec', rotate90origin=rotate90origin)
+ edge(tx[0], tx[1] + dz, tx[2], tx[0], tx[1] + 0.002, tx[2], 'pec', rotate90origin=rotate90origin)
+
+ elif resolution == 0.002:
+ # Rx & Tx bowties
+ for a in range(0, 6):
+ plate(x + 0.044 + a * dx, y + 0.040 + a * dx, z + skidthickness, x + 0.066 - a * dx, y + 0.040 + a * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.044 + a * dx, y + 0.064 - a * dx, z + skidthickness, x + 0.066 - a * dx, y + 0.064 - a * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.103 + a * dx, y + 0.040 + a * dx, z + skidthickness, x + 0.125 - a * dx, y + 0.040 + a * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ plate(x + 0.103 + a * dx, y + 0.064 - a * dx, z + skidthickness, x + 0.125 - a * dx, y + 0.064 - a * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ # Rx extension section (upper y)
+ plate(x + 0.044, y + 0.066, z + skidthickness, x + 0.044 + bowtiebase, y + 0.066 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ # Tx extension section (upper y)
+ plate(x + 0.103, y + 0.066, z + skidthickness, x + 0.103 + bowtiebase, y + 0.066 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+
+ # Rx extension section (lower y)
+ plate(x + 0.044, y + 0.024, z + skidthickness, x + 0.044 + bowtiebase, y + 0.024 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+ # Tx extension section (lower y)
+ plate(x + 0.103, y + 0.024, z + skidthickness, x + 0.103 + bowtiebase, y + 0.024 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
+
+ # Skid
+ box(x, y, z, x + casesize[0], y + casesize[1], z + skidthickness, 'hdpe', rotate90origin=rotate90origin)
+
+ # Geometry views
+ # geometry_view(x - dx, y - dy, z - dz, x + casesize[0] + dx, y + casesize[1] + dy, z + skidthickness + casesize[2] + dz, dx, dy, dz, 'antenna_like_GSSI_1500')
+ # geometry_view(x, y, z, x + casesize[0], y + casesize[1], z + 0.010, dx, dy, dz, 'antenna_like_GSSI_1500_pcb', type='f')
+
+ # Excitation - custom pulse
+ # print('#excitation_file: {}'.format(os.path.join(userlibdir, 'GSSIgausspulse1.txt')))
+ # print('#transmission_line: y {} {} {} {} GSSIgausspulse1'.format(tx[0], tx[1], tx[2], sourceresistance))
+
+ # Excitation - Gaussian pulse
+ print('#waveform: gaussian 1 {} myGaussian'.format(excitationfreq))
+ # transmission_line('y', tx[0], tx[1], tx[2], sourceresistance, 'myGaussian', dxdy=(resolution, resolution), rotate90origin=rotate90origin)
+ voltage_source('y', tx[0], tx[1], tx[2], sourceresistance, 'myGaussian', dxdy=(resolution, resolution), rotate90origin=rotate90origin)
+
+ # Output point - receiver bowtie
+ if resolution == 0.001:
+ edge(tx[0] - 0.059, tx[1], tx[2], tx[0] - 0.059, tx[1] + dy, tx[2], 'rxres', rotate90origin=rotate90origin)
+ rx(tx[0] - 0.059, tx[1], tx[2], identifier='rxbowtie', to_save=[output], polarisation='y', dxdy=(resolution, resolution), rotate90origin=rotate90origin)
+ elif resolution == 0.002:
+ edge(tx[0] - 0.060, tx[1], tx[2], tx[0] - 0.060, tx[1] + dy, tx[2], 'rxres', rotate90origin=rotate90origin)
+ rx(tx[0] - 0.060, tx[1], tx[2], identifier='rxbowtie', to_save=[output], polarisation='y', dxdy=(resolution, resolution), rotate90origin=rotate90origin)
diff --git a/user_libs/antennas.py b/user_libs/antennas/MALA.py
similarity index 64%
rename from user_libs/antennas.py
rename to user_libs/antennas/MALA.py
index 2e2fc766..57624b14 100644
--- a/user_libs/antennas.py
+++ b/user_libs/antennas/MALA.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017, Craig Warren
+# Copyright (C) 2015-2018, Craig Warren
#
# This module is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
# To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
@@ -13,172 +13,6 @@ from gprMax.input_cmd_funcs import *
userlibdir = os.path.dirname(os.path.abspath(__file__))
-def antenna_like_GSSI_1500(x, y, z, resolution=0.001, rotate90=False, **kwargs):
- """Inserts a description of an antenna similar to the GSSI 1.5GHz antenna. Can be used with 1mm (default) or 2mm spatial resolution. The external dimensions of the antenna are 170x108x45mm. One output point is defined between the arms of the receiever bowtie. The bowties are aligned with the y axis so the output is the y component of the electric field (x component if the antenna is rotated 90 degrees).
-
- Args:
- x, y, z (float): Coordinates of a location in the model to insert the antenna. Coordinates are relative to the geometric centre of the antenna in the x-y plane and the bottom of the antenna skid in the z direction.
- resolution (float): Spatial resolution for the antenna model.
- rotate90 (bool): Rotate model 90 degrees CCW in xy plane.
- kwargs (dict): Optional variables, e.g. can be fed from an optimisation process.
- """
-
- # Antenna geometry properties
- casesize = (0.170, 0.108, 0.043)
- casethickness = 0.002
- shieldthickness = 0.002
- foamsurroundthickness = 0.003
- pcbthickness = 0.002
- skidthickness = 0.004
- bowtiebase = 0.022
- bowtieheight = 0.014
- patchheight = 0.015
-
- # Set origin for rotation to geometric centre of antenna in x-y plane if required, and set output component for receiver
- if rotate90:
- rotate90origin = (x, y)
- output = 'Ex'
- else:
- rotate90origin = ()
- output = 'Ey'
-
- # Unknown properties
- if kwargs:
- excitationfreq = kwargs['excitationfreq']
- sourceresistance = kwargs['sourceresistance']
- absorberEr = kwargs['absorberEr']
- absorbersig = kwargs['absorbersig']
- rxres = 50
- else:
- # excitationfreq = 1.5e9 # GHz
- # sourceresistance = 50 # Ohms
- # absorberEr = 1.7
- # absorbersig = 0.59
-
- # Values from http://hdl.handle.net/1842/4074
- excitationfreq = 1.71e9
- # sourceresistance = 4
- sourceresistance = 230 # Correction for old (< 123) GprMax3D bug
- absorberEr = 1.58
- absorbersig = 0.428
- rxres = 925 # Resistance at Rx bowtie
-
- x = x - (casesize[0] / 2)
- y = y - (casesize[1] / 2)
-
- # Coordinates of source excitation point in antenna
- tx = x + 0.114, y + 0.053, z + skidthickness
-
- if resolution == 0.001:
- dx = 0.001
- dy = 0.001
- dz = 0.001
- elif resolution == 0.002:
- dx = 0.002
- dy = 0.002
- dz = 0.002
- foamsurroundthickness = 0.002
- patchheight = 0.016
- tx = x + 0.114, y + 0.052, z + skidthickness
- else:
- raise CmdInputError('This antenna module can only be used with a spatial discretisation of 1mm or 2mm')
-
- # Material definitions
- material(absorberEr, absorbersig, 1, 0, 'absorber')
- # material(1, 0, 1, 0, 'absorber')
- # print('#add_dispersion_debye: 3 3.7733 1.00723e-11 3.14418 1.55686e-10 20.2441 3.44129e-10 absorber') # Eccosorb LS22 3-pole Debye model (https://bitbucket.org/uoyaeg/aegboxts/wiki/Home)
- material(3, 0, 1, 0, 'pcb')
- material(2.35, 0, 1, 0, 'hdpe')
- material(3, (1 / rxres) * (dy / (dx * dz)), 1, 0, 'rxres')
-
- # Antenna geometry
- # Plastic case
- box(x, y, z + skidthickness, x + casesize[0], y + casesize[1], z + skidthickness + casesize[2], 'hdpe', rotate90origin=rotate90origin)
- box(x + casethickness, y + casethickness, z + skidthickness, x + casesize[0] - casethickness, y + casesize[1] - casethickness, z + skidthickness + casesize[2] - casethickness, 'free_space', rotate90origin=rotate90origin)
-
- # Metallic enclosure
- box(x + 0.025, y + casethickness, z + skidthickness, x + casesize[0] - 0.025, y + casesize[1] - casethickness, z + skidthickness + 0.027, 'pec', rotate90origin=rotate90origin)
-
- # Absorber material, and foam (modelled as PCB material) around edge of absorber
- box(x + 0.025 + shieldthickness, y + casethickness + shieldthickness, z + skidthickness, x + 0.025 + shieldthickness + 0.057, y + casesize[1] - casethickness - shieldthickness, z + skidthickness + 0.027 - shieldthickness - 0.001, 'pcb', rotate90origin=rotate90origin)
- box(x + 0.025 + shieldthickness + foamsurroundthickness, y + casethickness + shieldthickness + foamsurroundthickness, z + skidthickness, x + 0.025 + shieldthickness + 0.057 - foamsurroundthickness, y + casesize[1] - casethickness - shieldthickness - foamsurroundthickness, z + skidthickness + 0.027 - shieldthickness, 'absorber', rotate90origin=rotate90origin)
- box(x + 0.086, y + casethickness + shieldthickness, z + skidthickness, x + 0.086 + 0.057, y + casesize[1] - casethickness - shieldthickness, z + skidthickness + 0.027 - shieldthickness - 0.001, 'pcb', rotate90origin=rotate90origin)
- box(x + 0.086 + foamsurroundthickness, y + casethickness + shieldthickness + foamsurroundthickness, z + skidthickness, x + 0.086 + 0.057 - foamsurroundthickness, y + casesize[1] - casethickness - shieldthickness - foamsurroundthickness, z + skidthickness + 0.027 - shieldthickness, 'absorber', rotate90origin=rotate90origin)
-
- # PCB
- box(x + 0.025 + shieldthickness + foamsurroundthickness, y + casethickness + shieldthickness + foamsurroundthickness, z + skidthickness, x + 0.086 - shieldthickness - foamsurroundthickness, y + casesize[1] - casethickness - shieldthickness - foamsurroundthickness, z + skidthickness + pcbthickness, 'pcb', rotate90origin=rotate90origin)
- box(x + 0.086 + foamsurroundthickness, y + casethickness + shieldthickness + foamsurroundthickness, z + skidthickness, x + 0.086 + 0.057 - foamsurroundthickness, y + casesize[1] - casethickness - shieldthickness - foamsurroundthickness, z + skidthickness + pcbthickness, 'pcb', rotate90origin=rotate90origin)
-
- # PCB components
- if resolution == 0.001:
- # Rx & Tx bowties
- a = 0
- b = 0
- while b < 13:
- plate(x + 0.045 + a * dx, y + 0.039 + b * dx, z + skidthickness, x + 0.065 - a * dx, y + 0.039 + b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.045 + a * dx, y + 0.067 - b * dx, z + skidthickness, x + 0.065 - a * dx, y + 0.067 - b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.104 + a * dx, y + 0.039 + b * dx, z + skidthickness, x + 0.124 - a * dx, y + 0.039 + b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.104 + a * dx, y + 0.067 - b * dx, z + skidthickness, x + 0.124 - a * dx, y + 0.067 - b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- b += 1
- if a == 2 or a == 4 or a == 7:
- plate(x + 0.045 + a * dx, y + 0.039 + b * dx, z + skidthickness, x + 0.065 - a * dx, y + 0.039 + b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.045 + a * dx, y + 0.067 - b * dx, z + skidthickness, x + 0.065 - a * dx, y + 0.067 - b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.104 + a * dx, y + 0.039 + b * dx, z + skidthickness, x + 0.124 - a * dx, y + 0.039 + b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.104 + a * dx, y + 0.067 - b * dx, z + skidthickness, x + 0.124 - a * dx, y + 0.067 - b * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- b += 1
- a += 1
- # Rx extension section (upper y)
- plate(x + 0.044, y + 0.068, z + skidthickness, x + 0.044 + bowtiebase, y + 0.068 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- # Tx extension section (upper y)
- plate(x + 0.103, y + 0.068, z + skidthickness, x + 0.103 + bowtiebase, y + 0.068 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
-
- # Edges that represent wire between bowtie halves in 1mm model
- edge(tx[0] - 0.059, tx[1] - dy, tx[2], tx[0] - 0.059, tx[1], tx[2], 'pec', rotate90origin=rotate90origin)
- edge(tx[0] - 0.059, tx[1] + dy, tx[2], tx[0] - 0.059, tx[1] + 0.002, tx[2], 'pec', rotate90origin=rotate90origin)
- edge(tx[0], tx[1] - dy, tx[2], tx[0], tx[1], tx[2], 'pec', rotate90origin=rotate90origin)
- edge(tx[0], tx[1] + dz, tx[2], tx[0], tx[1] + 0.002, tx[2], 'pec', rotate90origin=rotate90origin)
-
- elif resolution == 0.002:
- # Rx & Tx bowties
- for a in range(0, 6):
- plate(x + 0.044 + a * dx, y + 0.040 + a * dx, z + skidthickness, x + 0.066 - a * dx, y + 0.040 + a * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.044 + a * dx, y + 0.064 - a * dx, z + skidthickness, x + 0.066 - a * dx, y + 0.064 - a * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.103 + a * dx, y + 0.040 + a * dx, z + skidthickness, x + 0.125 - a * dx, y + 0.040 + a * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- plate(x + 0.103 + a * dx, y + 0.064 - a * dx, z + skidthickness, x + 0.125 - a * dx, y + 0.064 - a * dx + dy, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- # Rx extension section (upper y)
- plate(x + 0.044, y + 0.066, z + skidthickness, x + 0.044 + bowtiebase, y + 0.066 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- # Tx extension section (upper y)
- plate(x + 0.103, y + 0.066, z + skidthickness, x + 0.103 + bowtiebase, y + 0.066 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
-
- # Rx extension section (lower y)
- plate(x + 0.044, y + 0.024, z + skidthickness, x + 0.044 + bowtiebase, y + 0.024 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
- # Tx extension section (lower y)
- plate(x + 0.103, y + 0.024, z + skidthickness, x + 0.103 + bowtiebase, y + 0.024 + patchheight, z + skidthickness, 'pec', rotate90origin=rotate90origin)
-
- # Skid
- box(x, y, z, x + casesize[0], y + casesize[1], z + skidthickness, 'hdpe', rotate90origin=rotate90origin)
-
- # Geometry views
- # geometry_view(x - dx, y - dy, z - dz, x + casesize[0] + dx, y + casesize[1] + dy, z + skidthickness + casesize[2] + dz, dx, dy, dz, 'antenna_like_GSSI_1500')
- # geometry_view(x, y, z, x + casesize[0], y + casesize[1], z + 0.010, dx, dy, dz, 'antenna_like_GSSI_1500_pcb', type='f')
-
- # Excitation - custom pulse
- # print('#excitation_file: {}'.format(os.path.join(userlibdir, 'GSSIgausspulse1.txt')))
- # print('#transmission_line: y {} {} {} {} GSSIgausspulse1'.format(tx[0], tx[1], tx[2], sourceresistance))
-
- # Excitation - Gaussian pulse
- print('#waveform: gaussian 1 {} myGaussian'.format(excitationfreq))
- transmission_line('y', tx[0], tx[1], tx[2], sourceresistance, 'myGaussian', dxdy=(resolution, resolution), rotate90origin=rotate90origin)
-
- # Output point - receiver bowtie
- if resolution == 0.001:
- edge(tx[0] - 0.059, tx[1], tx[2], tx[0] - 0.059, tx[1] + dy, tx[2], 'rxres', rotate90origin=rotate90origin)
- rx(tx[0] - 0.059, tx[1], tx[2], identifier='rxbowtie', to_save=[output], polarisation='y', dxdy=(resolution, resolution), rotate90origin=rotate90origin)
- elif resolution == 0.002:
- edge(tx[0] - 0.060, tx[1], tx[2], tx[0] - 0.060, tx[1] + dy, tx[2], 'rxres', rotate90origin=rotate90origin)
- rx(tx[0] - 0.060, tx[1], tx[2], identifier='rxbowtie', to_save=[output], polarisation='y', dxdy=(resolution, resolution), rotate90origin=rotate90origin)
-
-
def antenna_like_MALA_1200(x, y, z, resolution=0.001, rotate90=False, **kwargs):
"""Inserts a description of an antenna similar to the MALA 1.2GHz antenna. Can be used with 1mm (default) or 2mm spatial resolution. The external dimensions of the antenna are 184x109x46mm. One output point is defined between the arms of the receiever bowtie. The bowties are aligned with the y axis so the output is the y component of the electric field (x component if the antenna is rotated 90 degrees).
diff --git a/user_models/antenna_like_GSSI_1500_fs.in b/user_models/antenna_like_GSSI_1500_fs.in
index 7b655734..0d282bd2 100644
--- a/user_models/antenna_like_GSSI_1500_fs.in
+++ b/user_models/antenna_like_GSSI_1500_fs.in
@@ -4,6 +4,6 @@
#time_window: 6e-9
#python:
-from user_libs.antennas import antenna_like_GSSI_1500
+from user_libs.antennas.GSSI import antenna_like_GSSI_1500
antenna_like_GSSI_1500(0.125, 0.094, 0.100, resolution=0.001)
-#end_python:
\ No newline at end of file
+#end_python:
diff --git a/user_models/antenna_like_GSSI_1500_patterns_E.in b/user_models/antenna_like_GSSI_1500_patterns_E.in
index 016e7ed6..c8da92f8 100755
--- a/user_models/antenna_like_GSSI_1500_patterns_E.in
+++ b/user_models/antenna_like_GSSI_1500_patterns_E.in
@@ -7,7 +7,7 @@ import os
import numpy as np
from gprMax.input_cmd_funcs import *
-from user_libs.antennas import antenna_like_GSSI_1500
+from user_libs.antennas.GSSI import antenna_like_GSSI_1500
filename = os.path.splitext(os.path.split(inputfile)[1])[0]
diff --git a/user_models/antenna_like_GSSI_1500_patterns_H.in b/user_models/antenna_like_GSSI_1500_patterns_H.in
index d88aed53..9cbd33ad 100755
--- a/user_models/antenna_like_GSSI_1500_patterns_H.in
+++ b/user_models/antenna_like_GSSI_1500_patterns_H.in
@@ -7,7 +7,7 @@ import os
import numpy as np
from gprMax.input_cmd_funcs import *
-from user_libs.antennas import antenna_like_GSSI_1500
+from user_libs.antennas.GSSI import antenna_like_GSSI_1500
filename = os.path.splitext(os.path.split(inputfile)[1])[0]
diff --git a/user_models/antenna_like_MALA_1200_fs.in b/user_models/antenna_like_MALA_1200_fs.in
index a0187229..1c002c57 100644
--- a/user_models/antenna_like_MALA_1200_fs.in
+++ b/user_models/antenna_like_MALA_1200_fs.in
@@ -4,6 +4,6 @@
#time_window: 6e-9
#python:
-from user_libs.antennas import antenna_like_MALA_1200
+from user_libs.antennas.MALA import antenna_like_MALA_1200
antenna_like_MALA_1200(0.132, 0.095, 0.100, 0.001)
-#end_python:
\ No newline at end of file
+#end_python:
diff --git a/user_models/cylinder_Bscan_GSSI_1500.in b/user_models/cylinder_Bscan_GSSI_1500.in
index 9464563d..6cf10867 100644
--- a/user_models/cylinder_Bscan_GSSI_1500.in
+++ b/user_models/cylinder_Bscan_GSSI_1500.in
@@ -9,8 +9,8 @@
#cylinder: 0.240 0 0.080 0.240 0.148 0.080 0.010 pec
#python:
-from user_libs.antennas import antenna_like_GSSI_1500
+from user_libs.antennas.GSSI import antenna_like_GSSI_1500
antenna_like_GSSI_1500(0.105 + current_model_run * 0.005, 0.074, 0.170, 0.001)
#end_python:
-geometry_view: 0 0 0 0.480 0.148 0.235 0.001 0.001 0.001 cylinder_GSSI_1500 n
\ No newline at end of file
+geometry_view: 0 0 0 0.480 0.148 0.235 0.001 0.001 0.001 cylinder_GSSI_1500 n