diff options
author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-10 12:37:02 -0400 |
---|---|---|
committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-10 12:37:02 -0400 |
commit | e53a4c09eb78e4c5a8365f1328a69ba7f9ff8992 (patch) | |
tree | 3c252af9ffafacab8392bf864270dcd034ed07ed /lib/cluster_finite.c | |
parent | 609fb52b670d8ed74584a988b8c63da82d8d523b (diff) | |
parent | 1810103bc9ac4c9a8d432d113f5ca6eae6560fb4 (diff) | |
download | c++-e53a4c09eb78e4c5a8365f1328a69ba7f9ff8992.tar.gz c++-e53a4c09eb78e4c5a8365f1328a69ba7f9ff8992.tar.bz2 c++-e53a4c09eb78e4c5a8365f1328a69ba7f9ff8992.zip |
Merge branch 'master' of m5:/srv/git/wolff
Diffstat (limited to 'lib/cluster_finite.c')
-rw-r--r-- | lib/cluster_finite.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/cluster_finite.c b/lib/cluster_finite.c index f11a3ea..9392cf8 100644 --- a/lib/cluster_finite.c +++ b/lib/cluster_finite.c @@ -1,8 +1,8 @@ #include "cluster_finite.h" -v_t flip_cluster_finite(state_finite_t *s, v_t v0, q_t rot_ind, gsl_rng *r) { - q_t *rot = s->transformations + s->q * rot_ind; +v_t flip_cluster_finite(state_finite_t *s, v_t v0, R_t rot_ind, gsl_rng *r) { + q_t *rot = s->transformations + s->q * s->involutions[rot_ind]; q_t *R_inv = symmetric_invert(s->q, s->R); v_t nv = 0; @@ -62,14 +62,14 @@ v_t flip_cluster_finite(state_finite_t *s, v_t v0, q_t rot_ind, gsl_rng *r) { s->M[rot_s_old]--; s->M[rot_s_new]++; - s->E += - s->H[rot_s_new] + s->H[rot_s_old]; } else { - q_t diff_old = (s_old + s->q - sn) % s->q; - q_t diff_new = (s_new + s->q - sn) % s->q; + q_t diff_old = s->bond_with_zero_type[s->transformations[s->q * s->transform_site_to_zero[sn] + s_old]]; + q_t diff_new = s->bond_with_zero_type[s->transformations[s->q * s->transform_site_to_zero[sn] + s_new]]; - prob = s->J_probs[diff_new * s->q + diff_old]; + prob = s->J_probs[diff_new * s->n_bond_types + diff_old]; - s->E += - s->J[diff_new] + s->J[diff_old]; + s->B[diff_old]--; + s->B[diff_new]++; } if (gsl_rng_uniform(r) < prob) { // and with probability ps[e]... |