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

Changed polarisation matching from 'is' to '=='

浏览代码 
Added use of magnetic source update coefficient for MagneticDipole class.
Added explicit dl property to HertzianDipole class.
这个提交包含在：
Craig Warren
2016-12-05 15:25:51 +00:00
父节点 ca2a6f48d2
当前提交 7ea809b2ef
共有 1 个文件被更改，包括 26 次插入 和 27 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

53
gprMax/sources.py
查看文件

@@ -67,24 +67,22 @@ class VoltageSource(Source):
j = self.ycoord j = self.ycoord
k = self.zcoord k = self.zcoord
waveform = next(x for x in G.waveforms if x.ID == self.waveformID) waveform = next(x for x in G.waveforms if x.ID == self.waveformID)
componentID = 'E' + self.polarisation
if self.polarisation is 'x': if self.polarisation == 'x':
if self.resistance != 0: if self.resistance != 0:
componentID = 'E' + self.polarisation
Ex[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (self.resistance * G.dy * G.dz)) Ex[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (self.resistance * G.dy * G.dz))
else: else:
Ex[i, j, k] = -1 * waveform.amp * waveform.calculate_value(time, G.dt) / G.dx Ex[i, j, k] = -1 * waveform.amp * waveform.calculate_value(time, G.dt) / G.dx
elif self.polarisation is 'y': elif self.polarisation == 'y':
if self.resistance != 0: if self.resistance != 0:
componentID = 'E' + self.polarisation
Ey[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (self.resistance * G.dx * G.dz)) Ey[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (self.resistance * G.dx * G.dz))
else: else:
Ey[i, j, k] = -1 * waveform.amp * waveform.calculate_value(time, G.dt) / G.dy Ey[i, j, k] = -1 * waveform.amp * waveform.calculate_value(time, G.dt) / G.dy
elif self.polarisation is 'z': elif self.polarisation == 'z':
if self.resistance != 0: if self.resistance != 0:
componentID = 'E' + self.polarisation
Ez[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (self.resistance * G.dx * G.dy)) Ez[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (self.resistance * G.dx * G.dy))
else: else:
Ez[i, j, k] = -1 * waveform.amp * waveform.calculate_value(time, G.dt) / G.dz Ez[i, j, k] = -1 * waveform.amp * waveform.calculate_value(time, G.dt) / G.dz
@@ -127,6 +125,7 @@ class HertzianDipole(Source):
def __init__(self): def __init__(self):
super(Source, self).__init__() super(Source, self).__init__()
self.dl = None
def update_electric(self, abstime, updatecoeffsE, ID, Ex, Ey, Ez, G): def update_electric(self, abstime, updatecoeffsE, ID, Ex, Ey, Ez, G):
"""Updates electric field values for a Hertzian dipole. """Updates electric field values for a Hertzian dipole.
@@ -146,18 +145,16 @@ class HertzianDipole(Source):
j = self.ycoord j = self.ycoord
k = self.zcoord k = self.zcoord
waveform = next(x for x in G.waveforms if x.ID == self.waveformID) waveform = next(x for x in G.waveforms if x.ID == self.waveformID)
componentID = 'E' + self.polarisation
if self.polarisation is 'x': if self.polarisation == 'x':
componentID = 'E' + self.polarisation Ex[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * self.dl * (1 / (G.dx * G.dy * G.dz))
Ex[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (G.dy * G.dz))
elif self.polarisation is 'y': elif self.polarisation == 'y':
componentID = 'E' + self.polarisation Ey[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * self.dl * (1 / (G.dx * G.dy * G.dz))
Ey[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (G.dx * G.dz))
elif self.polarisation is 'z': elif self.polarisation == 'z':
componentID = 'E' + self.polarisation Ez[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * self.dl * (1 / (G.dx * G.dy * G.dz))
Ez[i, j, k] -= updatecoeffsE[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (G.dx * G.dy))
class MagneticDipole(Source): class MagneticDipole(Source):
@@ -184,15 +181,17 @@ class MagneticDipole(Source):
j = self.ycoord j = self.ycoord
k = self.zcoord k = self.zcoord
waveform = next(x for x in G.waveforms if x.ID == self.waveformID) waveform = next(x for x in G.waveforms if x.ID == self.waveformID)
componentID = 'H' + self.polarisation
if self.polarisation is 'x': if self.polarisation == 'x':
Hx[i, j, k] -= waveform.amp * waveform.calculate_value(time, G.dt) * (G.dt / (G.dx * G.dy * G.dz)) Hx[i, j, k] -= updatecoeffsH[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (G.dx * G.dy * G.dz))
elif self.polarisation is 'y': elif self.polarisation == 'y':
Hy[i, j, k] -= waveform.amp * waveform.calculate_value(time, G.dt) * (G.dt / (G.dx * G.dy * G.dz))
Hy[i, j, k] -= updatecoeffsH[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (G.dx * G.dy * G.dz))
elif self.polarisation is 'z': elif self.polarisation == 'z':
Hz[i, j, k] -= waveform.amp * waveform.calculate_value(time, G.dt) * (G.dt / (G.dx * G.dy * G.dz)) Hz[i, j, k] -= updatecoeffsH[ID[G.IDlookup[componentID], i, j, k], 4] * waveform.amp * waveform.calculate_value(time, G.dt) * (1 / (G.dx * G.dy * G.dz))
class TransmissionLine(Source): class TransmissionLine(Source):
@@ -315,13 +314,13 @@ class TransmissionLine(Source):
self.update_voltage(time, G) self.update_voltage(time, G)
if self.polarisation is 'x': if self.polarisation == 'x':
Ex[i, j, k] = - self.voltage[self.antpos] / G.dx Ex[i, j, k] = - self.voltage[self.antpos] / G.dx
elif self.polarisation is 'y': elif self.polarisation == 'y':
Ey[i, j, k] = - self.voltage[self.antpos] / G.dy Ey[i, j, k] = - self.voltage[self.antpos] / G.dy
elif self.polarisation is 'z': elif self.polarisation == 'z':
Ez[i, j, k] = - self.voltage[self.antpos] / G.dz Ez[i, j, k] = - self.voltage[self.antpos] / G.dz
def update_magnetic(self, abstime, updatecoeffsH, ID, Hx, Hy, Hz, G): def update_magnetic(self, abstime, updatecoeffsH, ID, Hx, Hy, Hz, G):
@@ -342,13 +341,13 @@ class TransmissionLine(Source):
j = self.ycoord j = self.ycoord
k = self.zcoord k = self.zcoord
if self.polarisation is 'x': if self.polarisation == 'x':
self.current[self.antpos] = Ix(i, j, k, G.Hy, G.Hz, G) self.current[self.antpos] = Ix(i, j, k, G.Hy, G.Hz, G)
elif self.polarisation is 'y': elif self.polarisation == 'y':
self.current[self.antpos] = Iy(i, j, k, G.Hx, G.Hz, G) self.current[self.antpos] = Iy(i, j, k, G.Hx, G.Hz, G)
elif self.polarisation is 'z': elif self.polarisation == 'z':
self.current[self.antpos] = Iz(i, j, k, G.Hx, G.Hy, G) self.current[self.antpos] = Iz(i, j, k, G.Hx, G.Hy, G)
self.update_current(time, G) self.update_current(time, G)