summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaron Kent-Dobias <jaron@kent-dobias.com>2017-10-18 16:49:12 -0400
committerJaron Kent-Dobias <jaron@kent-dobias.com>2017-10-18 16:49:12 -0400
commit1e8779cbc8d9497b6622f93fd52dd3b918967a6e (patch)
treef8998786ae3f26ee0ce997c2fe7bb95817565014 /src
parent14b533f9d8b58ada158dac15469da035fa2d8159 (diff)
downloadc++-1e8779cbc8d9497b6622f93fd52dd3b918967a6e.tar.gz
c++-1e8779cbc8d9497b6622f93fd52dd3b918967a6e.tar.bz2
c++-1e8779cbc8d9497b6622f93fd52dd3b918967a6e.zip
made the wolff hybrid more efficient
Diffstat (limited to 'src')
-rw-r--r--src/wolff.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wolff.c b/src/wolff.c
index 9082c81..77971e2 100644
--- a/src/wolff.c
+++ b/src/wolff.c
@@ -210,15 +210,14 @@ int main(int argc, char *argv[]) {
FILE *outfile = fopen("out.dat", "a");
double tau = batch_size * corrmE->c / corrE->c;
- double dtau = tau * sqrt(pow(corrmE->dc / corrmE->c, 2) + pow(corrE->dc / corrE->c, 2));
fprintf(outfile,
- "%u %.15f %.15f %" PRIu64 " %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %" PRIu64 " %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %" PRIu64 " %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f\n", L,
- T, H, n_runs,
+ "%u %.15f %.15f %" PRIu64 " %" PRIu64 " %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %" PRIu64 " %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %" PRIu64 " %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f %.15f\n",
+ L, T, H, n_runs, n_steps,
E->x / h->nv, E->dx / h->nv, M->x / h->nv, M->dx / h->nv, E->c / h->nv, E->dc / h->nv, M->c / h->nv, M->dc / h->nv,
eE->n, eE->x / h->nv, eE->dx / h->nv, eM->x / h->nv, eM->dx / h->nv, eE->c / h->nv, eE->dc / h->nv, eM->c / h->nv, eM->dc / h->nv,
mE->n, mE->x / h->nv, mE->dx / h->nv, mM->x / h->nv, mM->dx / h->nv, mE->c / h->nv, mE->dc / h->nv, mM->c / h->nv, mM->dc / h->nv,
- aM->x / h->nv, aM->dx / h->nv, aM->c / h->nv, aM->dc / h->nv, tau, dtau);
+ aM->x / h->nv, aM->dx / h->nv, aM->c / h->nv, aM->dc / h->nv, tau);
fclose(outfile);
if (output_state) {