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

Changed roundvalue function to round_value.

浏览代码
这个提交包含在：
Craig Warren
2016-01-14 18:02:37 +00:00
父节点 e7740f9827
当前提交 6ee27b1f75
共有 1 个文件被更改，包括 52 次插入 和 52 次删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

104
gprMax/geometry_primitives.pyx
查看文件

@@ -19,7 +19,7 @@
import numpy as np import numpy as np
cimport numpy as np cimport numpy as np
np.seterr(divide='raise') np.seterr(divide='raise')
from gprMax.utilities import roundvalue from gprMax.utilities import round_value
from gprMax.yee_cell_setget_rigid cimport set_rigid_Ex, set_rigid_Ey, set_rigid_Ez, set_rigid_Hx, set_rigid_Hy, set_rigid_Hz, set_rigid_E, unset_rigid_E, set_rigid_H, unset_rigid_H from gprMax.yee_cell_setget_rigid cimport set_rigid_Ex, set_rigid_Ey, set_rigid_Ez, set_rigid_Hx, set_rigid_Hy, set_rigid_Hz, set_rigid_E, unset_rigid_E, set_rigid_H, unset_rigid_H
@@ -271,28 +271,28 @@ cpdef build_triangle(float x1, float y1, float z1, float x2, float y2, float z2,
# Calculate a bounding box for the triangle # Calculate a bounding box for the triangle
if normal == 'x': if normal == 'x':
area = 0.5 * (-z2 * y3 + z1 * (-y2 + y3) + y1 * (z2 - z3) + y2 * z3) area = 0.5 * (-z2 * y3 + z1 * (-y2 + y3) + y1 * (z2 - z3) + y2 * z3)
i1 = roundvalue(np.amin([y1, y2, y3]) / dy) - 1 i1 = round_value(np.amin([y1, y2, y3]) / dy) - 1
i2 = roundvalue(np.amax([y1, y2, y3]) / dy) + 1 i2 = round_value(np.amax([y1, y2, y3]) / dy) + 1
j1 = roundvalue(np.amin([z1, z2, z3]) / dz) - 1 j1 = round_value(np.amin([z1, z2, z3]) / dz) - 1
j2 = roundvalue(np.amax([z1, z2, z3]) / dz) + 1 j2 = round_value(np.amax([z1, z2, z3]) / dz) + 1
level = roundvalue(x1 / dx) level = round_value(x1 / dx)
thicknesscells = roundvalue(thickness / dx) thicknesscells = round_value(thickness / dx)
elif normal == 'y': elif normal == 'y':
area = 0.5 * (-z2 * x3 + z1 * (-x2 + x3) + x1 * (z2 - z3) + x2 * z3) area = 0.5 * (-z2 * x3 + z1 * (-x2 + x3) + x1 * (z2 - z3) + x2 * z3)
i1 = roundvalue(np.amin([x1, x2, x3]) / dx) - 1 i1 = round_value(np.amin([x1, x2, x3]) / dx) - 1
i2 = roundvalue(np.amax([x1, x2, x3]) / dx) + 1 i2 = round_value(np.amax([x1, x2, x3]) / dx) + 1
j1 = roundvalue(np.amin([z1, z2, z3]) / dz) - 1 j1 = round_value(np.amin([z1, z2, z3]) / dz) - 1
j2 = roundvalue(np.amax([z1, z2, z3]) / dz) + 1 j2 = round_value(np.amax([z1, z2, z3]) / dz) + 1
level = roundvalue(y1 /dy) level = round_value(y1 /dy)
thicknesscells = roundvalue(thickness / dy) thicknesscells = round_value(thickness / dy)
elif normal == 'z': elif normal == 'z':
area = 0.5 * (-y2 * x3 + y1 * (-x2 + x3) + x1 * (y2 - y3) + x2 * y3) area = 0.5 * (-y2 * x3 + y1 * (-x2 + x3) + x1 * (y2 - y3) + x2 * y3)
i1 = roundvalue(np.amin([x1, x2, x3]) / dx) - 1 i1 = round_value(np.amin([x1, x2, x3]) / dx) - 1
i2 = roundvalue(np.amax([x1, x2, x3]) / dx) + 1 i2 = round_value(np.amax([x1, x2, x3]) / dx) + 1
j1 = roundvalue(np.amin([y1, y2, y3]) / dy) - 1 j1 = round_value(np.amin([y1, y2, y3]) / dy) - 1
j2 = roundvalue(np.amax([y1, y2, y3]) / dy) + 1 j2 = round_value(np.amax([y1, y2, y3]) / dy) + 1
level = roundvalue(z1 / dz) level = round_value(z1 / dz)
thicknesscells = roundvalue(thickness / dz) thicknesscells = round_value(thickness / dz)
sign = np.sign(area) sign = np.sign(area)
@@ -356,11 +356,11 @@ cpdef build_cylindrical_sector(float ctr1, float ctr2, int level, float sectorst
if normal == 'x': if normal == 'x':
# Angles are defined from zero degrees on the positive y-axis going towards positive z-axis # Angles are defined from zero degrees on the positive y-axis going towards positive z-axis
y1 = roundvalue((ctr1 - radius)/dy) y1 = round_value((ctr1 - radius)/dy)
y2 = roundvalue((ctr1 + radius)/dy) y2 = round_value((ctr1 + radius)/dy)
z1 = roundvalue((ctr2 - radius)/dz) z1 = round_value((ctr2 - radius)/dz)
z2 = roundvalue((ctr2 + radius)/dz) z2 = round_value((ctr2 + radius)/dz)
thicknesscells = roundvalue(thickness/dx) thicknesscells = round_value(thickness/dx)
for y in range(y1, y2): for y in range(y1, y2):
for z in range(z1, z2): for z in range(z1, z2):
@@ -373,11 +373,11 @@ cpdef build_cylindrical_sector(float ctr1, float ctr2, int level, float sectorst
elif normal == 'y': elif normal == 'y':
# Angles are defined from zero degrees on the positive x-axis going towards positive z-axis # Angles are defined from zero degrees on the positive x-axis going towards positive z-axis
x1 = roundvalue((ctr1 - radius)/dx) x1 = round_value((ctr1 - radius)/dx)
x2 = roundvalue((ctr1 + radius)/dx) x2 = round_value((ctr1 + radius)/dx)
z1 = roundvalue((ctr2 - radius)/dz) z1 = round_value((ctr2 - radius)/dz)
z2 = roundvalue((ctr2 + radius)/dz) z2 = round_value((ctr2 + radius)/dz)
thicknesscells = roundvalue(thickness/dy) thicknesscells = round_value(thickness/dy)
for x in range(x1, x2): for x in range(x1, x2):
for z in range(z2, z2): for z in range(z2, z2):
@@ -390,11 +390,11 @@ cpdef build_cylindrical_sector(float ctr1, float ctr2, int level, float sectorst
elif normal == 'z': elif normal == 'z':
# Angles are defined from zero degrees on the positive x-axis going towards positive y-axis # Angles are defined from zero degrees on the positive x-axis going towards positive y-axis
x1 = roundvalue((ctr1 - radius)/dx) x1 = round_value((ctr1 - radius)/dx)
x2 = roundvalue((ctr1 + radius)/dx) x2 = round_value((ctr1 + radius)/dx)
y1 = roundvalue((ctr2 - radius)/dy) y1 = round_value((ctr2 - radius)/dy)
y2 = roundvalue((ctr2 + radius)/dy) y2 = round_value((ctr2 + radius)/dy)
thicknesscells = roundvalue(thickness/dz) thicknesscells = round_value(thickness/dz)
for x in range(x1, x2): for x in range(x1, x2):
for y in range(y1, y2): for y in range(y1, y2):
@@ -483,23 +483,23 @@ cpdef build_cylinder(float x1, float y1, float z1, float x2, float y2, float z2,
# Calculate a bounding box for the cylinder # Calculate a bounding box for the cylinder
if x1 < x2: if x1 < x2:
xs = roundvalue((x1 - r) / dx) - 1 xs = round_value((x1 - r) / dx) - 1
xf = roundvalue((x2 + r) / dx) + 1 xf = round_value((x2 + r) / dx) + 1
else: else:
xs = roundvalue((x2 - r) / dx) - 1 xs = round_value((x2 - r) / dx) - 1
xf = roundvalue((x1 + r) / dx) + 1 xf = round_value((x1 + r) / dx) + 1
if y1 < y2: if y1 < y2:
ys = roundvalue((y1 - r) / dy) - 1 ys = round_value((y1 - r) / dy) - 1
yf = roundvalue((y2 + r) / dy) + 1 yf = round_value((y2 + r) / dy) + 1
else: else:
ys = roundvalue((y2 - r) / dy) - 1 ys = round_value((y2 - r) / dy) - 1
yf = roundvalue((y1 + r) / dy) + 1 yf = round_value((y1 + r) / dy) + 1
if z1 < z2: if z1 < z2:
zs = roundvalue((z1 - r) / dz) - 1 zs = round_value((z1 - r) / dz) - 1
zf = roundvalue((z2 + r) / dz) + 1 zf = round_value((z2 + r) / dz) + 1
else: else:
zs = roundvalue((z2 - r) / dz) - 1 zs = round_value((z2 - r) / dz) - 1
zf = roundvalue((z1 + r) / dz) + 1 zf = round_value((z1 + r) / dz) + 1
# Set bounds to domain if they outside # Set bounds to domain if they outside
if xs < 0: if xs < 0:
@@ -577,12 +577,12 @@ cpdef build_sphere(int xc, int yc, int zc, float r, float dx, float dy, float dz
cdef int i, j, k, xs, xf, ys, yf, zs, zf cdef int i, j, k, xs, xf, ys, yf, zs, zf
# Calculate a bounding box for sphere # Calculate a bounding box for sphere
xs = roundvalue(((xc * dx) - r) / dx) - 1 xs = round_value(((xc * dx) - r) / dx) - 1
xf = roundvalue(((xc * dx) + r) / dx) + 1 xf = round_value(((xc * dx) + r) / dx) + 1
ys = roundvalue(((yc * dy) - r) / dy) - 1 ys = round_value(((yc * dy) - r) / dy) - 1
yf = roundvalue(((yc * dy) + r) / dy) + 1 yf = round_value(((yc * dy) + r) / dy) + 1
zs = roundvalue(((zc * dz) - r) / dz) - 1 zs = round_value(((zc * dz) - r) / dz) - 1
zf = roundvalue(((zc * dz) + r) / dz) + 1 zf = round_value(((zc * dz) + r) / dz) + 1
# Set bounds to domain if they outside # Set bounds to domain if they outside
if xs < 0: if xs < 0: