From 8891e89de5d660f55625ed7e715787bf6b199a27 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Wed, 30 Aug 2023 10:51:26 +0100 Subject: [PATCH] Corrected some bugs with 400MHz model --- examples/antenna_like_GSSI_400_fs.py | 15 +++++++++------ toolboxes/GPRAntennaModels/GSSI.py | 20 ++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/examples/antenna_like_GSSI_400_fs.py b/examples/antenna_like_GSSI_400_fs.py index 1477c12f..56c52b6b 100644 --- a/examples/antenna_like_GSSI_400_fs.py +++ b/examples/antenna_like_GSSI_400_fs.py @@ -30,7 +30,7 @@ scene = gprMax.Scene() title = gprMax.Title(name=fn.with_suffix("").name) domain = gprMax.Domain(p1=(x, y, z)) dxdydz = gprMax.Discretisation(p1=(dl, dl, dl)) -time_window = gprMax.TimeWindow(time=6e-9) +time_window = gprMax.TimeWindow(time=15e-9) scene.add(title) scene.add(domain) @@ -44,17 +44,20 @@ for obj in gssi_objects: scene.add(obj) gv1 = gprMax.GeometryView( - p1=(0, 0, 0), p2=(x, y, z), dl=(dl, dl, dl), filename="antenna_like_GSSI_400", output_type="n" + p1=(0, 0, 0), + p2=(x, y, z), + dl=(dl, dl, dl), + filename="antenna_like_GSSI_400", output_type="n" ) gv2 = gprMax.GeometryView( - p1=(ant_pos[0] - 0.150 / 2, ant_pos[1] - 0.150 / 2, ant_pos[2] - 0.050), - p2=(ant_pos[0] + 0.150 / 2, ant_pos[1] + 0.150 / 2, ant_pos[2] + 0.010), + p1=(ant_pos[0] - 0.150, ant_pos[1] - 0.150, ant_pos[2]), + p2=(ant_pos[0] + 0.150, ant_pos[1] + 0.150, ant_pos[2] + 0.050), dl=(dl, dl, dl), filename="antenna_like_GSSI_400_pcb", output_type="f", ) -scene.add(gv1) -scene.add(gv2) +#scene.add(gv1) +#scene.add(gv2) # Run model gprMax.run(scenes=[scene], geometry_only=False, outputfile=fn, gpu=None) diff --git a/toolboxes/GPRAntennaModels/GSSI.py b/toolboxes/GPRAntennaModels/GSSI.py index 6273d61a..58bf1c9e 100644 --- a/toolboxes/GPRAntennaModels/GSSI.py +++ b/toolboxes/GPRAntennaModels/GSSI.py @@ -770,20 +770,18 @@ def antenna_like_GSSI_400(x, y, z, resolution=0.002, **kwargs): scene_objects.extend((b15, b16)) # Source - # Excitation - Gaussian pulse - w1 = gprMax.Waveform(wave_type="gaussian", amp=1, freq=excitationfreq, id="my_gaussian") - scene_objects.append(w1) - if src_type == "voltage_source": + w1 = gprMax.Waveform(wave_type="gaussian", amp=1, freq=excitationfreq, id="my_gaussian") vs1 = gprMax.VoltageSource( polarisation="y", p1=(tx[0], tx[1], tx[2]), resistance=sourceresistance, waveform_id="my_gaussian" ) - scene_objects.append(vs1) + scene_objects.extend((w1, vs1)) elif src_type == "transmission_line": + w1 = gprMax.Waveform(wave_type="gaussian", amp=1, freq=excitationfreq, id="my_gaussian") tl1 = gprMax.TransmissionLine( polarisation="y", p1=(tx[0], tx[1], tx[2]), resistance=sourceresistance, waveform_id="my_gaussian" ) - scene_objects.append(tl1) + scene_objects.extend((w1, tl1)) else: # Optimised custom pulse exc1 = gprMax.ExcitationFile( @@ -795,19 +793,17 @@ def antenna_like_GSSI_400(x, y, z, resolution=0.002, **kwargs): scene_objects.extend((exc1, vs1)) # Receiver - # Zero waveform to use with transmission line at receiver output - w2 = gprMax.Waveform(wave_type="gaussian", amp=0, freq=excitationfreq, id="my_zero_wave") - scene_objects.append(w2) - if src_type == "transmission_line": + # Zero waveform to use with transmission line at receiver output + w2 = gprMax.Waveform(wave_type="gaussian", amp=0, freq=excitationfreq, id="my_zero_wave") tl2 = gprMax.TransmissionLine( polarisation="y", p1=(tx[0] + 0.162, tx[1], tx[2]), resistance=receiverresistance, waveform_id="my_zero_wave", ) - scene_objects.append(tl2) - elif src_type == "voltage_source": + scene_objects.extend((w2, tl2)) + else: r1 = gprMax.Rx(p1=(tx[0] + 0.162, tx[1], tx[2]), id="rxbowtie", outputs="Ey") scene_objects.append(r1)