Updated copyright notices to 2017.

2025-08-04 11:36:52 +08:00 · 2017-01-18 14:16:20 +00:00
--- a/4
+++ b/4
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This is the official list of people who have contributed to the gprMax repository.
@@ -7,4 +7,4 @@

 Oystein Bjorndal
 John Hartley
-Rajath Kumar
+Rajath Kumar
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -64,7 +64,7 @@ master_doc = 'index'

 # General information about the project.
 project = 'gprMax'
-copyright = '2015-2016, The University of Edinburgh. Authors: Craig Warren and Antonis Giannopoulos'
+copyright = '2015-2017, The University of Edinburgh. Authors: Craig Warren and Antonis Giannopoulos'
 author = 'Craig Warren and Antonis Giannopoulos'

 # The version info for the project you're documenting, acts as replacement for
--- a/gprMax/_version.py
+++ b/gprMax/_version.py
@@ -1,3 +1,3 @@
 # This is where the version number is set and read by setup.py and conf.py (for the docs)

-__version__ = '3.0.12'
+__version__ = '3.0.13'
--- a/gprMax/constants.pxd
+++ b/gprMax/constants.pxd
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
@@ -26,4 +26,4 @@ cimport numpy as np
 #   Main field arrays use floats (floattype) and complex numbers (complextype)

 ctypedef np.float32_t floattype_t
-ctypedef np.complex64_t complextype_t
+ctypedef np.complex64_t complextype_t
--- a/gprMax/constants.py
+++ b/gprMax/constants.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/exceptions.py
+++ b/gprMax/exceptions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/fields_outputs.py
+++ b/gprMax/fields_outputs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/fields_update.pyx
+++ b/gprMax/fields_update.pyx
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
@@ -23,9 +23,9 @@ from cython.parallel import prange
 from gprMax.constants cimport floattype_t, complextype_t


-#####################################
-# Electric field updates - standard #
-#####################################
+###############################################
+# Electric field updates - standard materials #
+###############################################
 cpdef void update_electric(int nx, int ny, int nz, int nthreads, floattype_t[:, ::1] updatecoeffsE, np.uint32_t[:, :, :, ::1] ID, floattype_t[:, :, ::1] Ex, floattype_t[:, :, ::1] Ey, floattype_t[:, :, ::1] Ez, floattype_t[:, :, ::1] Hx, floattype_t[:, :, ::1] Hy, floattype_t[:, :, ::1] Hz):
    """This function updates the electric field components.
        
@@ -313,7 +313,7 @@ cpdef void update_magnetic(int nx, int ny, int nz, int nthreads, floattype_t[:,

    # 2D
    if nx == 1 or ny == 1 or nz == 1:
-    # Hx component
+        # Hx component
        if ny == 1 or nz == 1:
            for i in prange(1, nx, nogil=True, schedule='static', num_threads=nthreads):
                for j in range(0, ny):
--- a/gprMax/fractals.py
+++ b/gprMax/fractals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/geometry_outputs.py
+++ b/gprMax/geometry_outputs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/geometry_primitives.pyx
+++ b/gprMax/geometry_primitives.pyx
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/gprMax.py
+++ b/gprMax/gprMax.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/grid.py
+++ b/gprMax/grid.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/input_cmd_funcs.py
+++ b/gprMax/input_cmd_funcs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/input_cmds_file.py
+++ b/gprMax/input_cmds_file.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/input_cmds_geometry.py
+++ b/gprMax/input_cmds_geometry.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/input_cmds_multiuse.py
+++ b/gprMax/input_cmds_multiuse.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/input_cmds_singleuse.py
+++ b/gprMax/input_cmds_singleuse.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/materials.py
+++ b/gprMax/materials.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/optimisation_taguchi.py
+++ b/gprMax/optimisation_taguchi.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/pml.py
+++ b/gprMax/pml.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/pml_1order_update.pyx
+++ b/gprMax/pml_1order_update.pyx
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/pml_2order_update.pyx
+++ b/gprMax/pml_2order_update.pyx
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/receivers.py
+++ b/gprMax/receivers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/snapshots.py
+++ b/gprMax/snapshots.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/sources.py
+++ b/gprMax/sources.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/utilities.py
+++ b/gprMax/utilities.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
@@ -50,7 +50,7 @@ def logo(version):
    """

    description = '\n=== Electromagnetic modelling software based on the Finite-Difference Time-Domain (FDTD) method'
-    copyright = 'Copyright (C) 2015-2016: The University of Edinburgh'
+    copyright = 'Copyright (C) 2015-2017: The University of Edinburgh'
    authors = 'Authors: Craig Warren and Antonis Giannopoulos'
    licenseinfo1 = 'gprMax is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n'
    licenseinfo2 = 'gprMax is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.'
--- a/gprMax/waveforms.py
+++ b/gprMax/waveforms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/yee_cell_build.pyx
+++ b/gprMax/yee_cell_build.pyx
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/yee_cell_setget_rigid.pxd
+++ b/gprMax/yee_cell_setget_rigid.pxd
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/gprMax/yee_cell_setget_rigid.pyx
+++ b/gprMax/yee_cell_setget_rigid.pyx
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/tests/test_compare_analytical.py
+++ b/tests/test_compare_analytical.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/tests/test_compare_experimental.py
+++ b/tests/test_compare_experimental.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
@@ -87,4 +87,4 @@ savename = os.path.abspath(os.path.dirname(args.modelfile)) + os.sep + os.path.s
 #fig.savefig(savename + '.pdf', dpi=None, format='pdf', bbox_inches='tight', pad_inches=0.1)
 #fig.savefig((savename + '.png', dpi=150, format='png', bbox_inches='tight', pad_inches=0.1)

-plt.show()
+plt.show()
--- a/tests/test_compare_numerical.py
+++ b/tests/test_compare_numerical.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/macros/gprMax_info.py
+++ b/macros/gprMax_info.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
@@ -114,4 +114,4 @@ if rxs:
 #renderview.CameraParallelProjection = 1
 RenderAllViews()
 # Show color bar/color legend
-#thresholdDisplay.SetScalarBarVisibility(renderview, False)
+#thresholdDisplay.SetScalarBarVisibility(renderview, False)
--- a/tools/inputfile_old2new.py
+++ b/tools/inputfile_old2new.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/tools/outputfiles_merge.py
+++ b/tools/outputfiles_merge.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/tools/plot_Ascan.py
+++ b/tools/plot_Ascan.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/tools/plot_Bscan.py
+++ b/tools/plot_Bscan.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/tools/plot_antenna_params.py
+++ b/tools/plot_antenna_params.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/tools/plot_source_wave.py
+++ b/tools/plot_source_wave.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016: The University of Edinburgh
+# Copyright (C) 2015-2017: The University of Edinburgh
 #                 Authors: Craig Warren and Antonis Giannopoulos
 #
 # This file is part of gprMax.
--- a/user_libs/antennas.py
+++ b/user_libs/antennas.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016, Craig Warren
+# Copyright (C) 2015-2017, 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/.
--- a/user_libs/optimisation_taguchi/fitness_functions.py
+++ b/user_libs/optimisation_taguchi/fitness_functions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016, Craig Warren
+# Copyright (C) 2015-2017, 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/.
--- a/user_libs/optimisation_taguchi/plot_results.py
+++ b/user_libs/optimisation_taguchi/plot_results.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016, Craig Warren
+# Copyright (C) 2015-2017, 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/.
@@ -35,4 +35,4 @@ for key, value in optparamshist.items():
      
    
 # Plot the history of fitness values and each optimised parameter values for the optimisation
-plot_optimisation_history(fitnessvalueshist, optparamshist, optparamsinit)
+plot_optimisation_history(fitnessvalueshist, optparamshist, optparamsinit)