Skip to content

map spaces iteration 1 #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pescap wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

map spaces iteration 1 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9effb62
map spaces it. 1
pescap Oct 13, 2024
9c851e5
current map spaces
pescap Oct 29, 2024
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
1 change: 1 addition & 0 deletions bempp/api/fmm/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,7 @@ def get_local_interaction_matrix_impl(

def map_space_to_points(space, local_points, weights, return_transpose=False):
"""Return mapper from grid coeffs to point evaluations."""
print('bempp.api.fmm.helpers.map_space_to_points')
from scipy.sparse import coo_matrix
from scipy.sparse.linalg import aslinearoperator

Expand Down
2 changes: 1 addition & 1 deletion bempp/api/operators/boundary/laplace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,4 @@ def multitrace_operator(
blocked[1, 0] = hyp
blocked[1, 1] = adj_dlp

return blocked
return blocked
21 changes: 9 additions & 12 deletions bempp/api/space/space.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ def surface_curl(self, element_index, element, local_coordinates):
element,
self.shapeset.gradient,
local_coordinates,
self.grid.data()
self.grid.data(),
)

def mass_matrix(self):
Expand Down Expand Up @@ -786,6 +786,7 @@ def check_if_compatible(space1, space2):

def map_space_to_points(space, quadrature_order=None, return_transpose=False):
"""Return mapper from grid coeffs to point evaluations."""
print('bempp.api.space.map_space_to_points')
import bempp.api
from scipy.sparse import coo_matrix
from scipy.sparse.linalg import aslinearoperator
Expand Down Expand Up @@ -860,7 +861,7 @@ def map_space_to_points_impl(
global_indices = _np.empty(nlocal * number_of_support_elements, dtype=_np.int64)
vertex_indices = _np.empty(nlocal * number_of_support_elements, dtype=_np.int64)

for elem in support_elements:
for i, elem in enumerate(support_elements):
basis_values = (
numba_evaluate(
elem,
Expand All @@ -873,16 +874,14 @@ def map_space_to_points_impl(
* weights
* grid_data.integration_elements[elem]
)
data[elem * nlocal : (1 + elem) * nlocal] = basis_values.ravel()
data[i * nlocal : (1 + i) * nlocal] = basis_values.ravel()
for index in range(number_of_shape_functions):
vertex_indices[
elem * nlocal
+ index * number_of_local_points : elem * nlocal
i * nlocal
+ index * number_of_local_points : i * nlocal
+ (1 + index) * number_of_local_points
] = _np.arange(
elem * number_of_local_points, (1 + elem) * number_of_local_points
)
global_indices[elem * nlocal : (1 + elem) * nlocal] = _np.repeat(
] = _np.arange(i * number_of_local_points, (1 + i) * number_of_local_points)
global_indices[i * nlocal : (1 + i) * nlocal] = _np.repeat(
local2global[elem, :], number_of_local_points
)

Expand Down Expand Up @@ -958,9 +957,7 @@ def make_localised_space(space):
space.numba_surface_gradient if space.has_surface_gradient else None
)

surface_curl = (
space.numba_surface_curl if space.has_surface_curl else None
)
surface_curl = space.numba_surface_curl if space.has_surface_curl else None

global2local_map = invert_local2global(local2global_map, local_multipliers)

Expand Down