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

Changed separator for averaged material names from vertical bar (|) to a plus sign (+).

浏览代码
这个提交包含在：
Craig Warren
2016-01-22 12:43:28 +00:00
父节点 5f035b19e8
当前提交 bfc6883ffb
共有 2 个文件被更改，包括 17 次插入 和 17 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

10
gprMax/input_cmds_geometry.py
查看文件

@@ -284,7 +284,7 @@ def process_geometrycmds(geometry, G):
numIDx = materials[0].numID numIDx = materials[0].numID
numIDy = materials[1].numID numIDy = materials[1].numID
numIDz = materials[2].numID numIDz = materials[2].numID
requiredID = materials[0].ID + '|' + materials[1].ID + '|' + materials[2].ID requiredID = materials[0].ID + '+' + materials[1].ID + '+' + materials[2].ID
averagedmaterial = [x for x in G.materials if x.ID == requiredID] averagedmaterial = [x for x in G.materials if x.ID == requiredID]
if averagedmaterial: if averagedmaterial:
numID = averagedmaterial.numID numID = averagedmaterial.numID
@@ -392,7 +392,7 @@ def process_geometrycmds(geometry, G):
numIDx = materials[0].numID numIDx = materials[0].numID
numIDy = materials[1].numID numIDy = materials[1].numID
numIDz = materials[2].numID numIDz = materials[2].numID
requiredID = materials[0].ID + '|' + materials[1].ID + '|' + materials[2].ID requiredID = materials[0].ID + '+' + materials[1].ID + '+' + materials[2].ID
averagedmaterial = [x for x in G.materials if x.ID == requiredID] averagedmaterial = [x for x in G.materials if x.ID == requiredID]
if averagedmaterial: if averagedmaterial:
numID = averagedmaterial.numID numID = averagedmaterial.numID
@@ -473,7 +473,7 @@ def process_geometrycmds(geometry, G):
numIDx = materials[0].numID numIDx = materials[0].numID
numIDy = materials[1].numID numIDy = materials[1].numID
numIDz = materials[2].numID numIDz = materials[2].numID
requiredID = materials[0].ID + '|' + materials[1].ID + '|' + materials[2].ID requiredID = materials[0].ID + '+' + materials[1].ID + '+' + materials[2].ID
averagedmaterial = [x for x in G.materials if x.ID == requiredID] averagedmaterial = [x for x in G.materials if x.ID == requiredID]
if averagedmaterial: if averagedmaterial:
numID = averagedmaterial.numID numID = averagedmaterial.numID
@@ -563,7 +563,7 @@ def process_geometrycmds(geometry, G):
numIDx = materials[0].numID numIDx = materials[0].numID
numIDy = materials[1].numID numIDy = materials[1].numID
numIDz = materials[2].numID numIDz = materials[2].numID
requiredID = materials[0].ID + '|' + materials[1].ID + '|' + materials[2].ID requiredID = materials[0].ID + '+' + materials[1].ID + '+' + materials[2].ID
averagedmaterial = [x for x in G.materials if x.ID == requiredID] averagedmaterial = [x for x in G.materials if x.ID == requiredID]
if averagedmaterial: if averagedmaterial:
numID = averagedmaterial.numID numID = averagedmaterial.numID
@@ -673,7 +673,7 @@ def process_geometrycmds(geometry, G):
numIDx = materials[0].numID numIDx = materials[0].numID
numIDy = materials[1].numID numIDy = materials[1].numID
numIDz = materials[2].numID numIDz = materials[2].numID
requiredID = materials[0].ID + '|' + materials[1].ID + '|' + materials[2].ID requiredID = materials[0].ID + '+' + materials[1].ID + '+' + materials[2].ID
averagedmaterial = [x for x in G.materials if x.ID == requiredID] averagedmaterial = [x for x in G.materials if x.ID == requiredID]
if averagedmaterial: if averagedmaterial:
numID = averagedmaterial.numID numID = averagedmaterial.numID

24
gprMax/yee_cell_build.pyx
查看文件

@@ -50,9 +50,9 @@ cpdef build_ex_component(np.uint32_t[:, :, :] solid, np.int8_t[:, :, :, :] rigid
else: else:
# Averaging is required # Averaging is required
# Make an ID composed of the names of the four materials that will be averaged # Make an ID composed of the names of the four materials that will be averaged
requiredID = G.materials[numID1].ID + '|' + G.materials[numID2].ID + '|' + G.materials[numID3].ID + '|' + G.materials[numID4].ID requiredID = G.materials[numID1].ID + '+' + G.materials[numID2].ID + '+' + G.materials[numID3].ID + '+' + G.materials[numID4].ID
# Check if this material already exists # Check if this material already exists
tmp = requiredID.split('|') tmp = requiredID.split('+')
material = [x for x in G.materials if material = [x for x in G.materials if
x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
x.ID.count(tmp[1]) == requiredID.count(tmp[1]) and x.ID.count(tmp[1]) == requiredID.count(tmp[1]) and
@@ -103,9 +103,9 @@ cpdef build_ey_component(np.uint32_t[:, :, :] solid, np.int8_t[:, :, :, :] rigid
else: else:
# Averaging is required # Averaging is required
# Make an ID composed of the names of the four materials that will be averaged # Make an ID composed of the names of the four materials that will be averaged
requiredID = G.materials[numID1].ID + '|' + G.materials[numID2].ID + '|' + G.materials[numID3].ID + '|' + G.materials[numID4].ID requiredID = G.materials[numID1].ID + '+' + G.materials[numID2].ID + '+' + G.materials[numID3].ID + '+' + G.materials[numID4].ID
# Check if this material already exists # Check if this material already exists
tmp = requiredID.split('|') tmp = requiredID.split('+')
material = [x for x in G.materials if material = [x for x in G.materials if
x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
x.ID.count(tmp[1]) == requiredID.count(tmp[1]) and x.ID.count(tmp[1]) == requiredID.count(tmp[1]) and
@@ -156,9 +156,9 @@ cpdef build_ez_component(np.uint32_t[:, :, :] solid, np.int8_t[:, :, :, :] rigid
else: else:
# Averaging is required # Averaging is required
# Make an ID composed of the names of the four materials that will be averaged # Make an ID composed of the names of the four materials that will be averaged
requiredID = G.materials[numID1].ID + '|' + G.materials[numID2].ID + '|' + G.materials[numID3].ID + '|' + G.materials[numID4].ID requiredID = G.materials[numID1].ID + '+' + G.materials[numID2].ID + '+' + G.materials[numID3].ID + '+' + G.materials[numID4].ID
# Check if this material already exists # Check if this material already exists
tmp = requiredID.split('|') tmp = requiredID.split('+')
material = [x for x in G.materials if material = [x for x in G.materials if
x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
x.ID.count(tmp[1]) == requiredID.count(tmp[1]) and x.ID.count(tmp[1]) == requiredID.count(tmp[1]) and
@@ -207,9 +207,9 @@ cpdef build_hx_component(np.uint32_t[:, :, :] solid, np.int8_t[:, :, :, :] rigid
else: else:
# Averaging is required # Averaging is required
# Make an ID composed of the names of the four materials that will be averaged # Make an ID composed of the names of the four materials that will be averaged
requiredID = G.materials[numID1].ID + '|' + G.materials[numID2].ID requiredID = G.materials[numID1].ID + '+' + G.materials[numID2].ID
# Check if this material already exists # Check if this material already exists
tmp = requiredID.split('|') tmp = requiredID.split('+')
material = [x for x in G.materials if material = [x for x in G.materials if
(x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and (x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
x.ID.count(tmp[1]) == requiredID.count(tmp[1])) or x.ID.count(tmp[1]) == requiredID.count(tmp[1])) or
@@ -257,9 +257,9 @@ cpdef build_hy_component(np.uint32_t[:, :, :] solid, np.int8_t[:, :, :, :] rigid
else: else:
# Averaging is required # Averaging is required
# Make an ID composed of the names of the four materials that will be averaged # Make an ID composed of the names of the four materials that will be averaged
requiredID = G.materials[numID1].ID + '|' + G.materials[numID2].ID requiredID = G.materials[numID1].ID + '+' + G.materials[numID2].ID
# Check if this material already exists # Check if this material already exists
tmp = requiredID.split('|') tmp = requiredID.split('+')
material = [x for x in G.materials if material = [x for x in G.materials if
(x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and (x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
x.ID.count(tmp[1]) == requiredID.count(tmp[1])) or x.ID.count(tmp[1]) == requiredID.count(tmp[1])) or
@@ -307,9 +307,9 @@ cpdef build_hz_component(np.uint32_t[:, :, :] solid, np.int8_t[:, :, :, :] rigid
else: else:
# Averaging is required # Averaging is required
# Make an ID composed of the names of the four materials that will be averaged # Make an ID composed of the names of the four materials that will be averaged
requiredID = G.materials[numID1].ID + '|' + G.materials[numID2].ID requiredID = G.materials[numID1].ID + '+' + G.materials[numID2].ID
# Check if this material already exists # Check if this material already exists
tmp = requiredID.split('|') tmp = requiredID.split('+')
material = [x for x in G.materials if material = [x for x in G.materials if
(x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and (x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
x.ID.count(tmp[1]) == requiredID.count(tmp[1])) or x.ID.count(tmp[1]) == requiredID.count(tmp[1])) or