你已经派生过 gprMax
镜像自地址
https://gitee.com/sunhf/gprMax.git
已同步 2025-08-07 04:56:51 +08:00
Changed separator for averaged material names from vertical bar (|) to a plus sign (+).
这个提交包含在:
@@ -284,7 +284,7 @@ def process_geometrycmds(geometry, G):
|
||||
numIDx = materials[0].numID
|
||||
numIDy = materials[1].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]
|
||||
if averagedmaterial:
|
||||
numID = averagedmaterial.numID
|
||||
@@ -392,7 +392,7 @@ def process_geometrycmds(geometry, G):
|
||||
numIDx = materials[0].numID
|
||||
numIDy = materials[1].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]
|
||||
if averagedmaterial:
|
||||
numID = averagedmaterial.numID
|
||||
@@ -473,7 +473,7 @@ def process_geometrycmds(geometry, G):
|
||||
numIDx = materials[0].numID
|
||||
numIDy = materials[1].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]
|
||||
if averagedmaterial:
|
||||
numID = averagedmaterial.numID
|
||||
@@ -563,7 +563,7 @@ def process_geometrycmds(geometry, G):
|
||||
numIDx = materials[0].numID
|
||||
numIDy = materials[1].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]
|
||||
if averagedmaterial:
|
||||
numID = averagedmaterial.numID
|
||||
@@ -673,7 +673,7 @@ def process_geometrycmds(geometry, G):
|
||||
numIDx = materials[0].numID
|
||||
numIDy = materials[1].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]
|
||||
if averagedmaterial:
|
||||
numID = averagedmaterial.numID
|
||||
|
@@ -50,9 +50,9 @@ cpdef build_ex_component(np.uint32_t[:, :, :] solid, np.int8_t[:, :, :, :] rigid
|
||||
else:
|
||||
# Averaging is required
|
||||
# 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
|
||||
tmp = requiredID.split('|')
|
||||
tmp = requiredID.split('+')
|
||||
material = [x for x in G.materials if
|
||||
x.ID.count(tmp[0]) == requiredID.count(tmp[0]) 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:
|
||||
# Averaging is required
|
||||
# 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
|
||||
tmp = requiredID.split('|')
|
||||
tmp = requiredID.split('+')
|
||||
material = [x for x in G.materials if
|
||||
x.ID.count(tmp[0]) == requiredID.count(tmp[0]) 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:
|
||||
# Averaging is required
|
||||
# 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
|
||||
tmp = requiredID.split('|')
|
||||
tmp = requiredID.split('+')
|
||||
material = [x for x in G.materials if
|
||||
x.ID.count(tmp[0]) == requiredID.count(tmp[0]) 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:
|
||||
# Averaging is required
|
||||
# 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
|
||||
tmp = requiredID.split('|')
|
||||
tmp = requiredID.split('+')
|
||||
material = [x for x in G.materials if
|
||||
(x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
|
||||
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:
|
||||
# Averaging is required
|
||||
# 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
|
||||
tmp = requiredID.split('|')
|
||||
tmp = requiredID.split('+')
|
||||
material = [x for x in G.materials if
|
||||
(x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
|
||||
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:
|
||||
# Averaging is required
|
||||
# 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
|
||||
tmp = requiredID.split('|')
|
||||
tmp = requiredID.split('+')
|
||||
material = [x for x in G.materials if
|
||||
(x.ID.count(tmp[0]) == requiredID.count(tmp[0]) and
|
||||
x.ID.count(tmp[1]) == requiredID.count(tmp[1])) or
|
||||
|
在新工单中引用
屏蔽一个用户