Tidied some variable names in dispersive materials

这个提交包含在:
Craig Warren
2022-11-19 20:30:46 +00:00
父节点 f3e4c5cc8c
当前提交 7a65f0a319

查看文件

@@ -1135,8 +1135,8 @@ class Material(UserObjectMulti):
class AddDebyeDispersion(UserObjectMulti): class AddDebyeDispersion(UserObjectMulti):
"""Adds dispersive properties to already defined :class:`Material` based """Adds dispersive properties to already defined Material based on a
on multi-pole Debye formulation. multi-pole Debye formulation.
Attributes: Attributes:
poles: float required for number of Debye poles. poles: float required for number of Debye poles.
@@ -1209,8 +1209,8 @@ class AddDebyeDispersion(UserObjectMulti):
class AddLorentzDispersion(UserObjectMulti): class AddLorentzDispersion(UserObjectMulti):
"""Adds dispersive properties to already defined :class:`Material` based """Adds dispersive properties to already defined Material based on a
on multi-pole Lorentz formulation. multi-pole Lorentz formulation.
Attributes: Attributes:
poles: float required for number of Lorentz poles. poles: float required for number of Lorentz poles.
@@ -1232,8 +1232,8 @@ class AddLorentzDispersion(UserObjectMulti):
try: try:
poles = self.kwargs['poles'] poles = self.kwargs['poles']
er_delta = self.kwargs['er_delta'] er_delta = self.kwargs['er_delta']
tau = self.kwargs['tau'] omega = self.kwargs['omega']
alpha = self.kwargs['alpha'] delta = self.kwargs['delta']
material_ids = self.kwargs['material_ids'] material_ids = self.kwargs['material_ids']
except KeyError: except KeyError:
logger.exception(self.params_str() + ' requires at least five ' logger.exception(self.params_str() + ' requires at least five '
@@ -1264,10 +1264,10 @@ class AddLorentzDispersion(UserObjectMulti):
disp_material.poles = poles disp_material.poles = poles
disp_material.averagable = False disp_material.averagable = False
for i in range(0, poles): for i in range(0, poles):
if er_delta[i] > 0 and tau[i] > grid.dt and alpha[i] > grid.dt: if er_delta[i] > 0 and omega[i] > grid.dt and delta[i] > grid.dt:
disp_material.deltaer.append(er_delta[i]) disp_material.deltaer.append(er_delta[i])
disp_material.tau.append(tau[i]) disp_material.tau.append(omega[i])
disp_material.alpha.append(alpha[i]) disp_material.alpha.append(delta[i])
else: else:
logger.exception(self.params_str() + ' requires positive ' logger.exception(self.params_str() + ' requires positive '
'values for the permittivity difference ' 'values for the permittivity difference '
@@ -1283,13 +1283,13 @@ class AddLorentzDispersion(UserObjectMulti):
logger.info(self.grid_name(grid) + f"Lorentz disperion added to {disp_material.ID} " logger.info(self.grid_name(grid) + f"Lorentz disperion added to {disp_material.ID} "
f"with delta_eps_r={', '.join('%4.2f' % deltaer for deltaer in disp_material.deltaer)}, " f"with delta_eps_r={', '.join('%4.2f' % deltaer for deltaer in disp_material.deltaer)}, "
f"omega={', '.join('%4.3e' % tau for tau in disp_material.tau)} secs, " f"omega={', '.join('%4.3e' % omega for omega in disp_material.tau)} secs, "
f"and gamma={', '.join('%4.3e' % alpha for alpha in disp_material.alpha)} created.") f"and gamma={', '.join('%4.3e' % delta for delta in disp_material.alpha)} created.")
class AddDrudeDispersion(UserObjectMulti): class AddDrudeDispersion(UserObjectMulti):
"""Adds dispersive properties to already defined :class:`Material` based """Adds dispersive properties to already defined Material based on a
on multi-pole Drude formulation. multi-pole Drude formulation.
Attributes: Attributes:
poles: float required for number of Drude poles. poles: float required for number of Drude poles.
@@ -1307,7 +1307,7 @@ class AddDrudeDispersion(UserObjectMulti):
def create(self, grid, uip): def create(self, grid, uip):
try: try:
poles = self.kwargs['poles'] poles = self.kwargs['poles']
tau = self.kwargs['tau'] omega = self.kwargs['omega']
alpha = self.kwargs['alpha'] alpha = self.kwargs['alpha']
material_ids = self.kwargs['material_ids'] material_ids = self.kwargs['material_ids']
except KeyError: except KeyError:
@@ -1339,8 +1339,8 @@ class AddDrudeDispersion(UserObjectMulti):
disp_material.poles = poles disp_material.poles = poles
disp_material.averagable = False disp_material.averagable = False
for i in range(0, poles): for i in range(0, poles):
if tau[i] > 0 and alpha[i] > grid.dt: if omega[i] > 0 and alpha[i] > grid.dt:
disp_material.tau.append(tau[i]) disp_material.tau.append(omega[i])
disp_material.alpha.append(alpha[i]) disp_material.alpha.append(alpha[i])
else: else:
logger.exception(self.params_str() + ' requires positive ' logger.exception(self.params_str() + ' requires positive '
@@ -1355,7 +1355,7 @@ class AddDrudeDispersion(UserObjectMulti):
grid.materials = [disp_material if mat.numID==material.numID else mat for mat in grid.materials] grid.materials = [disp_material if mat.numID==material.numID else mat for mat in grid.materials]
logger.info(self.grid_name(grid) + f"Drude disperion added to {disp_material.ID} " logger.info(self.grid_name(grid) + f"Drude disperion added to {disp_material.ID} "
f"with omega={', '.join('%4.3e' % tau for tau in disp_material.tau)} secs, " f"with omega={', '.join('%4.3e' % omega for omega in disp_material.tau)} secs, "
f"and gamma={', '.join('%4.3e' % alpha for alpha in disp_material.alpha)} secs created.") f"and gamma={', '.join('%4.3e' % alpha for alpha in disp_material.alpha)} secs created.")
@@ -1643,6 +1643,7 @@ class PMLCFS(UserObjectMulti):
logger.exception(self.params_str() + ' minimum and maximum scaling ' logger.exception(self.params_str() + ' minimum and maximum scaling '
'values must be greater than zero.') 'values must be greater than zero.')
raise ValueError raise ValueError
# TODO: Fix handling of kappa for 2nd order PMLs
# if float(kappamin) < 1: # if float(kappamin) < 1:
# logger.exception(self.params_str() + ' minimum scaling value for ' # logger.exception(self.params_str() + ' minimum scaling value for '
# 'kappa must be greater than or equal to one.') # 'kappa must be greater than or equal to one.')