Updated to remove feeding of parameter values from Taguchi optimisation.

user_libs/antennas/MALA.py

@@ -13,14 +13,13 @@ from gprMax.input_cmd_funcs import *
 userlibdir = os.path.dirname(os.path.abspath(__file__))
 
 
-def antenna_like_MALA_1200(x, y, z, resolution=0.001, rotate90=False, **kwargs):
+def antenna_like_MALA_1200(x, y, z, resolution=0.001, rotate90=False):
     """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 receiver 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
@@ -42,18 +41,11 @@ def antenna_like_MALA_1200(x, y, z, resolution=0.001, rotate90=False, **kwargs):
         rotate90origin = ()
         output = 'Ey'
 
-    # Unknown properties
-    if kwargs:
-        excitationfreq = kwargs['excitationfreq']
-        sourceresistance = kwargs['sourceresistance']
-        absorberEr = kwargs['absorberEr']
-        absorbersig = kwargs['absorbersig']
-    else:
-        # Values from http://hdl.handle.net/1842/4074
-        excitationfreq = 0.978e9
-        sourceresistance = 1000
-        absorberEr = 6.49
-        absorbersig = 0.252
+    # Original optimised values from http://hdl.handle.net/1842/4074
+    excitationfreq = 0.978e9
+    sourceresistance = 1000
+    absorberEr = 6.49
+    absorbersig = 0.252
 
     x = x - (casesize[0] / 2)
     y = y - (casesize[1] / 2)