Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

## mesh2scattering

- MAINT: remove restriction to pyfar version ([#75](https://github.com/ahms5/Mesh2scattering/pulls/75))
- MAINT: remove restriction to pyfar version ([#75](https://github.com/ahms5/Mesh2scattering/pulls/75), [#78](https://github.com/ahms5/Mesh2scattering/pulls/78))
- MAINT: move matplotlib dependency to documentation as it is not required for the main package ([#74](https://github.com/ahms5/Mesh2scattering/pulls/74))
- DOC: remove obsolete dependency ``nbsphinx_link`` and use ``nbsphinx`` directly ([#76](https://github.com/ahms5/Mesh2scattering/pulls/76), [#79](https://github.com/ahms5/Mesh2scattering/pulls/79))

Expand Down
8 changes: 4 additions & 4 deletions examples/demo.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,11 @@
"output_type": "stream",
"text": [
"\u001b[0m\n",
"Starting manage_numcalc with the following arguments [Apr 01 2026, 20:02:34]\n",
"Starting manage_numcalc with the following arguments [Apr 02 2026, 09:31:09]\n",
"----------------------------------------------------------------------------\n",
"project_path: /Users/anne/git/_pyfar/Mesh2scattering/examples/project\n",
"numcalc_path: /Users/anne/git/_pyfar/Mesh2scattering/mesh2scattering/numcalc/bin/NumCalc\n",
"max_ram_load: 16.00 GB (16.00 GB detected, 3.98 GB available)\n",
"max_ram_load: 16.00 GB (16.00 GB detected, 4.52 GB available)\n",
"ram_safety_factor: 1.05\n",
"max_cpu_load: 90 %\n",
"max_instances: 8 (8 cores detected)\n",
Expand All @@ -425,9 +425,9 @@
"'reference' is already complete\n",
"\n",
"\u001b[0m\n",
"... waiting for the last NumCalc instances to finish (checking every second, Apr 01 2026, 20:02:34)\n",
"... waiting for the last NumCalc instances to finish (checking every second, Apr 02 2026, 09:31:09)\n",
"\u001b[0m\n",
"All NumCalc projects finished at Apr 01 2026, 20:02:34\n"
"All NumCalc projects finished at Apr 02 2026, 09:31:09\n"
]
}
],
Expand Down
3 changes: 2 additions & 1 deletion mesh2scattering/input/EvaluationGrid.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ class EvaluationGrid():

>>> import mesh2scattering as m2s
>>> import pyfar as pf
>>> import spharpy
>>>
>>> points = pf.samplings.sph_lebedev(sh_order=10)
>>> points = spharpy.samplings.lebedev(10)
>>> grid = m2s.input.EvaluationGrid.from_spherical(
... points, "Lebedev_N10")
"""
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ tests = [
"mesh2scattering[examples]",
]
examples = [
"spharpy",
"spharpy>=1.0.0",
"matplotlib",
]
docs = [
Expand Down
3 changes: 2 additions & 1 deletion tests/resources/numcalc/create_example_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
import pyfar as pf
import numpy as np
import spharpy
import trimesh

# %%
Expand All @@ -17,7 +18,7 @@
sound_sources = m2s.input.SoundSource(
pf.Coordinates(0, 0, [3, 4], weights=[1, 1]),
m2s.input.SoundSourceType.POINT_SOURCE)
points = pf.samplings.sph_lebedev(sh_order=10)
points = spharpy.samplings.lebedev(10)(sh_order=10)
evaluation_grid = m2s.input.EvaluationGrid.from_spherical(
points,
'example_grid')
Expand Down
3 changes: 2 additions & 1 deletion tests/resources/output/create_example_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
import pyfar as pf
import numpy as np
import trimesh
import spharpy

# %%
frequencies = np.array([500, 1000])
sound_sources = m2s.input.SoundSource(
pf.Coordinates(0, 0, [3, 4], weights=[1, 1]),
m2s.input.SoundSourceType.POINT_SOURCE)
points = pf.samplings.sph_gaussian(sh_order=63)
points = spharpy.samplings.gaussian(n_max=63)
evaluation_grid = m2s.input.EvaluationGrid.from_spherical(
points,
'gaussian_63')
Expand Down
Loading