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

Removed unnecessary grid class instance argument to Material init.

浏览代码
这个提交包含在：
Craig Warren
2016-06-30 14:08:07 +01:00
父节点 46eafcb553
当前提交 f57fd5857e
共有 1 个文件被更改，包括 7 次插入 和 7 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

14
gprMax/input_cmds_geometry.py
查看文件

@@ -340,7 +340,7 @@ def process_geometrycmds(geometry, G):
numID = averagedmaterial.numID numID = averagedmaterial.numID
else: else:
numID = len(G.materials) numID = len(G.materials)
m = Material(numID, requiredID, G) m = Material(numID, requiredID)
# Create averaged constituents for material # Create averaged constituents for material
m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0) m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0)
m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0) m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0)
@@ -448,7 +448,7 @@ def process_geometrycmds(geometry, G):
numID = averagedmaterial.numID numID = averagedmaterial.numID
else: else:
numID = len(G.materials) numID = len(G.materials)
m = Material(numID, requiredID, G) m = Material(numID, requiredID)
# Create averaged constituents for material # Create averaged constituents for material
m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0) m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0)
m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0) m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0)
@@ -529,7 +529,7 @@ def process_geometrycmds(geometry, G):
numID = averagedmaterial.numID numID = averagedmaterial.numID
else: else:
numID = len(G.materials) numID = len(G.materials)
m = Material(numID, requiredID, G) m = Material(numID, requiredID)
# Create averaged constituents for material # Create averaged constituents for material
m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0) m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0)
m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0) m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0)
@@ -619,7 +619,7 @@ def process_geometrycmds(geometry, G):
numID = averagedmaterial.numID numID = averagedmaterial.numID
else: else:
numID = len(G.materials) numID = len(G.materials)
m = Material(numID, requiredID, G) m = Material(numID, requiredID)
# Create averaged constituents for material # Create averaged constituents for material
m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0) m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0)
m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0) m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0)
@@ -729,7 +729,7 @@ def process_geometrycmds(geometry, G):
numID = averagedmaterial.numID numID = averagedmaterial.numID
else: else:
numID = len(G.materials) numID = len(G.materials)
m = Material(numID, requiredID, G) m = Material(numID, requiredID)
# Create averaged constituents for material # Create averaged constituents for material
m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0) m.er = np.mean((materials[0].er, materials[1].er, materials[2].er), axis=0)
m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0) m.se = np.mean((materials[0].se, materials[1].se, materials[2].se), axis=0)
@@ -1022,7 +1022,7 @@ def process_geometrycmds(geometry, G):
# Check to see if water has been already defined as a material # Check to see if water has been already defined as a material
if not any(x.ID == 'water' for x in G.materials): if not any(x.ID == 'water' for x in G.materials):
m = Material(len(G.materials), 'water', G) m = Material(len(G.materials), 'water')
m.average = False m.average = False
m.er = Material.watereri m.er = Material.watereri
m.deltaer.append(Material.waterdeltaer) m.deltaer.append(Material.waterdeltaer)
@@ -1170,7 +1170,7 @@ def process_geometrycmds(geometry, G):
# Check to see if grass has been already defined as a material # Check to see if grass has been already defined as a material
if not any(x.ID == 'grass' for x in G.materials): if not any(x.ID == 'grass' for x in G.materials):
m = Material(len(G.materials), 'grass', G) m = Material(len(G.materials), 'grass')
m.average = False m.average = False
m.er = Material.grasseri m.er = Material.grasseri
m.deltaer.append(Material.grassdeltaer) m.deltaer.append(Material.grassdeltaer)