Revert "multi cmds to functions"

This reverts commit 92bf59bc36.

gprMax/gprMax.py

@@ -68,7 +68,7 @@ def main():
 
 def api(inputfile, n=1, mpi=False, benchmark=False, geometry_only=False, geometry_fixed=False, write_processed=False, opt_taguchi=False):
     """If installed as a module this is the entry point."""
-
+    
     class ImportArguments:
         pass
 
@@ -88,11 +88,11 @@ def api(inputfile, n=1, mpi=False, benchmark=False, geometry_only=False, geometr
 
 def run_main(args):
     """Top-level function that controls what mode of simulation (standard/optimsation/benchmark etc...) is run.
-
+        
     Args:
         args (dict): Namespace with input arguments from command line or api.
     """
-
+        
     numbermodelruns = args.n
     inputdirectory = os.path.dirname(os.path.abspath(args.inputfile))
     inputfile = os.path.abspath(os.path.join(inputdirectory, os.path.basename(args.inputfile)))

gprMax/input_cmds_file.py

@@ -25,32 +25,32 @@ from gprMax.utilities import ListStream
 
 def process_python_include_code(inputfile, usernamespace):
     """Looks for and processes any Python code found in the input file. It will ignore any lines that are comments, i.e. begin with a double hash (##), and any blank lines. It will also ignore any lines that do not begin with a hash (#) after it has processed Python commands. It will also process any include commands and insert the contents of the included file at that location.
-
+        
     Args:
         inputfile (str): Name of the input file to open.
         usernamespace (dict): Namespace that can be accessed by user in any Python code blocks in input file.
-
+        
     Returns:
         processedlines (list): Input commands after Python processing.
     """
-
+    
     userpython = False
-
+    
     with open(inputfile, 'r') as f:
         # Strip out any newline characters and comments that must begin with double hashes
         inputlines = [line.rstrip() for line in f if(not line.startswith('##') and line.rstrip('\n'))]
-
+        
     # List to hold final processed commands
     processedlines = []
-
+    
     x = 0
     while(x < len(inputlines)):
-
+        
         # Process any Python code
         if(inputlines[x].startswith('#python:')):
             # Save stdout location to restore later
             stdout = sys.stdout
-
+            
             # String to hold Python code to be executed
             pythoncode = ''
             x += 1
@@ -66,36 +66,36 @@ def process_python_include_code(inputfile, usernamespace):
             sys.stdout = codeout = ListStream()
             # Execute code block & make available only usernamespace
             exec(pythoncompiledcode, usernamespace)
-
+            
             # Now strip out any lines that don't begin with a hash command
             codeproc = [line + ('\n') for line in codeout.data if(line.startswith('#'))]
-
+            
             # Add processed Python code to list
             processedlines.extend(codeproc)
-
+    
             # Reset stdio
             sys.stdout = stdout
-
+    
         # Process any include commands
         elif(inputlines[x].startswith('#include_file:')):
             includefile = inputlines[x].split()
-
+            
             if len(includefile) != 2:
                 raise CmdInputError('#include_file requires exactly one parameter')
-
+            
             includefile = includefile[1]
-
+            
             # See if file exists at specified path and if not try input file directory
             if not os.path.isfile(includefile):
                 includefile = os.path.join(usernamespace['inputdirectory'], includefile)
-
+    
             with open(includefile, 'r') as f:
                 # Strip out any newline characters and comments that must begin with double hashes
                 includelines = [includeline.rstrip() + '\n' for includeline in f if(not includeline.startswith('##') and includeline.rstrip('\n'))]
-
+                
             # Add lines from include file to list
             processedlines.extend(includelines)
-
+        
         # Add any other commands to list
         elif(inputlines[x].startswith('#')):
             # Add gprMax command to list
@@ -103,20 +103,20 @@ def process_python_include_code(inputfile, usernamespace):
             processedlines.append(inputlines[x])
 
         x += 1
-
+    
     return processedlines
 
 
 def write_processed_file(inputfile, modelrun, numbermodelruns, processedlines):
     """Writes an input file after any Python code and include commands in the original input file have been processed.
-
+        
     Args:
         inputfile (str): Name of the input file to open.
         modelrun (int): Current model run number.
         numbermodelruns (int): Total number of model runs.
         processedlines (list): Input commands after after processing any Python code and include commands.
     """
-
+    
     if numbermodelruns == 1:
         processedfile = os.path.splitext(inputfile)[0] + '_processed.in'
     else:
@@ -131,11 +131,11 @@ def write_processed_file(inputfile, modelrun, numbermodelruns, processedlines):
 
 def check_cmd_names(processedlines, checkessential=True):
     """Checks the validity of commands, i.e. are they gprMax commands, and that all essential commands are present.
-
+        
     Args:
         processedlines (list): Input commands after Python processing.
         checkessential (boolean): Perform check to see that all essential commands are present.
-
+        
     Returns:
         singlecmds (dict): Commands that can only occur once in the model.
         multiplecmds (dict): Commands that can have multiple instances in the model.
@@ -150,13 +150,13 @@ def check_cmd_names(processedlines, checkessential=True):
     singlecmds = dict.fromkeys(['#domain', '#dx_dy_dz', '#time_window', '#title', '#messages', '#num_threads', '#time_step_stability_factor', '#pml_cells', '#excitation_file', '#src_steps', '#rx_steps', '#taguchi', '#end_taguchi'], 'None')
 
     # Commands that there can be multiple instances of in a model - these will be lists within the dictionary
-    multiplecmds = {key: [] for key in ['#geometry_view', '#material', '#soil_peplinski', '#add_dispersion_debye', '#add_dispersion_lorentz', '#add_dispersion_drude', '#waveform', '#voltage_source', '#hertzian_dipole', '#magnetic_dipole', '#transmission_line', '#tem_transmission_line', '#rx', '#rx_box', '#snapshot', '#pml_cfs']}
+    multiplecmds = {key: [] for key in ['#geometry_view', '#material', '#soil_peplinski', '#add_dispersion_debye', '#add_dispersion_lorentz', '#add_dispersion_drude', '#waveform', '#voltage_source', '#hertzian_dipole', '#magnetic_dipole', '#transmission_line', '#rx', '#rx_box', '#snapshot', '#pml_cfs']}
-
+    
     # Geometry object building commands that there can be multiple instances of in a model - these will be lists within the dictionary
     geometrycmds = ['#geometry_objects_file', '#edge', '#plate', '#triangle', '#box', '#sphere', '#cylinder', '#cylindrical_sector', '#fractal_box', '#add_surface_roughness', '#add_surface_water', '#add_grass']
     # List to store all geometry object commands in order from input file
     geometry = []
-
+    
     # Check if command names are valid, if essential commands are present, and add command parameters to appropriate dictionary values or lists
     countessentialcmds = 0
     lindex = 0
@@ -171,22 +171,22 @@ def check_cmd_names(processedlines, checkessential=True):
         # Count essential commands
         if cmdname in essentialcmds:
             countessentialcmds += 1
-
+        
         # Assign command parameters as values to dictionary keys
         if cmdname in singlecmds:
             if singlecmds[cmdname] == 'None':
                 singlecmds[cmdname] = cmd[1].strip(' \t\n')
             else:
                 raise CmdInputError('You can only have one ' + cmdname + ' commmand in your model')
-
+                    
         elif cmdname in multiplecmds:
             multiplecmds[cmdname].append(cmd[1].strip(' \t\n'))
 
         elif cmdname in geometrycmds:
             geometry.append(processedlines[lindex].strip(' \t\n'))
-
+          
         lindex += 1
-
+    
     if checkessential:
         if (countessentialcmds < len(essentialcmds)):
             raise CmdInputError('Your input file is missing essential gprMax commands required to run a model. Essential commands are: ' + ', '.join(essentialcmds))

gprMax/materials.py

@@ -20,34 +20,28 @@ import numpy as np
 
 from gprMax.constants import e0, m0, floattype, complextype
 
-# Look up for material ids
-material_ids = {
-    'pec': 0,
-    'freespace': 1
-}
-
 
 class Material(object):
     """Materials, their properties and update coefficients."""
-
+    
     # Maximum number of dispersive material poles in a model
     maxpoles = 0
-
+    
     # Types of material
     types = ['standard', 'debye', 'lorentz', 'drude']
-
+    
     # Properties of water from: http://dx.doi.org/10.1109/TGRS.2006.873208
     waterer = 80.1
     watereri = 4.9
     waterdeltaer = waterer - watereri
     watertau = 9.231e-12
-
+    
     # Properties of grass from: http://dx.doi.org/10.1007/BF00902994
     grasser = 18.5087
     grasseri = 12.7174
     grassdeltaer = grasser - grasseri
     grasstau = 1.0793e-11
-
+    
     def __init__(self, numID, ID, G):
         """
         Args:
@@ -55,7 +49,7 @@ class Material(object):
             ID (str): Name of the material.
             G (class): Grid class instance - holds essential parameters describing the model.
         """
-
+        
         self.numID = numID
         self.ID = ID
         self.type = 'standard'
@@ -67,20 +61,20 @@ class Material(object):
         self.se = 0.0
         self.mr = 1.0
         self.sm = 0.0
-
+        
         # Parameters for dispersive materials
         self.poles = 0
         self.deltaer = []
         self.tau = []
         self.alpha = []
-
+    
     def calculate_update_coeffsH(self, G):
         """Calculates the magnetic update coefficients of the material.
-
+            
         Args:
             G (class): Grid class instance - holds essential parameters describing the model.
         """
-
+        
         HA = (m0*self.mr / G.dt) + 0.5*self.sm
         HB = (m0*self.mr / G.dt) - 0.5*self.sm
         self.DA = HB / HA
@@ -92,11 +86,11 @@ class Material(object):
     # Calculate electric update coefficients
     def calculate_update_coeffsE(self, G):
         """Calculates the electric update coefficients of the material.
-
+            
         Args:
             G (class): Grid class instance - holds essential parameters describing the model.
         """
-
+        
         # The implementation of the dispersive material modelling comes from the derivation in: http://dx.doi.org/10.1109/TAP.2014.2308549
         if self.maxpoles > 0:
             self.w = np.zeros(self.maxpoles, dtype=complextype)
@@ -105,7 +99,7 @@ class Material(object):
             self.zt2 = np.zeros(self.maxpoles, dtype=complextype)
             self.eqt = np.zeros(self.maxpoles, dtype=complextype)
             self.eqt2 = np.zeros(self.maxpoles, dtype=complextype)
-
+            
             for x in range(self.poles):
                 if self.type == 'debye':
                     self.w[x] = self.deltaer[x] / self.tau[x]
@@ -123,7 +117,7 @@ class Material(object):
                     self.se += wp2 / self.alpha[x]
                     self.w[x] = - (wp2 / self.alpha[x])
                     self.q[x] = - self.alpha[x]
-
+                
                 self.eqt[x] = np.exp(self.q[x] * G.dt)
                 self.eqt2[x] = np.exp(self.q[x] * (G.dt / 2))
                 self.zt[x] = (self.w[x] / self.q[x]) * (1 - self.eqt[x]) / G.dt
@@ -131,7 +125,7 @@ class Material(object):
 
             EA = (e0*self.er / G.dt) + 0.5*self.se - (e0 / G.dt) * np.sum(self.zt2.real)
             EB = (e0*self.er / G.dt) - 0.5*self.se - (e0 / G.dt) * np.sum(self.zt2.real)
-
+        
         else:
             EA = (e0*self.er / G.dt) + 0.5*self.se
             EB = (e0*self.er / G.dt) - 0.5*self.se
@@ -152,7 +146,7 @@ class Material(object):
 
 class PeplinskiSoil(object):
     """Soil objects that are characterised according to a mixing model by Peplinski (http://dx.doi.org/10.1109/36.387598)."""
-
+    
     def __init__(self, ID, sandfraction, clayfraction, bulkdensity, sandpartdensity, watervolfraction):
         """
         Args:
@@ -163,7 +157,7 @@ class PeplinskiSoil(object):
             sandpartdensity (float): Density of the sand particles in the soil (g/cm3).
             watervolfraction (float): Two numbers that specify a range for the volumetric water fraction of the soil.
         """
-
+        
         self.ID = ID
         self.S = sandfraction
         self.C = clayfraction
@@ -174,28 +168,28 @@ class PeplinskiSoil(object):
 
     def calculate_debye_properties(self, nbins, G):
         """Calculates the real and imaginery part of a Debye model for the soil as well as a conductivity. It uses a semi-empirical model (http://dx.doi.org/10.1109/36.387598).
-
+            
         Args:
             nbins (int): Number of bins to use to create the different materials.
             G (class): Grid class instance - holds essential parameters describing the model.
         """
-
+        
         # Debye model properties of water
         f = 1.3e9
         w = 2 * np.pi * f
         erealw = Material.watereri + ((Material.waterdeltaer) / (1 + (w * Material.watertau)**2))
         eimagw = w * Material.watertau * ((Material.waterdeltaer) / (1 + (w * Material.watertau)**2))
-
+        
         a = 0.65 # Experimentally derived constant
         es = (1.01 + 0.44 * self.rs)**2 - 0.062
         b1 = 1.2748 - 0.519 * self.S - 0.152 * self.C
         b2 = 1.33797 - 0.603 * self.S - 0.166 * self.C
-
+        
         # For frequencies in the range 0.3GHz to 1.3GHz
         sigf1 = 0.0467 + 0.2204 * self.rb - 0.411 * self.S + 0.6614 * self.C
         # For frequencies in the range 1.4GHz to 18GHz
         sigf2 = -1.645 + 1.939 * self.rb - 2.25622 * self.S + 1.594 * self.C
-
+        
         # Generate a set of bins based on the given volumetric water fraction values
         mubins = np.linspace(self.mu[0], self.mu[1], nbins + 1)
         # Generate a range of volumetric water fraction values the mid-point of each bin to make materials from
@@ -208,13 +202,13 @@ class PeplinskiSoil(object):
             er1 = (1 + (self.rb/self.rs) * ((es**a) - 1) + (muiter[0]**b1 * erealw**a) - muiter[0]) ** (1/a)
             # Real part for frequencies in the range 0.3GHz to 1.3GHz
             er2 = 1.15 * er1 - 0.68
-
+            
             # Imaginary part for frequencies in the range 0.3GHz to 1.3GHz
             eri = er2 - (muiter[0]**(b2/a) * Material.waterdeltaer)
-
+            
             # Effective conductivity
             sig = muiter[0]**(b2/a) * ((sigf1 * (self.rs - self.rb)) / (self.rs * muiter[0]))
-
+            
             # Check to see if the material already exists before creating a new one
             requiredID = '|{:.4f}|'.format(float(muiter[0]))
             material = next((x for x in G.materials if x.ID == requiredID), None)
@@ -231,7 +225,7 @@ class PeplinskiSoil(object):
                 m.deltaer.append(er2 - m.er)
                 m.tau.append(Material.watertau)
                 G.materials.append(m)
-
+        
             muiter.iternext()
 
 

gprMax/sources.py

@@ -20,11 +20,9 @@ from copy import deepcopy
 
 import numpy as np
 
-from .constants import c, floattype
+from gprMax.constants import c, floattype
-from .grid import Ix, Iy, Iz
+from gprMax.grid import Ix, Iy, Iz
-from .utilities import round_value
+from gprMax.utilities import round_value
-from .materials import material_ids
-from .exceptions import GeneralError
 
 
 class Source(object):
@@ -45,18 +43,15 @@ class Source(object):
 
 
 class VoltageSource(Source):
-    """The voltage source can be a hard source if it's resistance is zero,
+    """The voltage source can be a hard source if it's resistance is zero, i.e. the time variation of the specified electric field component is prescribed. If it's resistance is non-zero it behaves as a resistive voltage source."""
-    i.e. the time variation of the specified electric field component is
+    
-    prescribed. If it's resistance is non-zero it behaves as a resistive
-    voltage source."""
-
     def __init__(self):
-        super().__init__()
+        super(Source, self).__init__()
         self.resistance = None
 
     def update_electric(self, abstime, updatecoeffsE, ID, Ex, Ey, Ez, G):
         """Updates electric field values for a voltage source.
-
+            
         Args:
             abstime (float): Absolute time.
             updatecoeffsE (memory view): numpy array of electric field update coefficients.
@@ -64,7 +59,7 @@ class VoltageSource(Source):
             Ex, Ey, Ez (memory view): numpy array of electric field values.
             G (class): Grid class instance - holds essential parameters describing the model.
         """
-
+            
         if abstime >= self.start and abstime <= self.stop:
             # Set the time of the waveform evaluation to account for any delay in the start
             time = abstime - self.start
@@ -72,7 +67,7 @@ class VoltageSource(Source):
             j = self.ycoord
             k = self.zcoord
             waveform = next(x for x in G.waveforms if x.ID == self.waveformID)
-
+            
             if self.polarisation is 'x':
                 if self.resistance != 0:
                     componentID = 'E' + self.polarisation
@@ -96,7 +91,7 @@ class VoltageSource(Source):
 
     def create_material(self, G):
         """Create a new material at the voltage source location that adds the voltage source conductivity to the underlying parameters.
-
+            
         Args:
             G (class): Grid class instance - holds essential parameters describing the model.
         """
@@ -105,7 +100,7 @@ class VoltageSource(Source):
             i = self.xcoord
             j = self.ycoord
             k = self.zcoord
-
+            
             componentID = 'E' + self.polarisation
             requirednumID = G.ID[G.IDlookup[componentID], i, j, k]
             material = next(x for x in G.materials if x.numID == requirednumID)
@@ -113,7 +108,7 @@ class VoltageSource(Source):
             newmaterial.ID = material.ID + '+VoltageSource_' + str(self.resistance)
             newmaterial.numID = len(G.materials)
             newmaterial.average = False
-
+            
             # Add conductivity of voltage source to underlying conductivity
             if self.polarisation == 'x':
                 newmaterial.se += G.dx / (self.resistance * G.dy * G.dz)
@@ -128,13 +123,13 @@ class VoltageSource(Source):
 
 class HertzianDipole(Source):
     """The Hertzian dipole is an additive source (electric current density)."""
-
+    
     def __init__(self):
-        super().__init__()
+        super(Source, self).__init__()
 
     def update_electric(self, abstime, updatecoeffsE, ID, Ex, Ey, Ez, G):
         """Updates electric field values for a Hertzian dipole.
-
+            
         Args:
             abstime (float): Absolute time.
             updatecoeffsE (memory view): numpy array of electric field update coefficients.
@@ -142,7 +137,7 @@ class HertzianDipole(Source):
             Ex, Ey, Ez (memory view): numpy array of electric field values.
             G (class): Grid class instance - holds essential parameters describing the model.
         """
-
+        
         if abstime >= self.start and abstime <= self.stop:
             # Set the time of the waveform evaluation to account for any delay in the start
             time = abstime - self.start
@@ -150,7 +145,7 @@ class HertzianDipole(Source):
             j = self.ycoord
             k = self.zcoord
             waveform = next(x for x in G.waveforms if x.ID == self.waveformID)
-
+            
             if self.polarisation is 'x':
                 componentID = 'E' + self.polarisation
                 Ex[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (G.dy * G.dz))
@@ -166,13 +161,13 @@ class HertzianDipole(Source):
 
 class MagneticDipole(Source):
     """The magnetic dipole is an additive source (magnetic current density)."""
-
+    
     def __init__(self):
-        super().__init__()
+        super(Source, self).__init__()
 
     def update_magnetic(self, abstime, updatecoeffsH, ID, Hx, Hy, Hz, G):
         """Updates magnetic field values for a magnetic dipole.
-
+            
         Args:
             abstime (float): Absolute time.
             updatecoeffsH (memory view): numpy array of magnetic field update coefficients.
@@ -180,7 +175,7 @@ class MagneticDipole(Source):
             Hx, Hy, Hz (memory view): numpy array of magnetic field values.
             G (class): Grid class instance - holds essential parameters describing the model.
         """
-
+        
         if abstime >= self.start and abstime <= self.stop:
             # Set the time of the waveform evaluation to account for any delay in the start
             time = abstime - self.start
@@ -188,7 +183,7 @@ class MagneticDipole(Source):
             j = self.ycoord
             k = self.zcoord
             waveform = next(x for x in G.waveforms if x.ID == self.waveformID)
-
+            
             if self.polarisation is 'x':
                 Hx[i, j, k] -= waveform.amp  * waveform.calculate_value(time, G.dt) * (G.dt / (G.dx * G.dy * G.dz))
 
@@ -200,60 +195,45 @@ class MagneticDipole(Source):
 
 
 class TransmissionLine(Source):
-    """The transmission line source is a one-dimensional transmission
+    """The transmission line source is a one-dimensional transmission line which is attached virtually to a grid cell."""
-    line which is attached virtually to a grid cell.
+    
-    """
-
     def __init__(self, G):
         """
         Args:
-            G (class): Grid class instance - holds essential parameters
+            G (class): Grid class instance - holds essential parameters describing the model.
-            describing the model.
         """
-
+        
-        super().__init__()
+        super(Source, self).__init__()
         self.resistance = None
-
+        
         # Coefficients for ABC termination of end of the transmission line
         self.abcv0 = 0
         self.abcv1 = 0
 
-        # Spatial step of transmission line (based on magic time step for
+        # Spatial step of transmission line (based on magic time step for dispersionless behaviour)
-        # dispersionless behaviour)
         self.dl = c * G.dt
-
+        
-        # Number of nodes in the transmission line (initially a long line
+        # Number of nodes in the transmission line (initially a long line to calculate incident voltage and current); consider putting ABCs/PML at end
-        # to calculate incident voltage and current);
-        # consider putting ABCs/PML at end
         self.nl = round_value(0.667 * G.iterations)
-
+        
-        # Nodal position of the one-way injector excitation in the
+        # Nodal position of the one-way injector excitation in the transmission line
-        # transmission line
         self.srcpos = 5
-
+        
         # Nodal position of where line connects to antenna/main grid
         self.antpos = 10
-
+        
         self.voltage = np.zeros(self.nl, dtype=floattype)
         self.current = np.zeros(self.nl, dtype=floattype)
         self.Vinc = np.zeros(G.iterations, dtype=floattype)
         self.Iinc = np.zeros(G.iterations, dtype=floattype)
-
+    
-        self.type_str = 'TransmissionLine'
-
-    def setID(self):
-        self.ID = self.type_str + '(' + str(self.xcoord) + ',' + str(self.ycoord) + ',' + str(self.zcoord) + ')'
-
     def calculate_incident_V_I(self, G):
-        """Calculates the incident voltage and current with a long length
+        """Calculates the incident voltage and current with a long length transmission line not connected to the main grid from: http://dx.doi.org/10.1002/mop.10415
-        transmission line not connected to the main grid from:
+            
-        http://dx.doi.org/10.1002/mop.10415
-
         Args:
-            G (class): Grid class instance - holds essential parameters
+            G (class): Grid class instance - holds essential parameters describing the model.
-            describing the model.
         """
-
+        
         abstime = 0
         for timestep in range(G.iterations):
             self.Vinc[timestep] = self.voltage[self.antpos]
@@ -263,36 +243,33 @@ class TransmissionLine(Source):
             self.update_current(abstime, G)
             abstime += 0.5 * G.dt
 
-        # Shorten number of nodes in the transmission line before use
+        # Shorten number of nodes in the transmission line before use with main grid
-        # with main grid
         self.nl = self.antpos + 1
-
+    
     def update_abc(self, G):
         """Updates absorbing boundary condition at end of the transmission line.
-
+            
         Args:
-            G (class): Grid class instance - holds essential parameters
+            G (class): Grid class instance - holds essential parameters describing the model.
-            describing the model.
         """
-
+    
         h = (c * G.dt - self.dl) / (c * G.dt + self.dl)
-
+    
         self.voltage[0] = h * (self.voltage[1] - self.abcv0) + self.abcv1
         self.abcv0 = self.voltage[0]
         self.abcv1 = self.voltage[1]
 
     def update_voltage(self, time, G):
         """Updates voltage values along the transmission line.
-
+            
         Args:
             time (float): Absolute time.
-            G (class): Grid class instance - holds essential parameters
+            G (class): Grid class instance - holds essential parameters describing the model.
-            describing the model.
         """
-
+        
         # Update all the voltage values along the line
         self.voltage[1:self.nl] -= self.resistance * (c * G.dt / self.dl) * (self.current[1:self.nl] - self.current[0:self.nl - 1])
-
+    
         # Update the voltage at the position of the one-way injector excitation
         waveform = next(x for x in G.waveforms if x.ID == self.waveformID)
         self.voltage[self.srcpos] += (c * G.dt / self.dl) * waveform.amp * waveform.calculate_value(time - 0.5 * G.dt, G.dt)
@@ -302,13 +279,12 @@ class TransmissionLine(Source):
 
     def update_current(self, time, G):
         """Updates current values along the transmission line.
-
+            
         Args:
             time (float): Absolute time.
-            G (class): Grid class instance - holds essential parameters
+            G (class): Grid class instance - holds essential parameters describing the model.
-            describing the model.
         """
-
+        
         # Update all the current values along the line
         self.current[0:self.nl - 1] -= (1 / self.resistance) * (c * G.dt / self.dl) * (self.voltage[1:self.nl] - self.voltage[0:self.nl - 1])
 
@@ -317,25 +293,23 @@ class TransmissionLine(Source):
         self.current[self.srcpos - 1] += (c * G.dt / self.dl) * waveform.amp * waveform.calculate_value(time - 0.5 * G.dt, G.dt) * (1 / self.resistance)
 
     def update_electric(self, abstime, Ex, Ey, Ez, G):
-        """Updates electric field value in the main grid from voltage value
+        """Updates electric field value in the main grid from voltage value in the transmission line.
-        in the transmission line.
+            
-
         Args:
             abstime (float): Absolute time.
             Ex, Ey, Ez (memory view): numpy array of electric field values.
-            G (class): Grid class instance - holds essential parameters
+            G (class): Grid class instance - holds essential parameters describing the model.
-            describing the model.
         """
+        
         if abstime >= self.start and abstime <= self.stop:
-            # Set the time of the waveform evaluation to account
+            # Set the time of the waveform evaluation to account for any delay in the start
-            # for any delay in the start
             time = abstime - self.start
             i = self.xcoord
             j = self.ycoord
             k = self.zcoord
-
+            
             self.update_voltage(time, G)
-
+            
             if self.polarisation is 'x':
                 Ex[i, j, k] = - self.voltage[self.antpos] / G.dx
 
@@ -346,24 +320,21 @@ class TransmissionLine(Source):
                 Ez[i, j, k] = - self.voltage[self.antpos] / G.dz
 
     def update_magnetic(self, abstime, Hx, Hy, Hz, G):
-        """Updates current value in transmission line from magnetic field
+        """Updates current value in transmission line from magnetic field values in the main grid.
-        values in the main grid.
+            
-
         Args:
             abstime (float): Absolute time.
             Hx, Hy, Hz (memory view): numpy array of magnetic field values.
-            G (class): Grid class instance - holds essential parameters
+            G (class): Grid class instance - holds essential parameters describing the model.
-            describing the model.
         """
-
+        
         if abstime >= self.start and abstime <= self.stop:
-            # Set the time of the waveform evaluation to account
+            # Set the time of the waveform evaluation to account for any delay in the start
-            # for any delay in the start
             time = abstime - self.start
             i = self.xcoord
             j = self.ycoord
             k = self.zcoord
-
+            
             if self.polarisation is 'x':
                 self.current[self.antpos] = Ix(i, j, k, G.Hy, G.Hz, G)
 
@@ -375,15 +346,3 @@ class TransmissionLine(Source):
 
             self.update_current(time, G)
 
-
-class TEMTransmissionLine(TransmissionLine):
-
-    def __init__(self, G):
-        super().__init__(G)
-        self.type_str = 'TEMTransmissionLine'
-
-    def update_magnetic(self, abstime, Hx, Hy, Hz, G):
-        pass
-
-    def update_electric(self, abstime, Ex, Ey, Ez, G):
-        pass