Skip to content

Fix the sign of vector weighted densities in cartesian and cylindrical geometry #120

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
prehner merged 2 commits into from
Jan 23, 2023
Merged

Fix the sign of vector weighted densities in cartesian and cylindrical geometry #120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a399311
Fix the sign of vector weighted densities in cartesian and cylindrica…
prehner Jan 22, 2023
9e60ee5
add changelog entry
prehner Jan 22, 2023
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
Next Next commit
Fix the sign of vector weighted densities in cartesian and cylindrica… 
…l geometry
  • Loading branch information
@prehner
prehner committed Jan 22, 2023
commit a3993119c6d7e523926613976e0e6888734ae8a3
14 changes: 7 additions & 7 deletions feos-dft/src/convolver/transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use num_dual::*;
use rustdct::{DctNum, DctPlanner, TransformType2And3};
use rustfft::{num_complex::Complex, Fft, FftPlanner};
use std::f64::consts::PI;
use std::ops::{DivAssign, SubAssign};
use std::ops::DivAssign;
use std::sync::Arc;

#[derive(Clone, Copy)]
Expand Down Expand Up @@ -189,10 +189,10 @@ impl<T: DualNum<f64> + DctNum + ScalarOperand> FourierTransform<T> for Spherical
if scalar {
self.sine_transform(&f_r * &self.r_grid, f_k.view_mut(), false);
} else {
self.cosine_transform(&f_r * &self.r_grid, f_k.view_mut(), false);
let mut f_aux = Array::zeros(f_k.raw_dim());
self.sine_transform(f_r, f_aux.view_mut(), false);
f_k.sub_assign(&(&f_aux / &self.k_grid));
self.cosine_transform(&f_r * &self.r_grid, f_aux.view_mut(), false);
self.sine_transform(f_r, f_k.view_mut(), false);
f_k.assign(&(&f_k / &self.k_grid - &f_aux));
}
f_k.assign(&(&f_k / &self.k_grid));
f_k[0] = T::zero();
Expand All @@ -202,10 +202,10 @@ impl<T: DualNum<f64> + DctNum + ScalarOperand> FourierTransform<T> for Spherical
if scalar {
self.sine_transform(&f_k * &self.k_grid, f_r.view_mut(), true);
} else {
self.cosine_transform(&f_k * &self.k_grid, f_r.view_mut(), true);
let mut f_aux = Array::zeros(f_r.raw_dim());
self.sine_transform(f_k, f_aux.view_mut(), true);
f_r.sub_assign(&(&f_aux / &self.r_grid));
self.cosine_transform(&f_k * &self.k_grid, f_aux.view_mut(), true);
self.sine_transform(f_k, f_r.view_mut(), true);
f_r.assign(&(&f_r / &self.r_grid - &f_aux));
}
f_r.assign(&(&f_r / &self.r_grid));
}
Expand Down
2 changes: 1 addition & 1 deletion feos-dft/src/weight_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl<T: DualNum<f64>> WeightFunction<T> {
w_i.assign(&match self.shape {
WeightFunctionShape::DeltaVec => {
&rik.mapv(|rik| {
(rik.sph_j0() + rik.sph_j2()) * (-radius.powi(3) * 4.0 * FRAC_PI_3 * p)
(rik.sph_j0() + rik.sph_j2()) * (radius.powi(3) * 4.0 * FRAC_PI_3 * p)
}) * &k_x
}
_ => unreachable!(),
Expand Down