Updated version number to v.3.0.0b15

docs/source/conf.py

@@ -72,7 +72,7 @@ author = 'Craig Warren and Antonis Giannopoulos'
 # The short X.Y version.
 # Read version number from gprMax/gprMax.py
 #version = re.search('^__version__\s*=\s*\'(.*)\'', open('../../gprMax/gprMax.py').read(), re.M).group(1)
-version = '3.0.0b14'
+version = '3.0.0b15'
 # The full version, including alpha/beta/rc tags.
 release = version + '(Bowmore)'
 

gprMax/gprMax.py

@@ -19,7 +19,7 @@
 """gprMax.gprMax: provides entry point main()."""
 
 # Set the version number here
-__version__ = '3.0.0b14'
+__version__ = '3.0.0b15'
 versionname = ' (Bowmore)'
 
 import sys, os, datetime, itertools, argparse, importlib

user_models/antenna_MALA_1200_fs_opt.in

@@ -1,20 +0,0 @@
-#title: MALA 1.2GHz 'like' antenna in free-space
-#domain: 0.264 0.189 0.220
-#dx_dy_dz: 0.001 0.001 0.001
-#time_window: 6e-9
-
-#taguchi:
-## Dictionary containing name of parameters to optimise and their values
-optparams['excitationfreq'] = [0.8e9, 2.5e9]
-optparams['sourceresistance'] = [1, 10000]
-optparams['absorberEr'] = [1, 50]
-optparams['absorbersig'] = [0.01, 1]
-
-## Dictionary containing name of fitness metric to use, stopping criterion, and names of associated outputs (should correspond to names of rxs in input file)
-fitness = {'name': 'fitness_xcorr', 'stop': 0.98, 'args': {'refresp': inputdirectory + 'antenna_MALA_1200_fs_real.txt', 'outputs': 'rxMALA1200'}}
-#end_taguchi:
-
-#python:
-from user_libs.antennas import antenna_like_MALA_1200
-antenna_like_MALA_1200(0.132, 0.095, 0.100, resolution=0.001, **optparams)
-#end_python:

user_models/cylinder_Ascan_2D_opt.in

@@ -1,28 +0,0 @@
-#title: A-scan from a metal cylinder buried in a dielectric half-space
-#domain: 0.240 0.190 0.002
-#dx_dy_dz: 0.002 0.002 0.002
-#time_window: 3e-9
-#time_step_limit_type: 2D
-#pml_cells: 10 10 0 10 10 0
-
-#material: 6 0 1 0 half_space
-
-#taguchi:
-## Dictionary containing name of parameters to optimise and their values
-optparams['rickeramp'] = [0.25, 5]
-
-## Dictionary containing name of fitness metric to use, stopping criterion, and names of associated outputs (should correspond to names of rxs in input file)
-fitness = {'name': 'fitness_max', 'stop': 4000, 'args': {'outputs': 'myRx'}}
-#end_taguchi:
-
-#python:
-print('#waveform: ricker {} 1.5e9 my_ricker'.format(optparams['rickeramp']))
-#end_python:
-
-#hertzian_dipole: z 0.100 0.170 0 my_ricker
-#rx: 0.140 0.170 0 myRx Ez
-
-#box: 0 0 0 0.240 0.170 0.002 half_space
-#cylinder: 0.120 0.080 0 0.120 0.080 0.002 0.010 pec
-
-geometry_view: 0 0 0 0.240 0.190 0.002 0.002 0.002 0.002 cylinder_half_space n