From 57c7cf0c0d5538ce5a1bb649db84a1ff4e4a89bd Mon Sep 17 00:00:00 2001 From: Timo Betcke Date: Tue, 31 Dec 2024 19:25:34 +0100 Subject: [PATCH] Removed warnings --- src/boundary_evaluators.rs | 1 + .../dense_evaluator.rs | 9 +++------ .../kifmm_evaluator.rs | 20 ++++--------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/boundary_evaluators.rs b/src/boundary_evaluators.rs index e69de29b..73f407bb 100644 --- a/src/boundary_evaluators.rs +++ b/src/boundary_evaluators.rs @@ -0,0 +1 @@ +//! This module contains evaluators for boundary integral operators. diff --git a/src/greens_function_evaluators/dense_evaluator.rs b/src/greens_function_evaluators/dense_evaluator.rs index 26be6f76..8c70faac 100644 --- a/src/greens_function_evaluators/dense_evaluator.rs +++ b/src/greens_function_evaluators/dense_evaluator.rs @@ -1,13 +1,10 @@ //! A dense evaluator for Green's functions. -use green_kernels::{ - traits::{DistributedKernelEvaluator, Kernel}, - types::GreenKernelEvalType, -}; +use green_kernels::{traits::DistributedKernelEvaluator, types::GreenKernelEvalType}; use mpi::traits::{Communicator, Equivalence}; use rlst::{ - operator::interface::DistributedArrayVectorSpace, rlst_dynamic_array1, ArrayVectorSpace, - AsApply, Element, IndexLayout, OperatorBase, RawAccess, RawAccessMut, RlstScalar, + operator::interface::DistributedArrayVectorSpace, rlst_dynamic_array1, AsApply, Element, + IndexLayout, OperatorBase, RawAccess, RawAccessMut, RlstScalar, }; /// Wrapper for a dense Green's function evaluator. diff --git a/src/greens_function_evaluators/kifmm_evaluator.rs b/src/greens_function_evaluators/kifmm_evaluator.rs index ecd25e03..c861f167 100644 --- a/src/greens_function_evaluators/kifmm_evaluator.rs +++ b/src/greens_function_evaluators/kifmm_evaluator.rs @@ -4,7 +4,7 @@ use std::cell::RefCell; use bempp_distributed_tools::{self, permutation::DataPermutation}; -use green_kernels::{laplace_3d::Laplace3dKernel, types::GreenKernelEvalType}; +use green_kernels::laplace_3d::Laplace3dKernel; use kifmm::{ traits::{ fftw::{Dft, DftType}, @@ -18,20 +18,17 @@ use kifmm::{ single_node::{AsComplex, Epsilon}, }, }, - tree::{Domain, SortKind}, + tree::SortKind, ChargeHandler, Evaluate, FftFieldTranslation, KiFmm, KiFmmMulti, MultiNodeBuilder, }; -use mpi::{ - topology::SimpleCommunicator, - traits::{Communicator, Equivalence}, -}; +use mpi::traits::{Communicator, Equivalence}; use num::Float; -use rayon::range; use rlst::{ operator::interface::DistributedArrayVectorSpace, rlst_dynamic_array1, AsApply, Element, IndexLayout, MatrixSvd, OperatorBase, RawAccess, RawAccessMut, RlstScalar, }; +/// This structure instantiates an FMM evaluator. pub struct KiFmmEvaluator< 'a, C: Communicator, @@ -44,16 +41,12 @@ pub struct KiFmmEvaluator< T: Dft + AsComplex + Epsilon + MatrixSvd + Float, KiFmmMulti, FftFieldTranslation>: SourceToTargetTranslationMetadata, { - sources: Vec, - targets: Vec, - eval_mode: GreenKernelEvalType, domain_space: &'a DistributedArrayVectorSpace<'a, SourceLayout, T>, range_space: &'a DistributedArrayVectorSpace<'a, TargetLayout, T>, source_permutation: DataPermutation<'a, SourceLayout>, target_permutation: DataPermutation<'a, TargetLayout>, n_permuted_sources: usize, n_permuted_targets: usize, - simple_comm: SimpleCommunicator, fmm: RefCell, FftFieldTranslation>>, } @@ -97,7 +90,6 @@ where pub fn new( sources: &[T::Real], targets: &[T::Real], - eval_mode: GreenKernelEvalType, local_tree_depth: usize, global_tree_depth: usize, expansion_order: usize, @@ -166,16 +158,12 @@ where let target_permutation = DataPermutation::new(range_space.index_layout(), &target_indices); KiFmmEvaluator { - sources: sources.to_vec(), - targets: targets.to_vec(), - eval_mode, domain_space, range_space, source_permutation, target_permutation, n_permuted_sources: source_indices.len(), n_permuted_targets: target_indices.len(), - simple_comm, fmm: cell, } }