Improved material properties collecting for printing table.

这个提交包含在:
Craig Warren
2017-03-20 16:17:26 +00:00
父节点 d0fd4171a9
当前提交 3e0a8e4b6a

查看文件

@@ -149,12 +149,10 @@ def process_materials(G):
materialsdata (list): List of material IDs, names, and properties to print a table. materialsdata (list): List of material IDs, names, and properties to print a table.
""" """
if G.messages: if Material.maxpoles == 0:
print('\nMaterials:') materialsdata = [['\nID', '\nName', '\nType', '\neps_r', 'sigma\n[S/m]', '\nmu_r', 'sigma*\n[Ohm/m]', 'Dielectric\nsmoothable']]
if Material.maxpoles == 0: else:
materialsdata = [['\nID', '\nName', '\nType', '\neps_r', 'sigma\n[S/m]', '\nmu_r', 'sigma*\n[Ohm/m]', 'Dielectric\nsmoothable']] materialsdata = [['\nID', '\nName', '\nType', '\neps_r', 'sigma\n[S/m]', 'Delta\neps_r', 'tau\n[s]', 'omega\n[Hz]', 'delta\n[Hz]', 'gamma\n[Hz]', '\nmu_r', 'sigma*\n[Ohm/m]', 'Dielectric\nsmoothable']]
else:
materialsdata = [['\nID', '\nName', '\nType', '\neps_r', 'sigma\n[S/m]', 'Delta\neps_r', 'tau\n[s]', 'omega\n[Hz]', 'delta\n[Hz]', 'gamma\n[Hz]', '\nmu_r', 'sigma*\n[Ohm/m]', 'Dielectric\nsmoothable']]
for material in G.materials: for material in G.materials:
# Calculate update coefficients for material # Calculate update coefficients for material
@@ -172,46 +170,38 @@ def process_materials(G):
G.updatecoeffsdispersive[material.numID, z:z + 3] = e0 * material.eqt2[pole], material.eqt[pole], material.zt[pole] G.updatecoeffsdispersive[material.numID, z:z + 3] = e0 * material.eqt2[pole], material.eqt[pole], material.zt[pole]
z += 3 z += 3
if G.messages: # Construct information on material properties for printing table
materialtext = [] materialtext = []
materialtext.append(str(material.numID)) materialtext.append(str(material.numID))
materialtext.append(material.ID[:50] if len(material.ID) > 50 else material.ID) materialtext.append(material.ID[:50] if len(material.ID) > 50 else material.ID)
materialtext.append(material.type) materialtext.append(material.type)
materialtext.append('{:g}'.format(material.er)) materialtext.append('{:g}'.format(material.er))
materialtext.append('{:g}'.format(material.se)) materialtext.append('{:g}'.format(material.se))
if Material.maxpoles > 0: if Material.maxpoles > 0:
if 'debye' in material.type: if 'debye' in material.type:
materialtext.append(', '.join('{:g}'.format(deltaer) for deltaer in material.deltaer)) materialtext.append('\n'.join('{:g}'.format(deltaer) for deltaer in material.deltaer))
materialtext.append(', '.join('{:g}'.format(tau) for tau in material.tau)) materialtext.append('\n'.join('{:g}'.format(tau) for tau in material.tau))
materialtext.append('') materialtext.extend(['', '', ''])
materialtext.append('') elif 'lorentz' in material.type:
materialtext.append('') materialtext.append(', '.join('{:g}'.format(deltaer) for deltaer in material.deltaer))
elif 'lorentz' in material.type: materialtext.append('')
materialtext.append(', '.join('{:g}'.format(deltaer) for deltaer in material.deltaer)) materialtext.append(', '.join('{:g}'.format(tau) for tau in material.tau))
materialtext.append('') materialtext.append(', '.join('{:g}'.format(alpha) for alpha in material.alpha))
materialtext.append(', '.join('{:g}'.format(tau) for tau in material.tau)) materialtext.append('')
materialtext.append(', '.join('{:g}'.format(alpha) for alpha in material.alpha)) elif 'drude' in material.type:
materialtext.append('') materialtext.extend(['', ''])
elif 'drude' in material.type: materialtext.append(', '.join('{:g}'.format(tau) for tau in material.tau))
materialtext.append('') materialtext.append('')
materialtext.append('') materialtext.append(', '.join('{:g}'.format(alpha) for alpha in material.alpha))
materialtext.append(', '.join('{:g}'.format(tau) for tau in material.tau)) else:
materialtext.append('') materialtext.extend(['', '', '', '', ''])
materialtext.append(', '.join('{:g}'.format(alpha) for alpha in material.alpha))
else:
materialtext.append('')
materialtext.append('')
materialtext.append('')
materialtext.append('')
materialtext.append('')
materialtext.append('{:g}'.format(material.mr)) materialtext.append('{:g}'.format(material.mr))
materialtext.append('{:g}'.format(material.sm)) materialtext.append('{:g}'.format(material.sm))
materialtext.append(material.averagable) materialtext.append(material.averagable)
materialsdata.append(materialtext) materialsdata.append(materialtext)
if G.messages: return materialsdata
return materialsdata
class PeplinskiSoil(object): class PeplinskiSoil(object):