summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaron Kent-Dobias <jaron@kent-dobias.com>2018-02-28 21:30:33 -0500
committerJaron Kent-Dobias <jaron@kent-dobias.com>2018-02-28 21:30:33 -0500
commit4e643b30203b9d8af792c109498ecd70f873d584 (patch)
tree5b4c6de6a1240e10d426e48356f62afb04b2dc95 /src
parent1fbcb4dd4e52daeb53becba33827f8e48c5606b2 (diff)
downloadc++-4e643b30203b9d8af792c109498ecd70f873d584.tar.gz
c++-4e643b30203b9d8af792c109498ecd70f873d584.tar.bz2
c++-4e643b30203b9d8af792c109498ecd70f873d584.zip
changes to how field arguments are passed to the vector method
Diffstat (limited to 'src')
-rw-r--r--src/wolff_vector.c31
1 files changed, 26 insertions, 5 deletions
diff --git a/src/wolff_vector.c b/src/wolff_vector.c
index c6ab695..904fcfd 100644
--- a/src/wolff_vector.c
+++ b/src/wolff_vector.c
@@ -5,12 +5,32 @@ double identity(double x) {
return x;
}
-double zero(double *x) {
+double zero(q_t n, double *H, double *x) {
return 0.0;
}
-double test(double *x) {
- return -x[1];
+double dot(q_t n, double *H, double *x) {
+ double total = 0;
+ for (q_t i = 0; i < n; i++) {
+ total += H[i] * x[i];
+ }
+ return total;
+}
+
+double theta(double x, double y) {
+ double val = atan(y / x);
+
+ if (x < 0.0 && y > 0.0) {
+ return M_PI + val;
+ } else if ( x < 0.0 && y < 0.0 ) {
+ return - M_PI + val;
+ } else {
+ return val;
+ }
+}
+
+double modulated(q_t n, double *H_info, double *x) {
+ return H_info[0] * cos(H_info[1] * theta(x[0], x[1]));
}
int main(int argc, char *argv[]) {
@@ -83,8 +103,9 @@ int main(int argc, char *argv[]) {
s->spins[q * i] = 1.0;
}
+ s->H_info = H;
s->T = T;
- s->H = test;
+ s->H = dot;
s->J = identity;
s->R = (double *)calloc(q * q, sizeof(double));
@@ -95,7 +116,7 @@ int main(int argc, char *argv[]) {
s->M = (double *)calloc(q, sizeof(double));
s->M[0] = 1.0 * (double)h->nv;
- s->E = - ((double)h->ne) * s->J(1.0) - s->H(s->M);
+ s->E = - ((double)h->ne) * s->J(1.0) - s->H(s->n, s->H_info, s->M);
printf("%g %g\n", s->E, s->M[0]);