glen/dyna3
1
0
Fork 1
Code Issues 26 Pull requests 1 Projects 1 Releases 2 Wiki Activity Actions

Adjust normalization step of nudge routine #43

Merged
glen merged 3 commits from normalize-by-contracting into main 2025-02-06 22:53:42 +00:00
Conversation 0 Commits 3 Files changed 1 +20 -4
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fa1e54f171 - Show all commits

24
app-proto/src/assembly.rs
View file

@ -371,8 +371,8 @@ impl Assembly {
} }
} }
// step each element along the mass shell geodesic that matches its // step the assembly along the deformation, and then project each
// velocity in the deformation found above // element back onto its mass shall
/* KLUDGE */ /* KLUDGE */
// since our test assemblies only include spheres, we assume that every // since our test assemblies only include spheres, we assume that every
// element is on the 1 mass shell // element is on the 1 mass shell
@ -380,9 +380,25 @@ impl Assembly {
elt.representation.update_silent(|rep| { elt.representation.update_silent(|rep| {
match elt.column_index { match elt.column_index {
Some(column_index) => { Some(column_index) => {
// apply the deformation linearly
let rep_next = &*rep + motion_proj.column(column_index); let rep_next = &*rep + motion_proj.column(column_index);
let normalizer = rep_next.dot(&(&*Q * &rep_next));
rep.set_column(0, &(rep_next / normalizer)); // project back onto the mass shell by contracting
// toward the last coordinate axis
let q_sp = rep_next.fixed_rows::<3>(0).norm_squared();
let half_q_lt = -2.0 * rep_next[3] * rep_next[4];
let half_q_lt_sq = half_q_lt * half_q_lt;
let scaling = half_q_lt + (q_sp + half_q_lt_sq).sqrt();
rep.fixed_rows_mut::<4>(0).copy_from(
&(rep_next.fixed_rows::<4>(0) / scaling)
);
rep[4] = rep_next[4];
/* DEBUG */
// report self-product before and after projection
console::log_1(&JsValue::from(
format!("Self-product of element representation\n After step: {}\n Scaling: {}\n After scaling: {}", rep_next.dot(&(&*Q * &rep_next)), scaling, rep.dot(&(&*Q * &*rep)))
));
}, },
None => { None => {
console::log_1(&JsValue::from( console::log_1(&JsValue::from(