From 4f31debf7030be09d5606f296af6f2c182eba611 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Thu, 14 Jul 2016 13:19:03 +0100 Subject: [PATCH] Change to allow user pec-like material to be created in external material file. --- gprMax/input_cmds_multiuse.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gprMax/input_cmds_multiuse.py b/gprMax/input_cmds_multiuse.py index bd5d9b3f..55757942 100644 --- a/gprMax/input_cmds_multiuse.py +++ b/gprMax/input_cmds_multiuse.py @@ -487,8 +487,12 @@ def process_multicmds(multicmds, G): raise CmdInputError("'" + cmdname + ': ' + ' '.join(tmp) + "'" + ' requires exactly five parameters') if float(tmp[0]) < 0: raise CmdInputError("'" + cmdname + ': ' + ' '.join(tmp) + "'" + ' requires a positive value for static (DC) permittivity') - if float(tmp[1]) < 0: - raise CmdInputError("'" + cmdname + ': ' + ' '.join(tmp) + "'" + ' requires a positive value for conductivity') + if tmp[1] != 'inf': + se = float(tmp[1]) + if se < 0: + raise CmdInputError("'" + cmdname + ': ' + ' '.join(tmp) + "'" + ' requires a positive value for conductivity') + else: + se = float('inf') if float(tmp[2]) < 0: raise CmdInputError("'" + cmdname + ': ' + ' '.join(tmp) + "'" + ' requires a positive value for permeability') if float(tmp[3]) < 0: @@ -499,7 +503,7 @@ def process_multicmds(multicmds, G): # Create a new instance of the Material class material (start index after pec & free_space) m = Material(len(G.materials), tmp[4]) m.er = float(tmp[0]) - m.se = float(tmp[1]) + m.se = se m.mr = float(tmp[2]) m.sm = float(tmp[3])