New object building primitives and two new mixing models for fractal box, bug fixes

Introduced object primitives #ellipsoid and #cone. The #ellipsoid works with regular semi-axes
along x, y, and z. The #cone works in a similar way to the cylinder and can be truncated with circular faces of different radii. If one radius is zero then it is a normal cone.
Introduced two new mixing models for using with a fractal box, #material_range and #material_list
The #material_range allows materials to be constructed using ranges of permittivity, conductivity, magnetic permeability and magnetic loss. Ranges can be increasing or decreasing as needed.
The #material_list creates a list of predefined materials that can be used with a fractal box. The order of the listed materials reflects the order of the bins they are allocated to in a fractal box.
The fractal box and associated mixing models have been updated to use a list of material IDs and do not rely on the assumption that are generated sequentially. This gives greater flexibility and
adds little computation burden on the creation of the fractal volume.

Bug fixes for mixing anisotropic volumetric materials where "mr" was used instead of "ms".
Bug fixes on objects that use integer coordinates for centres but where passed floats instead.
这个提交包含在:
Antonis Giannopoulos
2023-04-16 13:51:47 +01:00
父节点 1dd4f17850
当前提交 bec20bbd52
共有 22 个文件被更改,包括 1067 次插入25 次删除

二进制
examples/antenna_like_GSSI_1500.vti 普通文件

二进制文件未显示。

二进制
examples/antenna_like_GSSI_1500_fs.h5 普通文件

二进制文件未显示。

查看文件

@@ -41,7 +41,7 @@ gv2 = gprMax.GeometryView(p1=(ant_pos[0] - 0.170/2, ant_pos[1] - 0.108/2, ant_po
p2=(ant_pos[0] + 0.170/2, ant_pos[1] + 0.108/2, ant_pos[2] + 0.010),
dl=(dl, dl, dl), filename='antenna_like_GSSI_1500_pcb',
output_type='f')
#scene.add(gv1)
scene.add(gv1)
#scene.add(gv2)
# Run model

二进制
examples/heterogeneous_soil_v2.h5 普通文件

二进制文件未显示。

查看文件

@@ -0,0 +1,34 @@
#title: Heterogeneous soil using a stochastic distribution of dielectric properties given by a mixing model from Peplinski
#domain: 0.15 0.15 0.15
#dx_dy_dz: 0.001 0.001 0.001
#time_window: 1e-9
#waveform: ricker 1 1.5e9 my_ricker
#hertzian_dipole: z 0.045 0.075 0.07 my_ricker
#rx: 0.105 0.075 0.07
#material: 3 0 1 0 sand
#material: 4 0.1 1 0 sand2
#material: 6 0.001 1 0 asphalt
#material: 4.9 0.001 1 0 my_water
#add_dispersion_debye: 1 75.2 9.231e-12 my_water
ellipsoid: 0.045 0.045 0.045 0.03 0.03 0.03 sand
sphere: 0.075 0.075 0.075 0.03 sand2
box: 0.029 0.029 0.029 0.03 0.03 0.03 sand
box: 0.08 0.08 0.08 0.081 0.081 0.081 sand
cylinder: 0.03 0.03 0.03 0.08 0.08 0.08 0.03 sand
cone: 0.02 0.075 0.075 0.08 0.075 0.075 0.03 0.0 sand
cone: 0.075 0.02 0.075 0.075 0.08 0.075 0.03 0.0 sand
cone: 0.075 0.075 0.02 0.075 0.075 0.08 0.03 0.0 sand
cone: 0.03 0.03 0.03 0.08 0.08 0.08 0.028 0.005 free_space
#material_list: sand pec sand2 asphalt my_water my_list
#material_range: 2 6 0.1 0.001 1.0 1.0 0.0 0.0 test
soil_peplinski: 0.5 0.5 2.0 2.66 0.001 0.25 my_soil
#fractal_box: 0 0 0 0.15 0.15 0.1 1.5 1 1 1 5 test my_soil_box
add_surface_roughness: 0 0 0.070 0.15 0.15 0.070 1.5 1 1 0.065 0.080 my_soil_box
#geometry_view: 0 0 0 0.15 0.15 0.15 0.001 0.001 0.001 heterogeneous_soil_v2 n

二进制
examples/heterogeneous_soil_v2.vti 普通文件

二进制文件未显示。