Formatting cleanups.

这个提交包含在:
Craig Warren
2017-01-26 16:23:29 +00:00
父节点 1cb71fdb2c
当前提交 c03b5efa63
共有 25 个文件被更改,包括 322 次插入328 次删除

查看文件

@@ -6,13 +6,13 @@ from gprMax.waveforms import Waveform
def hertzian_dipole_fs(iterations, dt, dxdydz, rx):
"""Analytical solution of a z-directed Hertzian dipole in free space with a Gaussian current waveform (http://dx.doi.org/10.1016/0021-9991(83)90103-1).
Args:
iterations (int): Number of time steps.
dt (float): Time step (seconds).
dxdydz (float): Tuple of spatial resolution (metres).
rx (float): Tuple of coordinates of receiver position relative to transmitter position (metres).
Returns:
fields (float): Array contain electric and magnetic field components.
"""
@@ -22,7 +22,7 @@ def hertzian_dipole_fs(iterations, dt, dxdydz, rx):
w.type = 'gaussiandot'
w.amp = 1
w.freq = 1e9
# Waveform integral
wint = Waveform()
wint.type = 'gaussian'
@@ -43,7 +43,7 @@ def hertzian_dipole_fs(iterations, dt, dxdydz, rx):
dx = dxdydz[0]
dy = dxdydz[1]
dz = dxdydz[2]
# Length of Hertzian dipole
dl = dz
@@ -103,35 +103,35 @@ def hertzian_dipole_fs(iterations, dt, dxdydz, rx):
# Calculate fields
for timestep in range(iterations):
# Calculate values for waveform, I * dl (current multiplied by dipole length) to match gprMax behaviour
fint_Ex = wint.calculate_value((timestep * dt) - tau_Ex, dt) * dl
f_Ex = w.calculate_value((timestep * dt) - tau_Ex, dt) * dl
fdot_Ex = wdot.calculate_value((timestep * dt) - tau_Ex, dt) * dl
fint_Ey = wint.calculate_value((timestep * dt) - tau_Ey, dt) * dl
f_Ey= w.calculate_value((timestep * dt) - tau_Ey, dt) * dl
f_Ey = w.calculate_value((timestep * dt) - tau_Ey, dt) * dl
fdot_Ey = wdot.calculate_value((timestep * dt) - tau_Ey, dt) * dl
fint_Ez = wint.calculate_value((timestep * dt) - tau_Ez, dt) * dl
f_Ez = w.calculate_value((timestep * dt) - tau_Ez, dt) * dl
fdot_Ez = wdot.calculate_value((timestep * dt) - tau_Ez, dt) * dl
fint_Hx = wint.calculate_value((timestep * dt) - tau_Hx, dt) * dl
f_Hx = w.calculate_value((timestep * dt) - tau_Hx, dt) * dl
fdot_Hx = wdot.calculate_value((timestep * dt) - tau_Hx, dt) * dl
fint_Hy = wint.calculate_value((timestep * dt) - tau_Hy, dt) * dl
f_Hy= w.calculate_value((timestep * dt) - tau_Hy, dt) * dl
f_Hy = w.calculate_value((timestep * dt) - tau_Hy, dt) * dl
fdot_Hy = wdot.calculate_value((timestep * dt) - tau_Hy, dt) * dl
fint_Hz = wint.calculate_value((timestep * dt) - tau_Hz, dt) * dl
f_Hz = w.calculate_value((timestep * dt) - tau_Hz, dt) * dl
fdot_Hz = wdot.calculate_value((timestep * dt) - tau_Hz, dt) * dl
# Ex
fields[timestep, 0] = ((Ex_x * Ex_z) / (4 * np.pi * e0 * Er_x**5)) * (3 * (fint_Ex + (tau_Ex * f_Ex)) + (tau_Ex**2 * fdot_Ex))
# Ey
try:
tmp = Ey_y / Ey_x
@@ -156,4 +156,3 @@ def hertzian_dipole_fs(iterations, dt, dxdydz, rx):
fields[timestep, 5] = 0
return fields

查看文件

@@ -23,7 +23,7 @@ baseresult = np.load(args.baseresult)
# Get machine/CPU/OS details
try:
machineIDlong = str(baseresult['machineID'])
#machineIDlong = 'Dell PowerEdge R630; Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz; Linux (3.10.0-327.18.2.el7.x86_64)' # Use to manually describe machine
# machineIDlong = 'Dell PowerEdge R630; Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz; Linux (3.10.0-327.18.2.el7.x86_64)' # Use to manually describe machine
machineID = machineIDlong.split(';')[0]
except KeyError:
hostinfo = get_host_info()
@@ -112,5 +112,3 @@ ax.set_ylim(bottom=1, top=ax.get_ylim()[1] * 1.1)
fig.savefig(os.path.join(os.path.dirname(args.baseresult), machineID.replace(' ', '_') + '.png'), dpi=150, format='png', bbox_inches='tight', pad_inches=0.1)
plt.show()

查看文件

@@ -66,15 +66,15 @@ modelmax = np.where(np.abs(model) == 1)[0][0]
# Real results
with open(args.realfile, 'r') as f:
real = np.loadtxt(f)
real[:,1] = real[:,1] / np.amax(np.abs(real[:,1]))
realmax = np.where(np.abs(real[:,1]) == 1)[0][0]
real[:, 1] = real[:, 1] / np.amax(np.abs(real[:, 1]))
realmax = np.where(np.abs(real[:, 1]) == 1)[0][0]
difftime = - (timemodel[modelmax] - real[realmax,0])
difftime = - (timemodel[modelmax] - real[realmax, 0])
# Plot modelled and real data
fig, ax = plt.subplots(num=args.modelfile + ' versus ' + args.realfile, figsize=(20, 10), facecolor='w', edgecolor='w')
ax.plot(timemodel + difftime, model, 'r', lw=2, label='Model')
ax.plot(real[:,0], real[:,1], 'r', ls='--', lw=2, label='Experiment')
ax.plot(real[:, 0], real[:, 1], 'r', ls='--', lw=2, label='Experiment')
ax.set_xlabel('Time [s]')
ax.set_ylabel('Amplitude')
ax.set_xlim([0, timemodel[-1]])
@@ -85,6 +85,6 @@ ax.grid()
# Save a PDF/PNG of the figure
savename = os.path.abspath(os.path.dirname(args.modelfile)) + os.sep + os.path.splitext(os.path.split(args.modelfile)[1])[0] + '_vs_' + os.path.splitext(os.path.split(args.realfile)[1])[0]
#fig.savefig(savename + '.pdf', dpi=None, format='pdf', bbox_inches='tight', pad_inches=0.1)
#fig.savefig((savename + '.png', dpi=150, format='png', bbox_inches='tight', pad_inches=0.1)
# fig.savefig((savename + '.png', dpi=150, format='png', bbox_inches='tight', pad_inches=0.1)
plt.show()

查看文件

@@ -36,11 +36,10 @@ from gprMax.exceptions import GeneralError
from tests.analytical_solutions import hertzian_dipole_fs
"""Compare field outputs
Usage:
cd gprMax
python -m tests.test_basic_suite
"""
basepath = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'models_basic')
@@ -57,21 +56,21 @@ path = '/rxs/rx1/'
starttime = perf_counter()
for i, model in enumerate(testmodels):
testresults[model] = {}
# Run model
api(os.path.join(basepath, model + os.path.sep + model + '.in'))
# Special case for analytical comparison
if model == 'hertzian_dipole_fs_analytical':
# Get output for model file
filetest = h5py.File(os.path.join(basepath, model + os.path.sep + model + '.out'),'r')
filetest = h5py.File(os.path.join(basepath, model + os.path.sep + model + '.out'), 'r')
testresults[model]['Test version'] = filetest.attrs['gprMax']
# Get available field output component names
outputstest = list(filetest[path].keys())
# Arrays for storing time
floattype = filetest[path + outputstest[0]].dtype
timetest = np.zeros((filetest.attrs['Iterations']), dtype=floattype)
@@ -82,12 +81,12 @@ for i, model in enumerate(testmodels):
datatest = np.zeros((filetest.attrs['Iterations'], len(outputstest)), dtype=floattype)
print(datatest.shape)
for ID, name in enumerate(outputstest):
datatest[:,ID] = filetest[path + str(name)][:]
datatest[:, ID] = filetest[path + str(name)][:]
# Tx/Rx position to feed to analytical solution
rxpos = filetest[path].attrs['Position']
txpos = filetest['/srcs/src1/'].attrs['Position']
rxposrelative = ((rxpos[0] - txpos[0]), (rxpos[1] - txpos[1]), (rxpos[2] - txpos[2]))
rxposrelative = ((rxpos[0] - txpos[0]), (rxpos[1] - txpos[1]), (rxpos[2] - txpos[2]))
# Analytical solution of a dipole in free space
dataref = hertzian_dipole_fs(filetest.attrs['Iterations'], filetest.attrs['dt'], filetest.attrs['dx, dy, dz'], rxposrelative)
@@ -97,15 +96,15 @@ for i, model in enumerate(testmodels):
# Diffs
datadiffs = np.zeros(datatest.shape, dtype=floattype)
for i in range(len(outputstest)):
max = np.amax(np.abs(dataref[:,i]))
max = np.amax(np.abs(dataref[:, i]))
try:
datadiffs[:,i] = ((np.abs(dataref[:,i] - datatest[:,i])) / max) * 100
datadiffs[:, i] = ((np.abs(dataref[:, i] - datatest[:, i])) / max) * 100
except FloatingPointError:
print('FloatingPointError')
datadiffs[:,i] = 0
datadiffs[:, i] = 0
# Register test passed
threshold = 2 # Percent
threshold = 2 # Percent
if np.amax(np.amax(datadiffs)) < 2:
testresults[model]['Pass'] = True
else:
@@ -114,17 +113,17 @@ for i, model in enumerate(testmodels):
else:
# Get output for model and reference files
fileref = h5py.File(os.path.join(basepath, model + os.path.sep + model + '_ref.out'),'r')
filetest = h5py.File(os.path.join(basepath, model + os.path.sep + model + '.out'),'r')
fileref = h5py.File(os.path.join(basepath, model + os.path.sep + model + '_ref.out'), 'r')
filetest = h5py.File(os.path.join(basepath, model + os.path.sep + model + '.out'), 'r')
testresults[model]['Ref version'] = fileref.attrs['gprMax']
testresults[model]['Test version'] = filetest.attrs['gprMax']
# Get available field output component names
outputsref = list(fileref[path].keys())
outputstest = list(filetest[path].keys())
if outputsref != outputstest:
raise GeneralError('Field output components do not match reference solution')
# Check that type of float used to store fields matches
if filetest[path + outputstest[0]].dtype != fileref[path + outputsref[0]].dtype:
raise GeneralError('Type of floating point number does not match reference solution')
@@ -147,8 +146,8 @@ for i, model in enumerate(testmodels):
dataref = np.zeros((fileref.attrs['Iterations'], len(outputsref)), dtype=floattype)
datatest = np.zeros((filetest.attrs['Iterations'], len(outputstest)), dtype=floattype)
for ID, name in enumerate(outputsref):
dataref[:,ID] = fileref[path + str(name)][:]
datatest[:,ID] = filetest[path + str(name)][:]
dataref[:, ID] = fileref[path + str(name)][:]
datatest[:, ID] = filetest[path + str(name)][:]
fileref.close()
filetest.close()
@@ -156,12 +155,12 @@ for i, model in enumerate(testmodels):
# Diffs
datadiffs = np.zeros(datatest.shape, dtype=floattype)
for i in range(len(outputstest)):
max = np.nanmax(np.abs(dataref[:,i]))
max = np.nanmax(np.abs(dataref[:, i]))
try:
datadiffs[:,i] = ((np.abs(dataref[:,i] - datatest[:,i])) / max) * 100
datadiffs[:, i] = ((np.abs(dataref[:, i] - datatest[:, i])) / max) * 100
except FloatingPointError:
print('FloatingPointError')
datadiffs[:,i] = 0
datadiffs[:, i] = 0
# Register test passed
if not np.any(datadiffs):
@@ -172,18 +171,18 @@ for i, model in enumerate(testmodels):
# Plot datasets
fig1, ((ex1, hx1), (ey1, hy1), (ez1, hz1)) = plt.subplots(nrows=3, ncols=2, sharex=False, sharey='col', subplot_kw=dict(xlabel='Time [ns]'), num=model + '.in', figsize=(20, 10), facecolor='w', edgecolor='w')
ex1.plot(timetest, datatest[:,0],'r', lw=2, label=model)
ex1.plot(timeref, dataref[:,0],'g', lw=2, ls='--', label=model + '(Ref)')
ey1.plot(timetest, datatest[:,1],'r', lw=2, label=model)
ey1.plot(timeref, dataref[:,1],'g', lw=2, ls='--', label=model + '(Ref)')
ez1.plot(timetest, datatest[:,2],'r', lw=2, label=model)
ez1.plot(timeref, dataref[:,2],'g', lw=2, ls='--', label=model + '(Ref)')
hx1.plot(timetest, datatest[:,3],'r', lw=2, label=model)
hx1.plot(timeref, dataref[:,3],'g', lw=2, ls='--', label=model + '(Ref)')
hy1.plot(timetest, datatest[:,4],'r', lw=2, label=model)
hy1.plot(timeref, dataref[:,4],'g', lw=2, ls='--', label=model + '(Ref)')
hz1.plot(timetest, datatest[:,5],'r', lw=2, label=model)
hz1.plot(timeref, dataref[:,5],'g', lw=2, ls='--', label=model + '(Ref)')
ex1.plot(timetest, datatest[:, 0], 'r', lw=2, label=model)
ex1.plot(timeref, dataref[:, 0], 'g', lw=2, ls='--', label=model + '(Ref)')
ey1.plot(timetest, datatest[:, 1], 'r', lw=2, label=model)
ey1.plot(timeref, dataref[:, 1], 'g', lw=2, ls='--', label=model + '(Ref)')
ez1.plot(timetest, datatest[:, 2], 'r', lw=2, label=model)
ez1.plot(timeref, dataref[:, 2], 'g', lw=2, ls='--', label=model + '(Ref)')
hx1.plot(timetest, datatest[:, 3], 'r', lw=2, label=model)
hx1.plot(timeref, dataref[:, 3], 'g', lw=2, ls='--', label=model + '(Ref)')
hy1.plot(timetest, datatest[:, 4], 'r', lw=2, label=model)
hy1.plot(timeref, dataref[:, 4], 'g', lw=2, ls='--', label=model + '(Ref)')
hz1.plot(timetest, datatest[:, 5], 'r', lw=2, label=model)
hz1.plot(timeref, dataref[:, 5], 'g', lw=2, ls='--', label=model + '(Ref)')
ylabels = ['$E_x$, field strength [V/m]', '$H_x$, field strength [A/m]', '$E_y$, field strength [V/m]', '$H_y$, field strength [A/m]', '$E_z$, field strength [V/m]', '$H_z$, field strength [A/m]']
for i, ax in enumerate(fig1.axes):
ax.set_ylabel(ylabels[i])
@@ -193,12 +192,12 @@ for i, model in enumerate(testmodels):
# Plot diffs
fig2, ((ex2, hx2), (ey2, hy2), (ez2, hz2)) = plt.subplots(nrows=3, ncols=2, sharex=False, sharey='col', subplot_kw=dict(xlabel='Time [ns]'), num='Diffs: ' + model + '.in', figsize=(20, 10), facecolor='w', edgecolor='w')
ex2.plot(timeref, datadiffs[:,0],'r', lw=2, label='Ex')
ey2.plot(timeref, datadiffs[:,1],'r', lw=2, label='Ey')
ez2.plot(timeref, datadiffs[:,2],'r', lw=2, label='Ez')
hx2.plot(timeref, datadiffs[:,3],'r', lw=2, label='Hx')
hy2.plot(timeref, datadiffs[:,4],'r', lw=2, label='Hy')
hz2.plot(timeref, datadiffs[:,5],'r', lw=2, label='Hz')
ex2.plot(timeref, datadiffs[:, 0], 'r', lw=2, label='Ex')
ey2.plot(timeref, datadiffs[:, 1], 'r', lw=2, label='Ey')
ez2.plot(timeref, datadiffs[:, 2], 'r', lw=2, label='Ez')
hx2.plot(timeref, datadiffs[:, 3], 'r', lw=2, label='Hx')
hy2.plot(timeref, datadiffs[:, 4], 'r', lw=2, label='Hy')
hz2.plot(timeref, datadiffs[:, 5], 'r', lw=2, label='Hz')
ylabels = ['$E_x$, difference [%]', '$H_x$, difference [%]', '$E_y$, difference [%]', '$H_y$, difference [%]', '$E_z$, difference [%]', '$H_z$, difference [%]']
for i, ax in enumerate(fig2.axes):
ax.set_ylabel(ylabels[i])