publicImage/gprMax
1
0
派生 0
镜像自地址 https://gitee.com/sunhf/gprMax.git 已同步 2025-08-08 07:24:19 +08:00
代码 工单 软件包 项目 版本发布 百科 动态

Fix wrongly placed parenthesis.

浏览代码
这个提交包含在：
Craig Warren
2022-01-18 14:39:48 +00:00
父节点 b5009a204f
当前提交 279a353bec
共有 1 个文件被更改，包括 14 次插入 和 14 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

28
gprMax/cmds_multiuse.py
查看文件

@@ -235,17 +235,17 @@ class VoltageSource(UserObjectMulti):
logger.exception(self.params_str() + (' polarisation must be ' logger.exception(self.params_str() + (' polarisation must be '
'x, y, or z.')) 'x, y, or z.'))
raise ValueError raise ValueError
if '2D TMx' in (config.get_model_config().mode and if ('2D TMx' in config.get_model_config().mode and
(polarisation == 'y' or polarisation == 'z')): (polarisation == 'y' or polarisation == 'z')):
logger.exception(self.params_str() + (' polarisation must be x in ' logger.exception(self.params_str() + (' polarisation must be x in '
'2D TMx mode.')) '2D TMx mode.'))
raise ValueError raise ValueError
elif '2D TMy' in (config.get_model_config().mode and elif ('2D TMy' in config.get_model_config().mode and
(polarisation == 'x' or polarisation == 'z')): (polarisation == 'x' or polarisation == 'z')):
logger.exception(self.params_str() + (' polarisation must be y in ' logger.exception(self.params_str() + (' polarisation must be y in '
'2D TMy mode.')) '2D TMy mode.'))
raise ValueError raise ValueError
elif '2D TMz' in (config.get_model_config().mode and elif ('2D TMz' in config.get_model_config().mode and
(polarisation == 'x' or polarisation == 'y')): (polarisation == 'x' or polarisation == 'y')):
logger.exception(self.params_str() + (' polarisation must be z in ' logger.exception(self.params_str() + (' polarisation must be z in '
'2D TMz mode.')) '2D TMz mode.'))
@@ -371,17 +371,17 @@ class HertzianDipole(UserObjectMulti):
logger.exception(self.params_str() + (' polarisation must be ' logger.exception(self.params_str() + (' polarisation must be '
'x, y, or z.')) 'x, y, or z.'))
raise ValueError raise ValueError
if '2D TMx' in (config.get_model_config().mode and if ('2D TMx' in config.get_model_config().mode and
(polarisation == 'y' or polarisation == 'z')): (polarisation == 'y' or polarisation == 'z')):
logger.exception(self.params_str() + (' polarisation must be x in ' logger.exception(self.params_str() + (' polarisation must be x in '
'2D TMx mode.')) '2D TMx mode.'))
raise ValueError raise ValueError
elif '2D TMy' in (config.get_model_config().mode and elif ('2D TMy' in config.get_model_config().mode and
(polarisation == 'x' or polarisation == 'z')): (polarisation == 'x' or polarisation == 'z')):
logger.exception(self.params_str() + (' polarisation must be y in ' logger.exception(self.params_str() + (' polarisation must be y in '
'2D TMy mode.')) '2D TMy mode.'))
raise ValueError raise ValueError
elif '2D TMz' in (config.get_model_config().mode and elif ('2D TMz' in config.get_model_config().mode and
(polarisation == 'x' or polarisation == 'y')): (polarisation == 'x' or polarisation == 'y')):
logger.exception(self.params_str() + (' polarisation must be z in ' logger.exception(self.params_str() + (' polarisation must be z in '
'2D TMz mode.')) '2D TMz mode.'))
@@ -518,17 +518,17 @@ class MagneticDipole(UserObjectMulti):
logger.exception(self.params_str() + (' polarisation must be ' logger.exception(self.params_str() + (' polarisation must be '
'x, y, or z.')) 'x, y, or z.'))
raise ValueError raise ValueError
if '2D TMx' in (config.get_model_config().mode and if ('2D TMx' in config.get_model_config().mode and
(polarisation == 'y' or polarisation == 'z')): (polarisation == 'y' or polarisation == 'z')):
logger.exception(self.params_str() + (' polarisation must be x in ' logger.exception(self.params_str() + (' polarisation must be x in '
'2D TMx mode.')) '2D TMx mode.'))
raise ValueError raise ValueError
elif '2D TMy' in (config.get_model_config().mode and elif ('2D TMy' in config.get_model_config().mode and
(polarisation == 'x' or polarisation == 'z')): (polarisation == 'x' or polarisation == 'z')):
logger.exception(self.params_str() + (' polarisation must be y in ' logger.exception(self.params_str() + (' polarisation must be y in '
'2D TMy mode.')) '2D TMy mode.'))
raise ValueError raise ValueError
elif '2D TMz' in (config.get_model_config().mode and elif ('2D TMz' in config.get_model_config().mode and
(polarisation == 'x' or polarisation == 'y')): (polarisation == 'x' or polarisation == 'y')):
logger.exception(self.params_str() + (' polarisation must be z in ' logger.exception(self.params_str() + (' polarisation must be z in '
'2D TMz mode.')) '2D TMz mode.'))
@@ -658,17 +658,17 @@ class TransmissionLine(UserObjectMulti):
logger.exception(self.params_str() + (' polarisation must be ' logger.exception(self.params_str() + (' polarisation must be '
'x, y, or z.')) 'x, y, or z.'))
raise ValueError raise ValueError
if '2D TMx' in (config.get_model_config().mode and if ('2D TMx' in config.get_model_config().mode and
(polarisation == 'y' or polarisation == 'z')): (polarisation == 'y' or polarisation == 'z')):
logger.exception(self.params_str() + (' polarisation must be x in ' logger.exception(self.params_str() + (' polarisation must be x in '
'2D TMx mode.')) '2D TMx mode.'))
raise ValueError raise ValueError
elif '2D TMy' in (config.get_model_config().mode and elif ('2D TMy' in config.get_model_config().mode and
(polarisation == 'x' or polarisation == 'z')): (polarisation == 'x' or polarisation == 'z')):
logger.exception(self.params_str() + (' polarisation must be y in ' logger.exception(self.params_str() + (' polarisation must be y in '
'2D TMy mode.')) '2D TMy mode.'))
raise ValueError raise ValueError
elif '2D TMz' in (config.get_model_config().mode and elif ('2D TMz' in config.get_model_config().mode and
(polarisation == 'x' or polarisation == 'y')): (polarisation == 'x' or polarisation == 'y')):
logger.exception(self.params_str() + (' polarisation must be z in ' logger.exception(self.params_str() + (' polarisation must be z in '
'2D TMz mode.')) '2D TMz mode.'))
@@ -1196,8 +1196,8 @@ class AddLorentzDispersion(UserObjectMulti):
try: try:
poles = self.kwargs['poles'] poles = self.kwargs['poles']
er_delta = self.kwargs['er_delta'] er_delta = self.kwargs['er_delta']
tau = self.kwargs['omega'] tau = self.kwargs['tau']
alpha = self.kwargs['delta'] alpha = self.kwargs['alpha']
material_ids = self.kwargs['material_ids'] material_ids = self.kwargs['material_ids']
except KeyError: except KeyError:
logger.exception(self.params_str() + ' requires at least five ' logger.exception(self.params_str() + ' requires at least five '