Skip to content

Commit

Permalink
Use ndgrid (#271)
Browse files Browse the repository at this point in the history
* update to use ndgrid

* Readd neighbours function

* Make more things work

* transpose normal storage

* use ndgrid from git

* fmt

* more transposing

* disable failing tests

* comment out mpi code

* transpose points

* update benchmark code

* fmt
  • Loading branch information
mscroggs authored Aug 5, 2024
1 parent 54b0468 commit d5a0964
Show file tree
Hide file tree
Showing 72 changed files with 723 additions and 8,552 deletions.
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ lazy_static = "1.4"
libc = "0.2"
log = "0.4"
ndelement = { git = "https://github.com/bempp/ndelement.git" }
ndgrid = { git = "https://github.com/bempp/ndgrid.git" }
rayon = "1.9"
rand = "0.8.5"
rlst = { version = "0.1" }
green-kernels = { version = "0.1" }
rlst = { version = "0.2" }
green-kernels = { git = "https://github.com/bempp/green-kernels.git" }
thiserror="1.*"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion benches/assembly_benchmark.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use bempp::assembly::{batched, batched::BatchedAssembler};
use bempp::function::SerialFunctionSpace;
use bempp::grid::shapes::regular_sphere;
use bempp::traits::function::FunctionSpace;
use criterion::{criterion_group, criterion_main, Criterion};
use ndelement::ciarlet::LagrangeElementFamily;
use ndelement::types::{Continuity, ReferenceCellType};
use ndgrid::shapes::regular_sphere;
use rlst::rlst_dynamic_array2;

extern crate blas_src;
Expand Down
4 changes: 2 additions & 2 deletions examples/assembly.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use bempp::assembly::{batched, batched::BatchedAssembler};
use bempp::function::SerialFunctionSpace;
use bempp::grid::shapes::regular_sphere;
use bempp::traits::function::FunctionSpace;
use ndelement::ciarlet::LagrangeElementFamily;
use ndelement::types::{Continuity, ReferenceCellType};
use ndgrid::shapes::regular_sphere;
use rlst::{rlst_dynamic_array2, RandomAccessByRef};

extern crate blas_src;
Expand All @@ -12,7 +12,7 @@ extern crate lapack_src;
fn main() {
// Create a grid, family of elements, and function space
let grid = regular_sphere(0);
let element = LagrangeElementFamily::<f64>::new(1, Continuity::Continuous);
let element = LagrangeElementFamily::<f64>::new(1, Continuity::Standard);
let space = SerialFunctionSpace::new(&grid, &element);

// Create an array to store the assembled discrete operator
Expand Down
43 changes: 0 additions & 43 deletions examples/flat_triangle_grid.rs

This file was deleted.

62 changes: 0 additions & 62 deletions examples/mixed_grid.rs

This file was deleted.

48 changes: 0 additions & 48 deletions examples/single_element_grid.rs

This file was deleted.

Loading

0 comments on commit d5a0964

Please sign in to comment.