From c7b6b48df962c814535a8f4ff29f659b2725ef3a Mon Sep 17 00:00:00 2001
From: Craig Warren <cwarren@C17776592.local>
Date: Wed, 31 Jul 2019 13:47:08 +0100
Subject: [PATCH] Corrected call for dispersive materials Cython building.

---
 .../fields_updates_dispersive_template        | 32 ++++++++-----------
 setup.py                                      |  6 ++--
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/gprMax/templates/fields_updates_dispersive_template b/gprMax/templates/fields_updates_dispersive_template
index ee633814..88626be5 100644
--- a/gprMax/templates/fields_updates_dispersive_template
+++ b/gprMax/templates/fields_updates_dispersive_template
@@ -20,16 +20,14 @@ import numpy as np
 cimport numpy as np
 from cython.parallel import prange
 
-from gprMax.config cimport float_or_double
-from gprMax.config cimport real_or_complex
-
 cdef extern from "complex.h" nogil:
     double creal(double complex z)
     float crealf(float complex z)
 
-#########################################################
-# Electric field updates - dispersive materials - multipole A
-#########################################################
+
+###############################################################
+# Electric field updates - dispersive materials - multipole A #
+###############################################################
 
 {% for item in functions %}
 cpdef void {{ item.name_a }}(
@@ -114,9 +112,9 @@ cpdef void {{ item.name_a }}(
 {% endfor %}
 
 
-#########################################################
-# Electric field updates - dispersive materials - multipole B
-#########################################################
+###############################################################
+# Electric field updates - dispersive materials - multipole B #
+###############################################################
 
 {% for item in functions %}
 cpdef void {{ item.name_b }}(
@@ -176,13 +174,11 @@ cpdef void {{ item.name_b }}(
 {% endfor %}
 
 
-#########################################################
-# Electric field updates - dispersive materials - single pole A
-#########################################################
+#################################################################
+# Electric field updates - dispersive materials - single pole A #
+#################################################################
 
-# one pole
 {% for item in functions %}
-
 cpdef void {{ item.name_a_1 }}(
                     int nx,
                     int ny,
@@ -259,12 +255,12 @@ cpdef void {{ item.name_a_1 }}(
 
 {% endfor %}
 
-#########################################################
-# Electric field updates - dispersive materials - single pole B
-#########################################################
+
+#################################################################
+# Electric field updates - dispersive materials - single pole B #
+#################################################################
 
 {% for item in functions %}
-
 cpdef void {{ item.name_b_1 }}(
                     int nx,
                     int ny,
diff --git a/setup.py b/setup.py
index 950321cd..dbb72b8b 100644
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,9 @@ def build_dispersive_material_templates():
     with open('gprMax/cython/fields_updates_dispersive.pyx', 'w') as f:
         f.write(r)
 
+# Generate Cython file for dispersive materials update functions
+build_dispersive_material_templates()
+
 # Importing _version__.py before building can cause issues.
 with open('gprMax/_version.py', 'r') as fd:
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
@@ -196,9 +199,6 @@ elif sys.platform == 'linux':
     linker_args = ['-fopenmp']
     extra_objects = []
 
-# generate cython file for dispersive update
-build_dispersive_material_templates()
-
 # Build a list of all the extensions
 extensions = []
 for file in cythonfiles: