From c51a501d051f4257b7ae6f0b4126ec7082ce43f3 Mon Sep 17 00:00:00 2001
From: Craig Warren <craig_warren@me.com>
Date: Tue, 21 Feb 2017 12:55:43 +0000
Subject: [PATCH] Waveform value now pre-multiplied by amplitude scaling value
 when returned.

---
 gprMax/waveforms.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/gprMax/waveforms.py b/gprMax/waveforms.py
index 44bda3cd..d7f7d944 100644
--- a/gprMax/waveforms.py
+++ b/gprMax/waveforms.py
@@ -41,7 +41,7 @@ class Waveform(object):
             dt (float): Absolute time discretisation.
 
         Returns:
-            waveform (float): Calculated value for waveform.
+            ampvalue (float): Calculated value for waveform.
         """
 
         # Coefficients for certain waveforms
@@ -56,51 +56,53 @@ class Waveform(object):
 
         # Waveforms
         if self.type == 'gaussian':
-            waveform = np.exp(-zeta * delay**2)
+            ampvalue = np.exp(-zeta * delay**2)
 
         elif self.type == 'gaussiandot':
-            waveform = -2 * zeta * delay * np.exp(-zeta * delay**2)
+            ampvalue = -2 * zeta * delay * np.exp(-zeta * delay**2)
 
         elif self.type == 'gaussiandotnorm':
             normalise = np.sqrt(np.exp(1) / (2 * zeta))
-            waveform = -2 * zeta * delay * np.exp(-zeta * delay**2) * normalise
+            ampvalue = -2 * zeta * delay * np.exp(-zeta * delay**2) * normalise
 
         elif self.type == 'gaussiandotdot':
-            waveform = 2 * zeta * (2 * zeta * delay**2 - 1) * np.exp(-zeta * delay**2)
+            ampvalue = 2 * zeta * (2 * zeta * delay**2 - 1) * np.exp(-zeta * delay**2)
 
         elif self.type == 'gaussiandotdotnorm':
             normalise = 1 / (2 * zeta)
-            waveform = 2 * zeta * (2 * zeta * delay**2 - 1) * np.exp(-zeta * delay**2) * normalise
+            ampvalue = 2 * zeta * (2 * zeta * delay**2 - 1) * np.exp(-zeta * delay**2) * normalise
 
         elif self.type == 'ricker':
             normalise = 1 / (2 * zeta)
-            waveform = - (2 * zeta * (2 * zeta * delay**2 - 1) * np.exp(-zeta * delay**2)) * normalise
+            ampvalue = - (2 * zeta * (2 * zeta * delay**2 - 1) * np.exp(-zeta * delay**2)) * normalise
 
         elif self.type == 'sine':
-            waveform = np.sin(2 * np.pi * self.freq * time)
+            ampvalue = np.sin(2 * np.pi * self.freq * time)
             if time * self.freq > 1:
-                waveform = 0
+                ampvalue = 0
 
         elif self.type == 'contsine':
             rampamp = 0.25
             ramp = rampamp * time * self.freq
             if ramp > 1:
                 ramp = 1
-            waveform = ramp * np.sin(2 * np.pi * self.freq * time)
+            ampvalue = ramp * np.sin(2 * np.pi * self.freq * time)
 
         elif self.type == 'impulse':
             # time < dt condition required to do impulsive magnetic dipole
             if time == 0 or time < dt:
-                waveform = 1
+                ampvalue = 1
             elif time >= dt:
-                waveform = 0
+                ampvalue = 0
 
         elif self.type == 'user':
             index = round_value(time / dt)
             # Check to see if there are still user specified values and if not use zero
             if index > len(self.uservalues) - 1:
-                waveform = 0
+                ampvalue = 0
             else:
-                waveform = self.uservalues[index]
+                ampvalue = self.uservalues[index]
 
-        return waveform
+        ampvalue *= self.amp
+
+        return ampvalue