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

Used f-strings to make the code in cmds_singleuse.py file more cleaner and readable.

浏览代码
这个提交包含在：
Sai Suraj
2023-04-15 11:06:45 +05:30
父节点 f05cb68bc2
当前提交 9dbf795356
共有 2 个文件被更改，包括 53 次插入 和 30 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

74
gprMax/cmds_singleuse.py
查看文件

@@ -93,20 +93,23 @@ class Discretisation(UserObjectSingle):
G.dl = np.array(self.kwargs['p1']) G.dl = np.array(self.kwargs['p1'])
G.dx, G.dy, G.dz = self.kwargs['p1'] G.dx, G.dy, G.dz = self.kwargs['p1']
except KeyError: except KeyError:
logger.exception(self.__str__() + ' discretisation requires a point') logger.exception(f'{self.__str__()} discretisation requires a point')
raise raise
if G.dl[0] <= 0: if G.dl[0] <= 0:
logger.exception(self.__str__() + ' discretisation requires the ' + logger.exception(
'x-direction spatial step to be greater than zero') f'{self.__str__()} discretisation requires the x-direction spatial step to be greater than zero'
)
raise ValueError raise ValueError
if G.dl[1] <= 0: if G.dl[1] <= 0:
logger.exception(self.__str__() + ' discretisation requires the ' + logger.exception(
'y-direction spatial step to be greater than zero') f'{self.__str__()} discretisation requires the y-direction spatial step to be greater than zero'
)
raise ValueError raise ValueError
if G.dl[2] <= 0: if G.dl[2] <= 0:
logger.exception(self.__str__() + ' discretisation requires the ' + logger.exception(
'z-direction spatial step to be greater than zero') f'{self.__str__()} discretisation requires the z-direction spatial step to be greater than zero'
)
raise ValueError raise ValueError
logger.info(f'Spatial discretisation: {G.dl[0]:g} x {G.dl[1]:g} x {G.dl[2]:g}m') logger.info(f'Spatial discretisation: {G.dl[0]:g} x {G.dl[1]:g} x {G.dl[2]:g}m')
@@ -127,11 +130,13 @@ class Domain(UserObjectSingle):
try: try:
G.nx, G.ny, G.nz = uip.discretise_point(self.kwargs['p1']) G.nx, G.ny, G.nz = uip.discretise_point(self.kwargs['p1'])
except KeyError: except KeyError:
logger.exception(self.__str__() + ' please specify a point') logger.exception(f'{self.__str__()} please specify a point')
raise raise
if G.nx == 0 or G.ny == 0 or G.nz == 0: if G.nx == 0 or G.ny == 0 or G.nz == 0:
logger.exception(self.__str__() + ' requires at least one cell in every dimension') logger.exception(
f'{self.__str__()} requires at least one cell in every dimension'
)
raise ValueError raise ValueError
logger.info(f"Domain size: {self.kwargs['p1'][0]:g} x {self.kwargs['p1'][1]:g} x " + logger.info(f"Domain size: {self.kwargs['p1'][0]:g} x {self.kwargs['p1'][1]:g} x " +
@@ -181,12 +186,13 @@ class TimeStepStabilityFactor(UserObjectSingle):
try: try:
f = self.kwargs['f'] f = self.kwargs['f']
except KeyError: except KeyError:
logger.exception(self.__str__() + ' requires exactly one parameter') logger.exception(f'{self.__str__()} requires exactly one parameter')
raise raise
if f <= 0 or f > 1: if f <= 0 or f > 1:
logger.exception(self.__str__() + ' requires the value of the time ' + logger.exception(
'step stability factor to be between zero and one') f'{self.__str__()} requires the value of the time step stability factor to be between zero and one'
)
raise ValueError raise ValueError
G.dt = G.dt * f G.dt = G.dt * f
@@ -250,12 +256,14 @@ class OMPThreads(UserObjectSingle):
try: try:
n = self.kwargs['n'] n = self.kwargs['n']
except KeyError: except KeyError:
logger.exception(self.__str__() + ' requires exactly one parameter ' + logger.exception(
'to specify the number of CPU OpenMP threads to use') f'{self.__str__()} requires exactly one parameter to specify the number of CPU OpenMP threads to use'
)
raise raise
if n < 1: if n < 1:
logger.exception(self.__str__() + ' requires the value to be an ' + logger.exception(
'integer not less than one') f'{self.__str__()} requires the value to be an integer not less than one'
)
raise ValueError raise ValueError
config.get_model_config().ompthreads = set_omp_threads(n) config.get_model_config().ompthreads = set_omp_threads(n)
@@ -302,7 +310,7 @@ class PMLProps(UserObjectSingle):
G.pmls['thickness']['ymax'] = int(self.kwargs['ymax']) G.pmls['thickness']['ymax'] = int(self.kwargs['ymax'])
G.pmls['thickness']['zmax'] = int(self.kwargs['zmax']) G.pmls['thickness']['zmax'] = int(self.kwargs['zmax'])
except KeyError: except KeyError:
logger.exception(self.__str__() + ' requires either one or six parameter(s)') logger.exception(f'{self.__str__()} requires either one or six parameter(s)')
raise raise
if (2 * G.pmls['thickness']['x0'] >= G.nx or if (2 * G.pmls['thickness']['x0'] >= G.nx or
@@ -311,8 +319,8 @@ class PMLProps(UserObjectSingle):
2 * G.pmls['thickness']['xmax'] >= G.nx or 2 * G.pmls['thickness']['xmax'] >= G.nx or
2 * G.pmls['thickness']['ymax'] >= G.ny or 2 * G.pmls['thickness']['ymax'] >= G.ny or
2 * G.pmls['thickness']['zmax'] >= G.nz): 2 * G.pmls['thickness']['zmax'] >= G.nz):
logger.exception(self.__str__() + ' has too many cells for the domain size') logger.exception(f'{self.__str__()} has too many cells for the domain size')
raise ValueError raise ValueError
class SrcSteps(UserObjectSingle): class SrcSteps(UserObjectSingle):
@@ -330,12 +338,16 @@ class SrcSteps(UserObjectSingle):
try: try:
G.srcsteps = uip.discretise_point(self.kwargs['p1']) G.srcsteps = uip.discretise_point(self.kwargs['p1'])
except KeyError: except KeyError:
logger.exception(self.__str__() + ' requires exactly three parameters') logger.exception(f'{self.__str__()} requires exactly three parameters')
raise raise
logger.info(f'Simple sources will step {G.srcsteps[0] * G.dx:g}m, ' + logger.info(
f'{G.srcsteps[1] * G.dy:g}m, {G.srcsteps[2] * G.dz:g}m ' + (
f'for each model run.') f'Simple sources will step {G.srcsteps[0] * G.dx:g}m, '
+ f'{G.srcsteps[1] * G.dy:g}m, {G.srcsteps[2] * G.dz:g}m '
+ 'for each model run.'
)
)
class RxSteps(UserObjectSingle): class RxSteps(UserObjectSingle):
@@ -353,12 +365,16 @@ class RxSteps(UserObjectSingle):
try: try:
G.rxsteps = uip.discretise_point(self.kwargs['p1']) G.rxsteps = uip.discretise_point(self.kwargs['p1'])
except KeyError: except KeyError:
logger.exception(self.__str__() + ' requires exactly three parameters') logger.exception(f'{self.__str__()} requires exactly three parameters')
raise raise
logger.info(f'All receivers will step {G.rxsteps[0] * G.dx:g}m, ' + logger.info(
f'{G.rxsteps[1] * G.dy:g}m, {G.rxsteps[2] * G.dz:g}m ' + (
f'for each model run.') f'All receivers will step {G.rxsteps[0] * G.dx:g}m, '
+ f'{G.rxsteps[1] * G.dy:g}m, {G.rxsteps[2] * G.dz:g}m '
+ 'for each model run.'
)
)
class ExcitationFile(UserObjectSingle): class ExcitationFile(UserObjectSingle):
@@ -378,7 +394,7 @@ class ExcitationFile(UserObjectSingle):
def create(self, G, uip): def create(self, G, uip):
try: try:
kwargs = dict() kwargs = {}
excitationfile = self.kwargs['filepath'] excitationfile = self.kwargs['filepath']
kwargs['kind'] = self.kwargs['kind'] kwargs['kind'] = self.kwargs['kind']
kwargs['fill_value'] = self.kwargs['fill_value'] kwargs['fill_value'] = self.kwargs['fill_value']
@@ -389,7 +405,7 @@ class ExcitationFile(UserObjectSingle):
args, varargs, keywords, defaults = inspect.getargspec(interpolate.interp1d) args, varargs, keywords, defaults = inspect.getargspec(interpolate.interp1d)
kwargs = dict(zip(reversed(args), reversed(defaults))) kwargs = dict(zip(reversed(args), reversed(defaults)))
except KeyError: except KeyError:
logger.exception(self.__str__() + ' requires either one or three parameter(s)') logger.exception(f'{self.__str__()} requires either one or three parameter(s)')
raise raise
# See if file exists at specified path and if not try input file directory # See if file exists at specified path and if not try input file directory

9
gprMax/waveforms.py
查看文件

@@ -53,6 +53,8 @@ class Waveform:
"""Calculates coefficients (used to calculate values) for specific """Calculates coefficients (used to calculate values) for specific
waveforms. waveforms.
""" """
if self.freq is None:
raise ValueError("Frequency is not specified")
if self.type in [ if self.type in [
'gaussian', 'gaussian',
@@ -120,11 +122,16 @@ class Waveform:
rampamp = 0.25 rampamp = 0.25
ramp = rampamp * time * self.freq ramp = rampamp * time * self.freq
ramp = min(ramp, 1) ramp = min(ramp, 1)
ampvalue = ramp * np.sin(2 * np.pi * self.freq * time) ampvalue = ramp * np.sin(2 * np.pi * self.freq * time)
elif self.type == 'impulse': elif self.type == 'impulse':
# time < dt condition required to do impulsive magnetic dipole # time < dt condition required to do impulsive magnetic dipole
ampvalue = 1 if time == 0 or time < dt else 0 if time == 0 or time < dt:
ampvalue = 1
elif time >= dt:
ampvalue = 0
elif self.type == 'user': elif self.type == 'user':
ampvalue = self.userfunc(time) ampvalue = self.userfunc(time)