Skip to content

Par rot functions #269

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

Merged
merged 2 commits into from
Mar 27, 2025
Merged

Par rot functions #269

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
351ade8
Draft parallelized version of rotation functions.
Mar 27, 2025
4f08820
Fix variable assignment.
Mar 27, 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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ rand_distr = "0.4.3"
toml = "0.7.4"
anyhow = "1.0.71"
itertools = "0.10.5"
rayon = "1.7.0"
rayon = "1.10.0"
geo = {version = "0.25", optional = false}
indicatif = {version = "0.15.0", features=["rayon"]}
serde = { version = "1.0.163", features = ["derive"] }
Expand Down
23 changes: 8 additions & 15 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use std::slice;
use std::sync::Mutex;

//itertools
use itertools::izip;
use itertools::{izip};

//Math
use std::f64::consts::FRAC_2_SQRT_PI;
Expand Down Expand Up @@ -1682,22 +1682,15 @@ pub fn rotate_back_py(nx: f64, ny: f64, nz: f64, ux: f64, uy: f64, uz: f64) -> (
/// direction (list(f64), list(f64), list(f64)): direction vector of particle in simulation coordinates.
pub fn rotate_back_vec_py(nx: Vec<f64>, ny: Vec<f64>, nz: Vec<f64>, ux: Vec<f64>, uy: Vec<f64>, uz: Vec<f64>) -> (Vec<f64>, Vec<f64>, Vec<f64>) {

let length = nx.len();
let (ux_new, (uy_new, uz_new)) = (nx, ny, nz, ux, uy, uz).into_par_iter().map(|(nx_, ny_, nz_, ux_, uy_, uz_)| {

let mut ux_new = Vec::with_capacity(length);
let mut uy_new = Vec::with_capacity(length);
let mut uz_new = Vec::with_capacity(length);
let mut ux_mut = ux_;
let mut uy_mut = uy_;
let mut uz_mut = uz_;
rotate_back(nx_, ny_, nz_, &mut ux_mut, &mut uy_mut, &mut uz_mut);

(0..length).into_iter().for_each(|index| {

let mut ux_ = ux[index];
let mut uy_ = uy[index];
let mut uz_ = uz[index];
rotate_back(nx[index], ny[index], nz[index], &mut ux_, &mut uy_, &mut uz_);
ux_new.push(ux_);
uy_new.push(uy_);
uz_new.push(uz_);
});
(ux_mut, (uy_mut, uz_mut))
}).unzip();

(ux_new, uy_new, uz_new)
}
Expand Down