Changes to names of example models.

user_models/GSSI_1500_cylinder_Bscan.in

@@ -0,0 +1,16 @@
+#title: B-scan from a metal cylinder buried in a dielectric half-space with a GSSI 1.5GHz 'like' antenna
+#domain: 0.480 0.148 0.235
+#dx_dy_dz: 0.001 0.001 0.001
+#time_window: 6e-9
+
+#material: 6 0 1 0 half_space
+
+#box: 0 0 0 0.480 0.148 0.170 half_space
+#cylinder: 0.240 0 0.080 0.240 0.148 0.080 0.010 pec
+
+#python:
+from user_libs.antennas import antenna_like_GSSI_1500
+antenna_like_GSSI_1500(0.105 + current_model_run * 0.005, 0.074, 0.170, 0.001)
+#end_python:
+
+geometry_view: 0 0 0 0.480 0.148 0.235 0.001 0.001 0.001 GSSI_1500_cylinder n

user_models/antenna_MALA_1200_fs.in

@@ -5,6 +5,5 @@
 
 #python:
 from user_libs.antennas import antenna_like_MALA_1200
-antenna_like_MALA_1200(0.132, 0.095, 0.100)
-#end_python:
-
+antenna_like_MALA_1200(0.132, 0.095, 0.100, 0.001)
+#end_python:

user_models/cylinder_Ascan_2D.in

@@ -0,0 +1,17 @@
+#title: A-scan from a metal cylinder buried in a dielectric half-space
+#domain: 0.240 0.190 0.001
+#dx_dy_dz: 0.001 0.001 0.001
+#time_window: 4e-9
+#time_step_limit_type: 2D
+#pml_cells: 10 10 0 10 10 0
+
+#material: 6 0 1 0 half_space
+
+#waveform: ricker 1 1.5e9 my_ricker
+#hertzian_dipole: z 0.100 0.170 0 my_ricker
+#rx: 0.140 0.170 0
+
+#box: 0 0 0 0.240 0.170 0.001 half_space
+#cylinder: 0.120 0.080 0 0.120 0.080 0.001 0.010 pec
+
+#geometry_view: 0 0 0 0.240 0.190 0.001 0.001 0.001 0.001 cylinder_half_space n

user_models/cylinder_Bscan_2D.in

@@ -0,0 +1,17 @@
+#title: B-scan from a metal cylinder buried in a dielectric half-space
+#domain: 0.240 0.190 0.001
+#dx_dy_dz: 0.001 0.001 0.001
+#time_window: 4e-9
+#time_step_limit_type: 2D
+#pml_cells: 10 10 0 10 10 0
+
+#material: 6 0 1 0 half_space
+
+#waveform: ricker 1 1.5e9 my_ricker
+#hertzian_dipole: z 0.020 0.170 0 my_ricker
+#rx: 0.060 0.170 0
+#src_steps: 0.002 0 0
+#rx_steps: 0.002 0 0
+
+#box: 0 0 0 0.240 0.170 0.001 half_space
+#cylinder: 0.120 0.080 0 0.120 0.080 0.001 0.010 pec

user_models/false_alarm_can.in

@@ -1,12 +0,0 @@
-#title: Metal can false alarm target in free-space
-#domain: 0.076 0.076 0.108
-#dx_dy_dz: 0.001 0.001 0.001
-#time_window: 6e-9
-
-#python:
-from user_libs.landmines import false_alarm_can
-false_alarm_can(0.038, 0.038, 0.054)
-#end_python:
-
-#geometry_view: 0 0 0 0.076 0.076 0.108 0.001 0.001 0.001 false_alarm_can n
-

user_models/hertzian_dipole_2D.in

@@ -1,25 +0,0 @@
-#title: 2D
-#domain: 0.1 0.1 0.001
-#dx_dy_dz: 0.001 0.001 0.001
-#time_window: 6e-9
-#time_step_limit_type: 2d
-#pml_cells: 10 10 0 10 10 0
-
-#material: 8 0 1 0 half_space
-
-#waveform: ricker 1.0 1e9 myRicker
-#box: 0 0 0 0.100 0.050 0.001 half_space
-#sphere: 0.050 0.020 0 0.005 pec
-#hertzian_dipole: z 0.040 0.050 0 myRicker
-#rx: 0.060 0.050 0
-hertzian_dipole: z 0.015 0.050 0 myRicker
-rx: 0.020 0.050 0
-src_steps: 0.002 0 0
-rx_steps: 0.002 0 0
-
-geometry_view: 0 0 0 0.1 0.1 0.001 0.001 0.001 0.001 hertzian_dipole_2D n
-
-python:
-for x in range (1, 20):
-    print('#snapshot: 0 0 0 0.1 0.1 0.001 0.001 0.001 0.001 {} hertzian_dipole_2D_snap{}'.format((x/5) * 1e-9, x))
-end_python:

user_models/heterogeneous_soil.in

@@ -1,44 +1,14 @@
-#title: Soil fractals
-#domain: 0.1 0.1 0.2
-#time_window: 10e-9
+#title: Heterogeneous soil using a stochastic distribution of dielectric properties given by a mixing model from Peplinski
+#domain: 0.15 0.15 0.1
 #dx_dy_dz: 0.001 0.001 0.001
+#time_window: 6e-9
 
-#soil_peplinski: 0.5 0.5 2.0 2.66 0.1 0.4 mySoil
-#fractal_box: 0.030 0.030 0.030 0.070 0.070 0.070 1.5 1 1 1 10 mySoil mySoilBox
+#waveform: ricker 1 1.5e9 my_ricker
+#hertzian_dipole: y 0.045 0.075 0.085 my_ricker
+#rx: 0.105 0.075 0.085
 
-xminus
-add_surface_roughness: 0.030 0.030 0.030 0.030 0.070 0.070 1 1 1 0.025 0.035 mySoilBox
-add_surface_water: 0.030 0.030 0.030 0.030 0.070 0.070 0.027 mySoilBox
+#soil_peplinski: 0.5 0.5 2.0 2.66 0.001 0.25 my_soil
+#fractal_box: 0 0 0 0.15 0.15 0.070 1.5 1 1 1 50 my_soil my_soil_box
+#add_surface_roughness: 0 0 0.070 0.15 0.15 0.070 1.5 1 1 0.065 0.080 my_soil_box
 
-xplus
-add_surface_roughness: 0.070 0.030 0.030 0.070 0.070 0.070 1 1 1 0.065 0.075 mySoilBox
-add_surface_water: 0.070 0.030 0.030 0.070 0.070 0.070 0.070 mySoilBox
-add_grass: 0.070 0.030 0.030 0.070 0.070 0.070 1.0 0.065 0.180 50 mySoilBox
-
-yminus
-add_surface_roughness: 0.030 0.030 0.030 0.070 0.030 0.070 1 1 1 0.025 0.035 mySoilBox
-add_surface_water: 0.030 0.030 0.030 0.070 0.030 0.070 0.027 mySoilBox
-
-yplus
-add_surface_roughness: 0.030 0.070 0.030 0.070 0.070 0.070 1 1 1 0.065 0.075 mySoilBox
-add_surface_water: 0.030 0.070 0.030 0.070 0.070 0.070 0.070 mySoilBox
-add_grass: 0.030 0.070 0.030 0.070 0.070 0.070 1.0 0.065 0.180 50 mySoilBox
-
-zminus
-add_surface_roughness: 0.030 0.030 0.030 0.070 0.070 0.030 1 1 1 0.025 0.035 mySoilBox
-add_surface_water: 0.030 0.030 0.030 0.070 0.070 0.030 0.027 mySoilBox
-
-zplus
-#add_surface_roughness: 0.030 0.030 0.070 0.070 0.070 0.070 1 1 1 0.065 0.075 mySoilBox
-add_surface_water: 0.030 0.030 0.070 0.070 0.070 0.070 0.070 mySoilBox
-add_grass: 0.050 0.050 0.070 0.055 0.055 0.070 1.0 0.070 0.180 5 mySoilBox
-#add_grass: 0.030 0.030 0.070 0.070 0.070 0.070 1.0 0.065 0.180 50 mySoilBox
-
-box: 0.080 0.000 0.070 0.120 0.200 0.110 free_space
-
-python:
-from gprMax.lib_antennas import antenna_like_GSSI_1500
-antenna_like_GSSI_1500(0.100, 0.100, 0.110)
-end_python:
-
-#geometry_view: 0 0 0 0.1 0.1 0.2 0.001 0.001 0.001 soil_fractals n
+#geometry_view: 0 0 0 0.15 0.15 0.1 0.001 0.001 0.001 heterogeneous_soil n