Skip to content

Pass elmArea as parameter #142

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

Open
Fuad-HH wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Pass elmArea as parameter #142

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4616e05
calculate tol for search if given is not valid/negative
Fuad-HH Feb 11, 2025
05c485d
pass tol as reference
Fuad-HH Feb 11, 2025
996c9a3
made tol optional
Fuad-HH Feb 12, 2025
025c757
make elmArea a parameter
Fuad-HH Feb 12, 2025
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
19 changes: 14 additions & 5 deletions src/pumipic_adjacency.tpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,8 @@ namespace pumipic {
* @param looplimit Maximum number of iterations
* @param debug True if debug information is printed
* @param func Callable object to handle particles at element sides or destination
* @param elmArea Element areas/volumes based on the mesh dimension
* @param given_tol Tolerance for intersection. If not positive, it is computed from the minimum element area
* @return True if all particles are found at destination or left domain
*/
template <class ParticleType, typename Segment3d, typename SegmentInt, typename Func>
Expand All @@ -466,7 +468,9 @@ namespace pumipic {
o::Write<o::Real>& inter_points,
int looplimit,
bool debug,
Func& func) {
Func& func,
o::Reals& elmArea,
std::optional<o::Real> given_tol = std::nullopt) {
static_assert(
std::is_invocable_r_v<
void, Func, o::Mesh &, ParticleStructure<ParticleType> *,
Expand All @@ -486,9 +490,14 @@ namespace pumipic {
o::Write<o::LO> ptcl_done(psCapacity, 0, "search_ptcl_done");
// Store the last exit face
o::Write<o::LO> lastExit(psCapacity,-1, "search_last_exit");
const auto elmArea = measure_elements_real(&mesh);
bool useBcc = !requireIntersection;
o::Real tol = compute_tolerance_from_area(elmArea);

o::Real tol = 0;
if (!given_tol.has_value()) {
tol = compute_tolerance_from_area(elmArea);
} else {
tol = given_tol.value();
}

int rank;
MPI_Comm_rank(mesh.comm()->get_impl(), &rank);
Expand Down Expand Up @@ -648,9 +657,9 @@ namespace pumipic {
int looplimit,
int debug) {
RemoveParticleOnGeometricModelExit<ParticleType, Segment3d> native_handler(mesh, requireIntersection);

o::Reals elmArea = measure_elements_real(&mesh);
return trace_particle_through_mesh(mesh, ptcls, x_ps_orig, x_ps_tgt, pids, elem_ids, requireIntersection,
inter_faces, inter_points, looplimit, debug, native_handler);
inter_faces, inter_points, looplimit, debug, native_handler, elmArea);
}
}
#endif