diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-10-09 11:49:41 -0400 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-10-09 11:49:41 -0400 |
| commit | f0ddf00c498392946e3e5a8a71f25efc37418422 (patch) | |
| tree | ecc02593432ebabbdb4585c079c7fdb0a8b30bf0 /src | |
| parent | be3434d70d4a83527d2fb756da1ee565aafda3f3 (diff) | |
| parent | 749d387b48456b78e448ab33516c01de20a2624b (diff) | |
| download | c++-f0ddf00c498392946e3e5a8a71f25efc37418422.tar.gz c++-f0ddf00c498392946e3e5a8a71f25efc37418422.tar.bz2 c++-f0ddf00c498392946e3e5a8a71f25efc37418422.zip | |
Merge branch 'master' of 10.9.0.2:wolff
Diffstat (limited to 'src')
| -rw-r--r-- | src/wolff_On.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/wolff_On.cpp b/src/wolff_On.cpp index 6cd8777..2356875 100644 --- a/src/wolff_On.cpp +++ b/src/wolff_On.cpp @@ -142,8 +142,21 @@ int main(int argc, char *argv[]) { std::function <orthogonal_R_t(gsl_rng *, vector_R_t)> gen_R; if (use_pert) { + double Hish; + if (modulated_field) { + Hish = fabs(H_vec[0]); + } else { + double H2 = 0; + for (q_t i = 0; i < N_COMP; i++) { + H2 += pow(H_vec[i], 2); + } + Hish = sqrt(H2); + } + + epsilon = sqrt((N_COMP - 1) * T / (D + Hish / 2)) / 2; + gen_R = std::bind(generate_rotation_perturbation <N_COMP>, std::placeholders::_1, std::placeholders::_2, epsilon, order); - pert_type = "PERTURB"; + pert_type = "PERTURB5"; } else { gen_R = generate_rotation_uniform <N_COMP>; pert_type = "UNIFORM"; |