From 3f26d2d33e41e30fedb9b668f02e7874ecdc4702 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Tue, 11 Oct 2016 14:17:10 +0100 Subject: [PATCH] Further tweaks to dispersion analysis function. --- gprMax/grid.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gprMax/grid.py b/gprMax/grid.py index fa9b06ba..9efa6636 100644 --- a/gprMax/grid.py +++ b/gprMax/grid.py @@ -201,15 +201,17 @@ def dispersion_analysis(G): results['maxfreq'] = max(maxfreqs) # Find minimum wavelength (material with maximum permittivity) - ers = [] + maxer = 0 + matmaxer = '' for x in G.materials: if x.se != float('inf'): er = x.er if x.deltaer: er += max(x.deltaer) - ers.append(er) - maxer = max(ers) - results['material'] = next(x for x in G.materials if x.er == maxer and x.ID != 'pec') + if er > maxer: + maxer = er + matmaxer = x.ID + results['material'] = next(x for x in G.materials if x.ID == matmaxer) # Minimum velocity minvelocity = c / np.sqrt(maxer)