Code beautification with uncrustify
[alexxy/gromacs.git] / src / programs / mdrun / repl_ex.c
index a188b8f8ee65fb206936b68e86d2d42e7244b171..aaa236fa047000ecaa4921751f9e022e6ec16b7c 100644 (file)
@@ -1,12 +1,12 @@
 /* -*- mode: c; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; c-file-style: "stroustrup"; -*-
  *
- * 
+ *
  *                This source code is part of
- * 
+ *
  *                 G   R   O   M   A   C   S
- * 
+ *
  *          GROningen MAchine for Chemical Simulations
- * 
+ *
  *                        VERSION 3.2.0
  * Written by David van der Spoel, Erik Lindahl, Berk Hess, and others.
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * If you want to redistribute modifications, please consider that
  * scientific software is very special. Version control is crucial -
  * bugs must be traceable. We will be happy to consider code for
  * inclusion in the official distribution, but derived work must not
  * be called official GROMACS. Details are found in the README & COPYING
  * files - if they are missing, get the official version at www.gromacs.org.
- * 
+ *
  * To help us fund GROMACS development, we humbly ask that you cite
  * the papers on the package - you can find them in the top README file.
- * 
+ *
  * For more info, check our website at http://www.gromacs.org
- * 
+ *
  * And Hey:
  * Gallium Rubidium Oxygen Manganese Argon Carbon Silicon
  */
@@ -54,7 +54,9 @@
 #define PROBABILITYCUTOFF 100
 /* we don't bother evaluating if events are more rare than exp(-100) = 3.7x10^-44 */
 
-enum { ereTEMP, ereLAMBDA, ereENDSINGLE ,ereTL, ereNR };
+enum {
+    ereTEMP, ereLAMBDA, ereENDSINGLE, ereTL, ereNR
+};
 const char *erename[ereNR] = { "temperature", "lambda", "end_single_marker", "temperature and lambda"};
 /* end_single_marker merely notes the end of single variable replica exchange. All types higher than
    it are multiple replica exchange methods */
@@ -63,58 +65,58 @@ const char *erename[ereNR] = { "temperature", "lambda", "end_single_marker", "te
 
 typedef struct gmx_repl_ex
 {
-    int  repl;
-    int  nrepl;
-    real temp;
-    int  type;
-    real **q;
+    int      repl;
+    int      nrepl;
+    real     temp;
+    int      type;
+    real   **q;
     gmx_bool bNPT;
-    real *pres;
-    int  *ind;
-    int *allswaps;
-    int  nst;
-    int nex;
-    int  seed;
-    int  nattempt[2];
-    real *prob_sum;
-    int  **nmoves;
-    int  *nexchange;
+    real    *pres;
+    int     *ind;
+    int     *allswaps;
+    int      nst;
+    int      nex;
+    int      seed;
+    int      nattempt[2];
+    real    *prob_sum;
+    int    **nmoves;
+    int     *nexchange;
 
     /* these are helper arrays for replica exchange; allocated here so they
        don't have to be allocated each time */
-    int *destinations;
-    int **cyclic;
-    int **order;
-    int *tmpswap;
+    int      *destinations;
+    int     **cyclic;
+    int     **order;
+    int      *tmpswap;
     gmx_bool *incycle;
     gmx_bool *bEx;
 
     /* helper arrays to hold the quantities that are exchanged */
-    real *prob;
-    real *Epot;
-    real *beta;
-    real *Vol;
+    real  *prob;
+    real  *Epot;
+    real  *beta;
+    real  *Vol;
     real **de;
 
 } t_gmx_repl_ex;
 
-static gmx_bool repl_quantity(FILE *fplog,const gmx_multisim_t *ms,
-                              struct gmx_repl_ex *re,int ere,real q)
+static gmx_bool repl_quantity(FILE *fplog, const gmx_multisim_t *ms,
+                              struct gmx_repl_ex *re, int ere, real q)
 {
-    real *qall;
+    real    *qall;
     gmx_bool bDiff;
-    int  i,s;
+    int      i, s;
 
-    snew(qall,ms->nsim);
+    snew(qall, ms->nsim);
     qall[re->repl] = q;
-    gmx_sum_sim(ms->nsim,qall,ms);
+    gmx_sum_sim(ms->nsim, qall, ms);
 
     bDiff = FALSE;
-    for (s=1; s<ms->nsim; s++)
+    for (s = 1; s < ms->nsim; s++)
     {
         if (qall[s] != qall[0])
         {
-            bDiff = TRUE;   
+            bDiff = TRUE;
         }
     }
 
@@ -123,8 +125,8 @@ static gmx_bool repl_quantity(FILE *fplog,const gmx_multisim_t *ms,
         /* Set the replica exchange type and quantities */
         re->type = ere;
 
-        snew(re->q[ere],re->nrepl);
-        for(s=0; s<ms->nsim; s++)
+        snew(re->q[ere], re->nrepl);
+        for (s = 0; s < ms->nsim; s++)
         {
             re->q[ere][s] = qall[s];
         }
@@ -139,87 +141,89 @@ gmx_repl_ex_t init_replica_exchange(FILE *fplog,
                                     const t_inputrec *ir,
                                     int nst, int nex, int init_seed)
 {
-    real temp,pres;
-    int  i,j,k;
+    real                temp, pres;
+    int                 i, j, k;
     struct gmx_repl_ex *re;
-    gmx_bool bTemp;
-    gmx_bool bLambda=FALSE;
+    gmx_bool            bTemp;
+    gmx_bool            bLambda = FALSE;
 
-    fprintf(fplog,"\nInitializing Replica Exchange\n");
+    fprintf(fplog, "\nInitializing Replica Exchange\n");
 
     if (ms == NULL || ms->nsim == 1)
     {
-        gmx_fatal(FARGS,"Nothing to exchange with only one replica, maybe you forgot to set the -multi option of mdrun?");
+        gmx_fatal(FARGS, "Nothing to exchange with only one replica, maybe you forgot to set the -multi option of mdrun?");
     }
 
-    snew(re,1);
+    snew(re, 1);
 
     re->repl     = ms->sim;
     re->nrepl    = ms->nsim;
-    snew(re->q,ereENDSINGLE);
-
-    fprintf(fplog,"Repl  There are %d replicas:\n",re->nrepl);
-
-    check_multi_int(fplog,ms,state->natoms,"the number of atoms",FALSE);
-    check_multi_int(fplog,ms,ir->eI,"the integrator",FALSE);
-    check_multi_large_int(fplog,ms,ir->init_step+ir->nsteps,"init_step+nsteps",FALSE);
-    check_multi_large_int(fplog,ms,(ir->init_step+nst-1)/nst,
-                          "first exchange step: init_step/-replex",FALSE);
-    check_multi_int(fplog,ms,ir->etc,"the temperature coupling",FALSE);
-    check_multi_int(fplog,ms,ir->opts.ngtc,
-                    "the number of temperature coupling groups",FALSE);
-    check_multi_int(fplog,ms,ir->epc,"the pressure coupling",FALSE);
-    check_multi_int(fplog,ms,ir->efep,"free energy",FALSE);
-    check_multi_int(fplog,ms,ir->fepvals->n_lambda,"number of lambda states",FALSE);
+    snew(re->q, ereENDSINGLE);
+
+    fprintf(fplog, "Repl  There are %d replicas:\n", re->nrepl);
+
+    check_multi_int(fplog, ms, state->natoms, "the number of atoms", FALSE);
+    check_multi_int(fplog, ms, ir->eI, "the integrator", FALSE);
+    check_multi_large_int(fplog, ms, ir->init_step+ir->nsteps, "init_step+nsteps", FALSE);
+    check_multi_large_int(fplog, ms, (ir->init_step+nst-1)/nst,
+                          "first exchange step: init_step/-replex", FALSE);
+    check_multi_int(fplog, ms, ir->etc, "the temperature coupling", FALSE);
+    check_multi_int(fplog, ms, ir->opts.ngtc,
+                    "the number of temperature coupling groups", FALSE);
+    check_multi_int(fplog, ms, ir->epc, "the pressure coupling", FALSE);
+    check_multi_int(fplog, ms, ir->efep, "free energy", FALSE);
+    check_multi_int(fplog, ms, ir->fepvals->n_lambda, "number of lambda states", FALSE);
 
     re->temp = ir->opts.ref_t[0];
-    for(i=1; (i<ir->opts.ngtc); i++)
+    for (i = 1; (i < ir->opts.ngtc); i++)
     {
         if (ir->opts.ref_t[i] != re->temp)
         {
-            fprintf(fplog,"\nWARNING: The temperatures of the different temperature coupling groups are not identical\n\n");
-            fprintf(stderr,"\nWARNING: The temperatures of the different temperature coupling groups are not identical\n\n");
+            fprintf(fplog, "\nWARNING: The temperatures of the different temperature coupling groups are not identical\n\n");
+            fprintf(stderr, "\nWARNING: The temperatures of the different temperature coupling groups are not identical\n\n");
         }
     }
 
     re->type = -1;
-    bTemp = repl_quantity(fplog,ms,re,ereTEMP,re->temp);
+    bTemp    = repl_quantity(fplog, ms, re, ereTEMP, re->temp);
     if (ir->efep != efepNO)
     {
-        bLambda = repl_quantity(fplog,ms,re,ereLAMBDA,(real)ir->fepvals->init_fep_state);
+        bLambda = repl_quantity(fplog, ms, re, ereLAMBDA, (real)ir->fepvals->init_fep_state);
     }
     if (re->type == -1)  /* nothing was assigned */
     {
-        gmx_fatal(FARGS,"The properties of the %d systems are all the same, there is nothing to exchange",re->nrepl);
+        gmx_fatal(FARGS, "The properties of the %d systems are all the same, there is nothing to exchange", re->nrepl);
     }
-    if (bLambda && bTemp) {
+    if (bLambda && bTemp)
+    {
         re->type = ereTL;
     }
 
     if (bTemp)
     {
-        please_cite(fplog,"Sugita1999a");
+        please_cite(fplog, "Sugita1999a");
         if (ir->epc != epcNO)
         {
             re->bNPT = TRUE;
-            fprintf(fplog,"Repl  Using Constant Pressure REMD.\n");
-            please_cite(fplog,"Okabe2001a");
+            fprintf(fplog, "Repl  Using Constant Pressure REMD.\n");
+            please_cite(fplog, "Okabe2001a");
         }
         if (ir->etc == etcBERENDSEN)
         {
-            gmx_fatal(FARGS,"REMD with the %s thermostat does not produce correct potential energy distributions, consider using the %s thermostat instead",
-                      ETCOUPLTYPE(ir->etc),ETCOUPLTYPE(etcVRESCALE));
+            gmx_fatal(FARGS, "REMD with the %s thermostat does not produce correct potential energy distributions, consider using the %s thermostat instead",
+                      ETCOUPLTYPE(ir->etc), ETCOUPLTYPE(etcVRESCALE));
         }
     }
-    if (bLambda) {
+    if (bLambda)
+    {
         if (ir->fepvals->delta_lambda != 0)   /* check this? */
         {
-            gmx_fatal(FARGS,"delta_lambda is not zero");
+            gmx_fatal(FARGS, "delta_lambda is not zero");
         }
     }
     if (re->bNPT)
     {
-        snew(re->pres,re->nrepl);
+        snew(re->pres, re->nrepl);
         if (ir->epct == epctSURFACETENSION)
         {
             pres = ir->ref_p[ZZ][ZZ];
@@ -227,8 +231,8 @@ gmx_repl_ex_t init_replica_exchange(FILE *fplog,
         else
         {
             pres = 0;
-            j = 0;
-            for(i=0; i<DIM; i++)
+            j    = 0;
+            for (i = 0; i < DIM; i++)
             {
                 if (ir->compress[i][i] != 0)
                 {
@@ -239,93 +243,94 @@ gmx_repl_ex_t init_replica_exchange(FILE *fplog,
             pres /= j;
         }
         re->pres[re->repl] = pres;
-        gmx_sum_sim(re->nrepl,re->pres,ms);
+        gmx_sum_sim(re->nrepl, re->pres, ms);
     }
 
     /* Make an index for increasing replica order */
     /* only makes sense if one or the other is varying, not both!
        if both are varying, we trust the order the person gave. */
-    snew(re->ind,re->nrepl);
-    for(i=0; i<re->nrepl; i++)
+    snew(re->ind, re->nrepl);
+    for (i = 0; i < re->nrepl; i++)
     {
         re->ind[i] = i;
     }
 
-    if (re->type<ereENDSINGLE) {
+    if (re->type < ereENDSINGLE)
+    {
 
-        for(i=0; i<re->nrepl; i++)
+        for (i = 0; i < re->nrepl; i++)
         {
-            for(j=i+1; j<re->nrepl; j++)
+            for (j = i+1; j < re->nrepl; j++)
             {
                 if (re->q[re->type][re->ind[j]] < re->q[re->type][re->ind[i]])
                 {
-                    k = re->ind[i];
+                    k          = re->ind[i];
                     re->ind[i] = re->ind[j];
                     re->ind[j] = k;
                 }
                 else if (re->q[re->type][re->ind[j]] == re->q[re->type][re->ind[i]])
                 {
-                    gmx_fatal(FARGS,"Two replicas have identical %ss",erename[re->type]);
+                    gmx_fatal(FARGS, "Two replicas have identical %ss", erename[re->type]);
                 }
             }
         }
     }
 
     /* keep track of all the swaps, starting with the initial placement. */
-    snew(re->allswaps,re->nrepl);
-    for(i=0; i<re->nrepl; i++)
+    snew(re->allswaps, re->nrepl);
+    for (i = 0; i < re->nrepl; i++)
     {
         re->allswaps[i] = re->ind[i];
     }
 
     switch (re->type)
     {
-    case ereTEMP:
-        fprintf(fplog,"\nReplica exchange in temperature\n");
-        for(i=0; i<re->nrepl; i++)
-        {
-            fprintf(fplog," %5.1f",re->q[re->type][re->ind[i]]);
-        }
-        fprintf(fplog,"\n");
-        break;
-    case ereLAMBDA:
-        fprintf(fplog,"\nReplica exchange in lambda\n");
-        for(i=0; i<re->nrepl; i++)
-        {
-            fprintf(fplog," %3d",(int)re->q[re->type][re->ind[i]]);
-        }
-        fprintf(fplog,"\n");
-        break;
-    case ereTL:
-        fprintf(fplog,"\nReplica exchange in temperature and lambda state\n");
-        for(i=0; i<re->nrepl; i++)
-        {
-            fprintf(fplog," %5.1f",re->q[ereTEMP][re->ind[i]]);
-        }
-        fprintf(fplog,"\n");
-        for(i=0; i<re->nrepl; i++)
-        {
-            fprintf(fplog," %5d",(int)re->q[ereLAMBDA][re->ind[i]]);
-        }
-        fprintf(fplog,"\n");
-        break;
-    default:
-        gmx_incons("Unknown replica exchange quantity");
+        case ereTEMP:
+            fprintf(fplog, "\nReplica exchange in temperature\n");
+            for (i = 0; i < re->nrepl; i++)
+            {
+                fprintf(fplog, " %5.1f", re->q[re->type][re->ind[i]]);
+            }
+            fprintf(fplog, "\n");
+            break;
+        case ereLAMBDA:
+            fprintf(fplog, "\nReplica exchange in lambda\n");
+            for (i = 0; i < re->nrepl; i++)
+            {
+                fprintf(fplog, " %3d", (int)re->q[re->type][re->ind[i]]);
+            }
+            fprintf(fplog, "\n");
+            break;
+        case ereTL:
+            fprintf(fplog, "\nReplica exchange in temperature and lambda state\n");
+            for (i = 0; i < re->nrepl; i++)
+            {
+                fprintf(fplog, " %5.1f", re->q[ereTEMP][re->ind[i]]);
+            }
+            fprintf(fplog, "\n");
+            for (i = 0; i < re->nrepl; i++)
+            {
+                fprintf(fplog, " %5d", (int)re->q[ereLAMBDA][re->ind[i]]);
+            }
+            fprintf(fplog, "\n");
+            break;
+        default:
+            gmx_incons("Unknown replica exchange quantity");
     }
     if (re->bNPT)
     {
-        fprintf(fplog,"\nRepl  p");
-        for(i=0; i<re->nrepl; i++)
+        fprintf(fplog, "\nRepl  p");
+        for (i = 0; i < re->nrepl; i++)
         {
-            fprintf(fplog," %5.2f",re->pres[re->ind[i]]);
+            fprintf(fplog, " %5.2f", re->pres[re->ind[i]]);
         }
 
-        for(i=0; i<re->nrepl; i++)
+        for (i = 0; i < re->nrepl; i++)
         {
             if ((i > 0) && (re->pres[re->ind[i]] < re->pres[re->ind[i-1]]))
             {
-                fprintf(fplog,"\nWARNING: The reference pressures decrease with increasing temperatures\n\n");
-                fprintf(stderr,"\nWARNING: The reference pressures decrease with increasing temperatures\n\n");
+                fprintf(fplog, "\nWARNING: The reference pressures decrease with increasing temperatures\n\n");
+                fprintf(stderr, "\nWARNING: The reference pressures decrease with increasing temperatures\n\n");
             }
         }
     }
@@ -340,81 +345,81 @@ gmx_repl_ex_t init_replica_exchange(FILE *fplog,
         {
             re->seed = 0;
         }
-        gmx_sumi_sim(1,&(re->seed),ms);
+        gmx_sumi_sim(1, &(re->seed), ms);
     }
     else
     {
         re->seed = init_seed;
     }
-    fprintf(fplog,"\nReplica exchange interval: %d\n",re->nst);
-    fprintf(fplog,"\nReplica random seed: %d\n",re->seed);
+    fprintf(fplog, "\nReplica exchange interval: %d\n", re->nst);
+    fprintf(fplog, "\nReplica random seed: %d\n", re->seed);
 
     re->nattempt[0] = 0;
     re->nattempt[1] = 0;
 
-    snew(re->prob_sum,re->nrepl);
-    snew(re->nexchange,re->nrepl);
-    snew(re->nmoves,re->nrepl);
-    for (i=0;i<re->nrepl;i++) 
+    snew(re->prob_sum, re->nrepl);
+    snew(re->nexchange, re->nrepl);
+    snew(re->nmoves, re->nrepl);
+    for (i = 0; i < re->nrepl; i++)
     {
-        snew(re->nmoves[i],re->nrepl);
+        snew(re->nmoves[i], re->nrepl);
     }
-    fprintf(fplog,"Replica exchange information below: x=exchange, pr=probability\n");
+    fprintf(fplog, "Replica exchange information below: x=exchange, pr=probability\n");
 
     /* generate space for the helper functions so we don't have to snew each time */
 
-    snew(re->destinations,re->nrepl);
-    snew(re->incycle,re->nrepl);
-    snew(re->tmpswap,re->nrepl);
-    snew(re->cyclic,re->nrepl);
-    snew(re->order,re->nrepl);
-    for (i=0;i<re->nrepl;i++)
+    snew(re->destinations, re->nrepl);
+    snew(re->incycle, re->nrepl);
+    snew(re->tmpswap, re->nrepl);
+    snew(re->cyclic, re->nrepl);
+    snew(re->order, re->nrepl);
+    for (i = 0; i < re->nrepl; i++)
     {
-        snew(re->cyclic[i],re->nrepl);
-        snew(re->order[i],re->nrepl);
+        snew(re->cyclic[i], re->nrepl);
+        snew(re->order[i], re->nrepl);
     }
     /* allocate space for the functions storing the data for the replicas */
     /* not all of these arrays needed in all cases, but they don't take
        up much space, since the max size is nrepl**2 */
-    snew(re->prob,re->nrepl);
-    snew(re->bEx,re->nrepl);
-    snew(re->beta,re->nrepl);
-    snew(re->Vol,re->nrepl);
-    snew(re->Epot,re->nrepl);
-    snew(re->de,re->nrepl);
-    for (i=0;i<re->nrepl;i++)
+    snew(re->prob, re->nrepl);
+    snew(re->bEx, re->nrepl);
+    snew(re->beta, re->nrepl);
+    snew(re->Vol, re->nrepl);
+    snew(re->Epot, re->nrepl);
+    snew(re->de, re->nrepl);
+    for (i = 0; i < re->nrepl; i++)
     {
-        snew(re->de[i],re->nrepl);
+        snew(re->de[i], re->nrepl);
     }
     re->nex = nex;
     return re;
 }
 
-static void exchange_reals(const gmx_multisim_t *ms,int b,real *v,int n)
+static void exchange_reals(const gmx_multisim_t *ms, int b, real *v, int n)
 {
     real *buf;
-    int  i;
+    int   i;
 
     if (v)
     {
-        snew(buf,n);
+        snew(buf, n);
 #ifdef GMX_MPI
         /*
-          MPI_Sendrecv(v,  n*sizeof(real),MPI_BYTE,MSRANK(ms,b),0,
-          buf,n*sizeof(real),MPI_BYTE,MSRANK(ms,b),0,
-          ms->mpi_comm_masters,MPI_STATUS_IGNORE);
-        */
+           MPI_Sendrecv(v,  n*sizeof(real),MPI_BYTE,MSRANK(ms,b),0,
+           buf,n*sizeof(real),MPI_BYTE,MSRANK(ms,b),0,
+           ms->mpi_comm_masters,MPI_STATUS_IGNORE);
+         */
         {
             MPI_Request mpi_req;
 
-            MPI_Isend(v,n*sizeof(real),MPI_BYTE,MSRANK(ms,b),0,
-                      ms->mpi_comm_masters,&mpi_req);
-            MPI_Recv(buf,n*sizeof(real),MPI_BYTE,MSRANK(ms,b),0,
-                     ms->mpi_comm_masters,MPI_STATUS_IGNORE);
-            MPI_Wait(&mpi_req,MPI_STATUS_IGNORE);
+            MPI_Isend(v, n*sizeof(real), MPI_BYTE, MSRANK(ms, b), 0,
+                      ms->mpi_comm_masters, &mpi_req);
+            MPI_Recv(buf, n*sizeof(real), MPI_BYTE, MSRANK(ms, b), 0,
+                     ms->mpi_comm_masters, MPI_STATUS_IGNORE);
+            MPI_Wait(&mpi_req, MPI_STATUS_IGNORE);
         }
 #endif
-        for(i=0; i<n; i++)
+        for (i = 0; i < n; i++)
         {
             v[i] = buf[i];
         }
@@ -423,62 +428,63 @@ static void exchange_reals(const gmx_multisim_t *ms,int b,real *v,int n)
 }
 
 
-static void exchange_ints(const gmx_multisim_t *ms,int b,int *v,int n)
+static void exchange_ints(const gmx_multisim_t *ms, int b, int *v, int n)
 {
-  int *buf;
-  int  i;
+    int *buf;
+    int  i;
 
-  if (v) {
-    snew(buf,n);
-#ifdef GMX_MPI
-    /*
-    MPI_Sendrecv(v,  n*sizeof(int),MPI_BYTE,MSRANK(ms,b),0,
-                buf,n*sizeof(int),MPI_BYTE,MSRANK(ms,b),0,
-                ms->mpi_comm_masters,MPI_STATUS_IGNORE);
-    */
+    if (v)
     {
-      MPI_Request mpi_req;
+        snew(buf, n);
+#ifdef GMX_MPI
+        /*
+           MPI_Sendrecv(v,  n*sizeof(int),MPI_BYTE,MSRANK(ms,b),0,
+             buf,n*sizeof(int),MPI_BYTE,MSRANK(ms,b),0,
+             ms->mpi_comm_masters,MPI_STATUS_IGNORE);
+         */
+        {
+            MPI_Request mpi_req;
 
-      MPI_Isend(v,n*sizeof(int),MPI_BYTE,MSRANK(ms,b),0,
-               ms->mpi_comm_masters,&mpi_req);
-      MPI_Recv(buf,n*sizeof(int),MPI_BYTE,MSRANK(ms,b),0,
-              ms->mpi_comm_masters,MPI_STATUS_IGNORE);
-      MPI_Wait(&mpi_req,MPI_STATUS_IGNORE);
-    }
+            MPI_Isend(v, n*sizeof(int), MPI_BYTE, MSRANK(ms, b), 0,
+                      ms->mpi_comm_masters, &mpi_req);
+            MPI_Recv(buf, n*sizeof(int), MPI_BYTE, MSRANK(ms, b), 0,
+                     ms->mpi_comm_masters, MPI_STATUS_IGNORE);
+            MPI_Wait(&mpi_req, MPI_STATUS_IGNORE);
+        }
 #endif
-    for(i=0; i<n; i++) 
-    {
-        v[i] = buf[i];
+        for (i = 0; i < n; i++)
+        {
+            v[i] = buf[i];
+        }
+        sfree(buf);
     }
-    sfree(buf);
-  }
 }
 
-static void exchange_doubles(const gmx_multisim_t *ms,int b,double *v,int n)
+static void exchange_doubles(const gmx_multisim_t *ms, int b, double *v, int n)
 {
     double *buf;
-    int  i;
+    int     i;
 
     if (v)
     {
-        snew(buf,n);
+        snew(buf, n);
 #ifdef GMX_MPI
         /*
-          MPI_Sendrecv(v,  n*sizeof(double),MPI_BYTE,MSRANK(ms,b),0,
-          buf,n*sizeof(double),MPI_BYTE,MSRANK(ms,b),0,
-          ms->mpi_comm_masters,MPI_STATUS_IGNORE);
-        */
+           MPI_Sendrecv(v,  n*sizeof(double),MPI_BYTE,MSRANK(ms,b),0,
+           buf,n*sizeof(double),MPI_BYTE,MSRANK(ms,b),0,
+           ms->mpi_comm_masters,MPI_STATUS_IGNORE);
+         */
         {
             MPI_Request mpi_req;
 
-            MPI_Isend(v,n*sizeof(double),MPI_BYTE,MSRANK(ms,b),0,
-                      ms->mpi_comm_masters,&mpi_req);
-            MPI_Recv(buf,n*sizeof(double),MPI_BYTE,MSRANK(ms,b),0,
-                     ms->mpi_comm_masters,MPI_STATUS_IGNORE);
-            MPI_Wait(&mpi_req,MPI_STATUS_IGNORE);
+            MPI_Isend(v, n*sizeof(double), MPI_BYTE, MSRANK(ms, b), 0,
+                      ms->mpi_comm_masters, &mpi_req);
+            MPI_Recv(buf, n*sizeof(double), MPI_BYTE, MSRANK(ms, b), 0,
+                     ms->mpi_comm_masters, MPI_STATUS_IGNORE);
+            MPI_Wait(&mpi_req, MPI_STATUS_IGNORE);
         }
 #endif
-        for(i=0; i<n; i++)
+        for (i = 0; i < n; i++)
         {
             v[i] = buf[i];
         }
@@ -486,246 +492,246 @@ static void exchange_doubles(const gmx_multisim_t *ms,int b,double *v,int n)
     }
 }
 
-static void exchange_rvecs(const gmx_multisim_t *ms,int b,rvec *v,int n)
+static void exchange_rvecs(const gmx_multisim_t *ms, int b, rvec *v, int n)
 {
     rvec *buf;
-    int  i;
-  
+    int   i;
+
     if (v)
     {
-        snew(buf,n);
+        snew(buf, n);
 #ifdef GMX_MPI
         /*
-          MPI_Sendrecv(v[0],  n*sizeof(rvec),MPI_BYTE,MSRANK(ms,b),0,
-          buf[0],n*sizeof(rvec),MPI_BYTE,MSRANK(ms,b),0,
-          ms->mpi_comm_masters,MPI_STATUS_IGNORE);
-        */
+           MPI_Sendrecv(v[0],  n*sizeof(rvec),MPI_BYTE,MSRANK(ms,b),0,
+           buf[0],n*sizeof(rvec),MPI_BYTE,MSRANK(ms,b),0,
+           ms->mpi_comm_masters,MPI_STATUS_IGNORE);
+         */
         {
             MPI_Request mpi_req;
 
-            MPI_Isend(v[0],n*sizeof(rvec),MPI_BYTE,MSRANK(ms,b),0,
-                      ms->mpi_comm_masters,&mpi_req);
-            MPI_Recv(buf[0],n*sizeof(rvec),MPI_BYTE,MSRANK(ms,b),0,
-                     ms->mpi_comm_masters,MPI_STATUS_IGNORE);
-            MPI_Wait(&mpi_req,MPI_STATUS_IGNORE);
+            MPI_Isend(v[0], n*sizeof(rvec), MPI_BYTE, MSRANK(ms, b), 0,
+                      ms->mpi_comm_masters, &mpi_req);
+            MPI_Recv(buf[0], n*sizeof(rvec), MPI_BYTE, MSRANK(ms, b), 0,
+                     ms->mpi_comm_masters, MPI_STATUS_IGNORE);
+            MPI_Wait(&mpi_req, MPI_STATUS_IGNORE);
         }
 #endif
-        for(i=0; i<n; i++)
+        for (i = 0; i < n; i++)
         {
-            copy_rvec(buf[i],v[i]);
+            copy_rvec(buf[i], v[i]);
         }
         sfree(buf);
     }
 }
 
-static void exchange_state(const gmx_multisim_t *ms,int b,t_state *state)
+static void exchange_state(const gmx_multisim_t *ms, int b, t_state *state)
 {
     /* When t_state changes, this code should be updated. */
-    int ngtc,nnhpres;
-    ngtc = state->ngtc * state->nhchainlength;
+    int ngtc, nnhpres;
+    ngtc    = state->ngtc * state->nhchainlength;
     nnhpres = state->nnhpres* state->nhchainlength;
-    exchange_rvecs(ms,b,state->box,DIM);
-    exchange_rvecs(ms,b,state->box_rel,DIM);
-    exchange_rvecs(ms,b,state->boxv,DIM);
-    exchange_reals(ms,b,&(state->veta),1);
-    exchange_reals(ms,b,&(state->vol0),1);
-    exchange_rvecs(ms,b,state->svir_prev,DIM);
-    exchange_rvecs(ms,b,state->fvir_prev,DIM);
-    exchange_rvecs(ms,b,state->pres_prev,DIM);
-    exchange_doubles(ms,b,state->nosehoover_xi,ngtc);
-    exchange_doubles(ms,b,state->nosehoover_vxi,ngtc);
-    exchange_doubles(ms,b,state->nhpres_xi,nnhpres);
-    exchange_doubles(ms,b,state->nhpres_vxi,nnhpres);
-    exchange_doubles(ms,b,state->therm_integral,state->ngtc);
-    exchange_rvecs(ms,b,state->x,state->natoms);
-    exchange_rvecs(ms,b,state->v,state->natoms);
-    exchange_rvecs(ms,b,state->sd_X,state->natoms);
+    exchange_rvecs(ms, b, state->box, DIM);
+    exchange_rvecs(ms, b, state->box_rel, DIM);
+    exchange_rvecs(ms, b, state->boxv, DIM);
+    exchange_reals(ms, b, &(state->veta), 1);
+    exchange_reals(ms, b, &(state->vol0), 1);
+    exchange_rvecs(ms, b, state->svir_prev, DIM);
+    exchange_rvecs(ms, b, state->fvir_prev, DIM);
+    exchange_rvecs(ms, b, state->pres_prev, DIM);
+    exchange_doubles(ms, b, state->nosehoover_xi, ngtc);
+    exchange_doubles(ms, b, state->nosehoover_vxi, ngtc);
+    exchange_doubles(ms, b, state->nhpres_xi, nnhpres);
+    exchange_doubles(ms, b, state->nhpres_vxi, nnhpres);
+    exchange_doubles(ms, b, state->therm_integral, state->ngtc);
+    exchange_rvecs(ms, b, state->x, state->natoms);
+    exchange_rvecs(ms, b, state->v, state->natoms);
+    exchange_rvecs(ms, b, state->sd_X, state->natoms);
 }
 
-static void copy_rvecs(rvec *s,rvec *d,int n)
+static void copy_rvecs(rvec *s, rvec *d, int n)
 {
     int i;
 
     if (d != NULL)
     {
-        for(i=0; i<n; i++)
+        for (i = 0; i < n; i++)
         {
-            copy_rvec(s[i],d[i]);
+            copy_rvec(s[i], d[i]);
         }
     }
 }
 
-static void copy_doubles(const double *s,double *d,int n)
+static void copy_doubles(const double *s, double *d, int n)
 {
     int i;
 
     if (d != NULL)
     {
-        for(i=0; i<n; i++)
+        for (i = 0; i < n; i++)
         {
             d[i] = s[i];
         }
     }
 }
 
-static void copy_reals(const real *s,real *d,int n)
+static void copy_reals(const real *s, real *d, int n)
 {
     int i;
 
     if (d != NULL)
     {
-        for(i=0; i<n; i++)
+        for (i = 0; i < n; i++)
         {
             d[i] = s[i];
         }
     }
 }
 
-static void copy_ints(const int *s,int *d,int n)
+static void copy_ints(const int *s, int *d, int n)
 {
     int i;
 
     if (d != NULL)
     {
-        for(i=0; i<n; i++)
+        for (i = 0; i < n; i++)
         {
             d[i] = s[i];
         }
     }
 }
 
-#define scopy_rvecs(v,n)   copy_rvecs(state->v,state_local->v,n);
-#define scopy_doubles(v,n) copy_doubles(state->v,state_local->v,n);
-#define scopy_reals(v,n) copy_reals(state->v,state_local->v,n);
-#define scopy_ints(v,n)   copy_ints(state->v,state_local->v,n);
+#define scopy_rvecs(v, n)   copy_rvecs(state->v, state_local->v, n);
+#define scopy_doubles(v, n) copy_doubles(state->v, state_local->v, n);
+#define scopy_reals(v, n) copy_reals(state->v, state_local->v, n);
+#define scopy_ints(v, n)   copy_ints(state->v, state_local->v, n);
 
-static void copy_state_nonatomdata(t_state *state,t_state *state_local)
+static void copy_state_nonatomdata(t_state *state, t_state *state_local)
 {
     /* When t_state changes, this code should be updated. */
-    int ngtc,nnhpres;
-    ngtc = state->ngtc * state->nhchainlength;
+    int ngtc, nnhpres;
+    ngtc    = state->ngtc * state->nhchainlength;
     nnhpres = state->nnhpres* state->nhchainlength;
-    scopy_rvecs(box,DIM);
-    scopy_rvecs(box_rel,DIM);
-    scopy_rvecs(boxv,DIM);
+    scopy_rvecs(box, DIM);
+    scopy_rvecs(box_rel, DIM);
+    scopy_rvecs(boxv, DIM);
     state_local->veta = state->veta;
     state_local->vol0 = state->vol0;
-    scopy_rvecs(svir_prev,DIM);
-    scopy_rvecs(fvir_prev,DIM);
-    scopy_rvecs(pres_prev,DIM);
-    scopy_doubles(nosehoover_xi,ngtc);
-    scopy_doubles(nosehoover_vxi,ngtc);
-    scopy_doubles(nhpres_xi,nnhpres);
-    scopy_doubles(nhpres_vxi,nnhpres);
-    scopy_doubles(therm_integral,state->ngtc);
-    scopy_rvecs(x,state->natoms);
-    scopy_rvecs(v,state->natoms);
-    scopy_rvecs(sd_X,state->natoms);
-    copy_ints(&(state->fep_state),&(state_local->fep_state),1);
-    scopy_reals(lambda,efptNR);
+    scopy_rvecs(svir_prev, DIM);
+    scopy_rvecs(fvir_prev, DIM);
+    scopy_rvecs(pres_prev, DIM);
+    scopy_doubles(nosehoover_xi, ngtc);
+    scopy_doubles(nosehoover_vxi, ngtc);
+    scopy_doubles(nhpres_xi, nnhpres);
+    scopy_doubles(nhpres_vxi, nnhpres);
+    scopy_doubles(therm_integral, state->ngtc);
+    scopy_rvecs(x, state->natoms);
+    scopy_rvecs(v, state->natoms);
+    scopy_rvecs(sd_X, state->natoms);
+    copy_ints(&(state->fep_state), &(state_local->fep_state), 1);
+    scopy_reals(lambda, efptNR);
 }
 
-static void scale_velocities(t_state *state,real fac)
+static void scale_velocities(t_state *state, real fac)
 {
     int i;
 
     if (state->v)
     {
-        for(i=0; i<state->natoms; i++)
+        for (i = 0; i < state->natoms; i++)
         {
-            svmul(fac,state->v[i],state->v[i]);
+            svmul(fac, state->v[i], state->v[i]);
         }
     }
 }
 
-static void pd_collect_state(const t_commrec *cr,t_state *state)
+static void pd_collect_state(const t_commrec *cr, t_state *state)
 {
     int shift;
-  
+
     if (debug)
     {
-        fprintf(debug,"Collecting state before exchange\n");
+        fprintf(debug, "Collecting state before exchange\n");
     }
     shift = cr->nnodes - cr->npmenodes - 1;
-    move_rvecs(cr,FALSE,FALSE,GMX_LEFT,GMX_RIGHT,state->x,NULL,shift,NULL);
+    move_rvecs(cr, FALSE, FALSE, GMX_LEFT, GMX_RIGHT, state->x, NULL, shift, NULL);
     if (state->v)
     {
-        move_rvecs(cr,FALSE,FALSE,GMX_LEFT,GMX_RIGHT,state->v,NULL,shift,NULL);
+        move_rvecs(cr, FALSE, FALSE, GMX_LEFT, GMX_RIGHT, state->v, NULL, shift, NULL);
     }
     if (state->sd_X)
     {
-        move_rvecs(cr,FALSE,FALSE,GMX_LEFT,GMX_RIGHT,state->sd_X,NULL,shift,NULL);
+        move_rvecs(cr, FALSE, FALSE, GMX_LEFT, GMX_RIGHT, state->sd_X, NULL, shift, NULL);
     }
 }
 
-static void print_transition_matrix(FILE *fplog,const char *leg,int n,int **nmoves, int *nattempt)
+static void print_transition_matrix(FILE *fplog, const char *leg, int n, int **nmoves, int *nattempt)
 {
-    int i,j,ntot;
+    int   i, j, ntot;
     float Tprint;
 
     ntot = nattempt[0] + nattempt[1];
-    fprintf(fplog,"\n");
-    fprintf(fplog,"Repl");
-    for (i=0;i<n;i++)
+    fprintf(fplog, "\n");
+    fprintf(fplog, "Repl");
+    for (i = 0; i < n; i++)
     {
-        fprintf(fplog,"    ");  /* put the title closer to the center */
+        fprintf(fplog, "    ");  /* put the title closer to the center */
     }
-    fprintf(fplog,"Empirical Transition Matrix\n");
+    fprintf(fplog, "Empirical Transition Matrix\n");
 
-    fprintf(fplog,"Repl");
-    for (i=0;i<n;i++)
+    fprintf(fplog, "Repl");
+    for (i = 0; i < n; i++)
     {
-        fprintf(fplog,"%8d",(i+1));
+        fprintf(fplog, "%8d", (i+1));
     }
-    fprintf(fplog,"\n");
+    fprintf(fplog, "\n");
 
-    for (i=0;i<n;i++)
+    for (i = 0; i < n; i++)
     {
-        fprintf(fplog,"Repl");
-        for (j=0;j<n;j++)
+        fprintf(fplog, "Repl");
+        for (j = 0; j < n; j++)
         {
             Tprint = 0.0;
             if (nmoves[i][j] > 0)
             {
                 Tprint = nmoves[i][j]/(2.0*ntot);
             }
-            fprintf(fplog,"%8.4f",Tprint);
+            fprintf(fplog, "%8.4f", Tprint);
         }
-        fprintf(fplog,"%3d\n",i);
+        fprintf(fplog, "%3d\n", i);
     }
 }
 
-static void print_ind(FILE *fplog,const char *leg,int n,int *ind,gmx_bool *bEx)
+static void print_ind(FILE *fplog, const char *leg, int n, int *ind, gmx_bool *bEx)
 {
     int i;
 
-    fprintf(fplog,"Repl %2s %2d",leg,ind[0]);
-    for(i=1; i<n; i++)
+    fprintf(fplog, "Repl %2s %2d", leg, ind[0]);
+    for (i = 1; i < n; i++)
     {
-        fprintf(fplog," %c %2d",(bEx!=0 && bEx[i]) ? 'x' : ' ',ind[i]);
+        fprintf(fplog, " %c %2d", (bEx != 0 && bEx[i]) ? 'x' : ' ', ind[i]);
     }
-    fprintf(fplog,"\n");
+    fprintf(fplog, "\n");
 }
 
-static void print_allswitchind(FILE *fplog,int n,int *ind,int *pind, int *allswaps, int *tmpswap)
+static void print_allswitchind(FILE *fplog, int n, int *ind, int *pind, int *allswaps, int *tmpswap)
 {
     int i;
 
-    for (i=0;i<n;i++)
+    for (i = 0; i < n; i++)
     {
         tmpswap[i] = allswaps[i];
     }
-    for (i=0;i<n;i++)
+    for (i = 0; i < n; i++)
     {
         allswaps[i] = tmpswap[pind[i]];
     }
 
-    fprintf(fplog,"\nAccepted Exchanges:   ");
-    for (i=0;i<n;i++)
+    fprintf(fplog, "\nAccepted Exchanges:   ");
+    for (i = 0; i < n; i++)
     {
-        fprintf(fplog,"%d ",pind[i]);
+        fprintf(fplog, "%d ", pind[i]);
     }
-    fprintf(fplog,"\n");
+    fprintf(fplog, "\n");
 
     /* the "Order After Exchange" is the state label corresponding to the configuration that
        started in state listed in order, i.e.
@@ -738,137 +744,138 @@ static void print_allswitchind(FILE *fplog,int n,int *ind,int *pind, int *allswa
        configuration starting in simulation 1 is now in simulation 2,
        configuration starting in simulation 2 is now in simulation 3
      */
-    fprintf(fplog,"Order After Exchange: ");
-    for (i=0;i<n;i++)
+    fprintf(fplog, "Order After Exchange: ");
+    for (i = 0; i < n; i++)
     {
-        fprintf(fplog,"%d ",allswaps[i]);
+        fprintf(fplog, "%d ", allswaps[i]);
     }
-    fprintf(fplog,"\n\n");
+    fprintf(fplog, "\n\n");
 }
 
-static void print_prob(FILE *fplog,const char *leg,int n,real *prob)
+static void print_prob(FILE *fplog, const char *leg, int n, real *prob)
 {
     int  i;
     char buf[8];
-  
-    fprintf(fplog,"Repl %2s ",leg);
-    for(i=1; i<n; i++)
+
+    fprintf(fplog, "Repl %2s ", leg);
+    for (i = 1; i < n; i++)
     {
         if (prob[i] >= 0)
         {
-            sprintf(buf,"%4.2f",prob[i]);
-            fprintf(fplog,"  %3s",buf[0]=='1' ? "1.0" : buf+1);
+            sprintf(buf, "%4.2f", prob[i]);
+            fprintf(fplog, "  %3s", buf[0] == '1' ? "1.0" : buf+1);
         }
         else
         {
-            fprintf(fplog,"     ");
+            fprintf(fplog, "     ");
         }
     }
-    fprintf(fplog,"\n");
+    fprintf(fplog, "\n");
 }
 
-static void print_count(FILE *fplog,const char *leg,int n,int *count)
+static void print_count(FILE *fplog, const char *leg, int n, int *count)
 {
     int i;
 
-    fprintf(fplog,"Repl %2s ",leg);
-    for(i=1; i<n; i++)
+    fprintf(fplog, "Repl %2s ", leg);
+    for (i = 1; i < n; i++)
     {
-        fprintf(fplog," %4d",count[i]);
+        fprintf(fplog, " %4d", count[i]);
     }
-    fprintf(fplog,"\n");
+    fprintf(fplog, "\n");
 }
 
-static real calc_delta(FILE *fplog, gmx_bool bPrint, struct gmx_repl_ex *re, int a, int b, int ap, int bp) {
+static real calc_delta(FILE *fplog, gmx_bool bPrint, struct gmx_repl_ex *re, int a, int b, int ap, int bp)
+{
 
-    real ediff,dpV,delta=0;
-    real *Epot = re->Epot;
-    real *Vol = re->Vol;
-    real **de = re->de;
-    real *beta = re->beta;
+    real   ediff, dpV, delta = 0;
+    real  *Epot = re->Epot;
+    real  *Vol  = re->Vol;
+    real **de   = re->de;
+    real  *beta = re->beta;
 
     /* Two cases; we are permuted and not.  In all cases, setting ap = a and bp = b will reduce
        to the non permuted case */
 
     switch (re->type)
     {
-    case ereTEMP:
-        /*
-         * Okabe et. al. Chem. Phys. Lett. 335 (2001) 435-439
-         */
-        ediff = Epot[b] - Epot[a];
-        delta = -(beta[bp] - beta[ap])*ediff;
-        break;
-    case ereLAMBDA:
-        /* two cases:  when we are permuted, and not.  */
-        /* non-permuted:
-           ediff =  E_new - E_old
-                 =  [H_b(x_a) + H_a(x_b)] - [H_b(x_b) + H_a(x_a)]
-                 =  [H_b(x_a) - H_a(x_a)] + [H_a(x_b) - H_b(x_b)]
-                 =  de[b][a] + de[a][b] */
-
-        /* permuted:
-           ediff =  E_new - E_old
-                 =  [H_bp(x_a) + H_ap(x_b)] - [H_bp(x_b) + H_ap(x_a)]
-                 =  [H_bp(x_a) - H_ap(x_a)] + [H_ap(x_b) - H_bp(x_b)]
-                 =  [H_bp(x_a) - H_a(x_a) + H_a(x_a) - H_ap(x_a)] + [H_ap(x_b) - H_b(x_b) + H_b(x_b) - H_bp(x_b)]
-                 =  [H_bp(x_a) - H_a(x_a)] - [H_ap(x_a) - H_a(x_a)] + [H_ap(x_b) - H_b(x_b)] - H_bp(x_b) - H_b(x_b)]
-                 =  (de[bp][a] - de[ap][a]) + (de[ap][b] - de[bp][b])    */
-        /* but, in the current code implementation, we flip configurations, not indices . . .
-           So let's examine that.
-                 =  [H_b(x_ap) - H_a(x_a)] - [H_a(x_ap) - H_a(x_a)] + [H_a(x_bp) - H_b(x_b)] - H_b(x_bp) - H_b(x_b)]
-                 =  [H_b(x_ap) - H_a(x_ap)]  + [H_a(x_bp) - H_b(x_pb)]
-                 = (de[b][ap] - de[a][ap]) + (de[a][bp] - de[b][bp]
-                 So, if we exchange b<=> bp and a<=> ap, we return to the same result.
-                 So the simple solution is to flip the
-                 position of perturbed and original indices in the tests.
-        */
-
-        ediff = (de[bp][a] - de[ap][a]) + (de[ap][b] - de[bp][b]);
-        delta = ediff*beta[a]; /* assume all same temperature in this case */
-        break;
-    case ereTL:
-        /* not permuted:  */
-        /* delta =  reduced E_new - reduced E_old
-                 =  [beta_b H_b(x_a) + beta_a H_a(x_b)] - [beta_b H_b(x_b) + beta_a H_a(x_a)]
-                 =  [beta_b H_b(x_a) - beta_a H_a(x_a)] + [beta_a H_a(x_b) - beta_b H_b(x_b)]
-                 =  [beta_b dH_b(x_a) + beta_b H_a(x_a) - beta_a H_a(x_a)] +
-                    [beta_a dH_a(x_b) + beta_a H_b(x_b) - beta_b H_b(x_b)]
-                 =  [beta_b dH_b(x_a) + [beta_a dH_a(x_b) +
-                    beta_b (H_a(x_a) - H_b(x_b)]) - beta_a (H_a(x_a) - H_b(x_b))
-                 =  beta_b dH_b(x_a) + beta_a dH_a(x_b) - (beta_b - beta_a)(H_b(x_b) - H_a(x_a) */
-        /* delta = beta[b]*de[b][a] + beta[a]*de[a][b] - (beta[b] - beta[a])*(Epot[b] - Epot[a]; */
-        /* permuted (big breath!) */
-        /*   delta =  reduced E_new - reduced E_old
-                 =  [beta_bp H_bp(x_a) + beta_ap H_ap(x_b)] - [beta_bp H_bp(x_b) + beta_ap H_ap(x_a)]
-                 =  [beta_bp H_bp(x_a) - beta_ap H_ap(x_a)] + [beta_ap H_ap(x_b) - beta_bp H_bp(x_b)]
-                 =  [beta_bp H_bp(x_a) - beta_ap H_ap(x_a)] + [beta_ap H_ap(x_b) - beta_bp H_bp(x_b)]
-                    - beta_pb H_a(x_a) + beta_ap H_a(x_a) + beta_pb H_a(x_a) - beta_ap H_a(x_a)
-                    - beta_ap H_b(x_b) + beta_bp H_b(x_b) + beta_ap H_b(x_b) - beta_bp H_b(x_b)
-                 =  [(beta_bp H_bp(x_a) - beta_bp H_a(x_a)) - (beta_ap H_ap(x_a) - beta_ap H_a(x_a))] +
-                    [(beta_ap H_ap(x_b)  - beta_ap H_b(x_b)) - (beta_bp H_bp(x_b) - beta_bp H_b(x_b))]
-                    + beta_pb H_a(x_a) - beta_ap H_a(x_a) + beta_ap H_b(x_b) - beta_bp H_b(x_b)
-                 =  [beta_bp (H_bp(x_a) - H_a(x_a)) - beta_ap (H_ap(x_a) - H_a(x_a))] +
-                    [beta_ap (H_ap(x_b) - H_b(x_b)) - beta_bp (H_bp(x_b) - H_b(x_b))]
-                    + beta_pb (H_a(x_a) - H_b(x_b))  - beta_ap (H_a(x_a) - H_b(x_b))
-                 =  ([beta_bp de[bp][a] - beta_ap de[ap][a]) + beta_ap de[ap][b]  - beta_bp de[bp][b])
-                 + (beta_pb-beta_ap)(H_a(x_a) - H_b(x_b))  */
-        delta = beta[bp]*(de[bp][a] - de[bp][b]) + beta[ap]*(de[ap][b] - de[ap][a]) - (beta[bp]-beta[ap])*(Epot[b]-Epot[a]);
-        break;
-    default:
-        gmx_incons("Unknown replica exchange quantity");
+        case ereTEMP:
+            /*
+             * Okabe et. al. Chem. Phys. Lett. 335 (2001) 435-439
+             */
+            ediff = Epot[b] - Epot[a];
+            delta = -(beta[bp] - beta[ap])*ediff;
+            break;
+        case ereLAMBDA:
+            /* two cases:  when we are permuted, and not.  */
+            /* non-permuted:
+               ediff =  E_new - E_old
+                     =  [H_b(x_a) + H_a(x_b)] - [H_b(x_b) + H_a(x_a)]
+                     =  [H_b(x_a) - H_a(x_a)] + [H_a(x_b) - H_b(x_b)]
+                     =  de[b][a] + de[a][b] */
+
+            /* permuted:
+               ediff =  E_new - E_old
+                     =  [H_bp(x_a) + H_ap(x_b)] - [H_bp(x_b) + H_ap(x_a)]
+                     =  [H_bp(x_a) - H_ap(x_a)] + [H_ap(x_b) - H_bp(x_b)]
+                     =  [H_bp(x_a) - H_a(x_a) + H_a(x_a) - H_ap(x_a)] + [H_ap(x_b) - H_b(x_b) + H_b(x_b) - H_bp(x_b)]
+                     =  [H_bp(x_a) - H_a(x_a)] - [H_ap(x_a) - H_a(x_a)] + [H_ap(x_b) - H_b(x_b)] - H_bp(x_b) - H_b(x_b)]
+                     =  (de[bp][a] - de[ap][a]) + (de[ap][b] - de[bp][b])    */
+            /* but, in the current code implementation, we flip configurations, not indices . . .
+               So let's examine that.
+                     =  [H_b(x_ap) - H_a(x_a)] - [H_a(x_ap) - H_a(x_a)] + [H_a(x_bp) - H_b(x_b)] - H_b(x_bp) - H_b(x_b)]
+                     =  [H_b(x_ap) - H_a(x_ap)]  + [H_a(x_bp) - H_b(x_pb)]
+                     = (de[b][ap] - de[a][ap]) + (de[a][bp] - de[b][bp]
+                     So, if we exchange b<=> bp and a<=> ap, we return to the same result.
+                     So the simple solution is to flip the
+                     position of perturbed and original indices in the tests.
+             */
+
+            ediff = (de[bp][a] - de[ap][a]) + (de[ap][b] - de[bp][b]);
+            delta = ediff*beta[a]; /* assume all same temperature in this case */
+            break;
+        case ereTL:
+            /* not permuted:  */
+            /* delta =  reduced E_new - reduced E_old
+                     =  [beta_b H_b(x_a) + beta_a H_a(x_b)] - [beta_b H_b(x_b) + beta_a H_a(x_a)]
+                     =  [beta_b H_b(x_a) - beta_a H_a(x_a)] + [beta_a H_a(x_b) - beta_b H_b(x_b)]
+                     =  [beta_b dH_b(x_a) + beta_b H_a(x_a) - beta_a H_a(x_a)] +
+                        [beta_a dH_a(x_b) + beta_a H_b(x_b) - beta_b H_b(x_b)]
+                     =  [beta_b dH_b(x_a) + [beta_a dH_a(x_b) +
+                        beta_b (H_a(x_a) - H_b(x_b)]) - beta_a (H_a(x_a) - H_b(x_b))
+                     =  beta_b dH_b(x_a) + beta_a dH_a(x_b) - (beta_b - beta_a)(H_b(x_b) - H_a(x_a) */
+            /* delta = beta[b]*de[b][a] + beta[a]*de[a][b] - (beta[b] - beta[a])*(Epot[b] - Epot[a]; */
+            /* permuted (big breath!) */
+            /*   delta =  reduced E_new - reduced E_old
+                     =  [beta_bp H_bp(x_a) + beta_ap H_ap(x_b)] - [beta_bp H_bp(x_b) + beta_ap H_ap(x_a)]
+                     =  [beta_bp H_bp(x_a) - beta_ap H_ap(x_a)] + [beta_ap H_ap(x_b) - beta_bp H_bp(x_b)]
+                     =  [beta_bp H_bp(x_a) - beta_ap H_ap(x_a)] + [beta_ap H_ap(x_b) - beta_bp H_bp(x_b)]
+                        - beta_pb H_a(x_a) + beta_ap H_a(x_a) + beta_pb H_a(x_a) - beta_ap H_a(x_a)
+                        - beta_ap H_b(x_b) + beta_bp H_b(x_b) + beta_ap H_b(x_b) - beta_bp H_b(x_b)
+                     =  [(beta_bp H_bp(x_a) - beta_bp H_a(x_a)) - (beta_ap H_ap(x_a) - beta_ap H_a(x_a))] +
+                        [(beta_ap H_ap(x_b)  - beta_ap H_b(x_b)) - (beta_bp H_bp(x_b) - beta_bp H_b(x_b))]
+             + beta_pb H_a(x_a) - beta_ap H_a(x_a) + beta_ap H_b(x_b) - beta_bp H_b(x_b)
+                     =  [beta_bp (H_bp(x_a) - H_a(x_a)) - beta_ap (H_ap(x_a) - H_a(x_a))] +
+                        [beta_ap (H_ap(x_b) - H_b(x_b)) - beta_bp (H_bp(x_b) - H_b(x_b))]
+             + beta_pb (H_a(x_a) - H_b(x_b))  - beta_ap (H_a(x_a) - H_b(x_b))
+                     =  ([beta_bp de[bp][a] - beta_ap de[ap][a]) + beta_ap de[ap][b]  - beta_bp de[bp][b])
+             + (beta_pb-beta_ap)(H_a(x_a) - H_b(x_b))  */
+            delta = beta[bp]*(de[bp][a] - de[bp][b]) + beta[ap]*(de[ap][b] - de[ap][a]) - (beta[bp]-beta[ap])*(Epot[b]-Epot[a]);
+            break;
+        default:
+            gmx_incons("Unknown replica exchange quantity");
     }
     if (bPrint)
     {
-        fprintf(fplog,"Repl %d <-> %d  dE_term = %10.3e (kT)\n",a,b,delta);
+        fprintf(fplog, "Repl %d <-> %d  dE_term = %10.3e (kT)\n", a, b, delta);
     }
     if (re->bNPT)
     {
         /* revist the calculation for 5.0.  Might be some improvements. */
         dpV = (beta[ap]*re->pres[ap]-beta[bp]*re->pres[bp])*(Vol[b]-Vol[a])/PRESFAC;
-        if (bPrint) 
+        if (bPrint)
         {
-            fprintf(fplog,"  dpV = %10.3e  d = %10.3e\nb",dpV,delta + dpV);
+            fprintf(fplog, "  dpV = %10.3e  d = %10.3e\nb", dpV, delta + dpV);
         }
         delta += dpV;
     }
@@ -876,53 +883,53 @@ static real calc_delta(FILE *fplog, gmx_bool bPrint, struct gmx_repl_ex *re, int
 }
 
 static void
-test_for_replica_exchange(FILE *fplog,
+test_for_replica_exchange(FILE                 *fplog,
                           const gmx_multisim_t *ms,
-                          struct gmx_repl_ex *re,
-                          gmx_enerdata_t *enerd,
-                          real vol,
-                          gmx_large_int_t step,
-                          real time)
+                          struct gmx_repl_ex   *re,
+                          gmx_enerdata_t       *enerd,
+                          real                  vol,
+                          gmx_large_int_t       step,
+                          real                  time)
 {
-    int  m,i,j,a,b,ap,bp,i0,i1,tmp;
-    real ediff=0,delta=0,dpV=0;
-    gmx_bool bPrint,bMultiEx;
-    gmx_bool *bEx = re->bEx;
-    real *prob = re->prob;
-    int *pind = re->destinations; /* permuted index */
-    gmx_bool bEpot=FALSE;
-    gmx_bool bDLambda=FALSE;
-    gmx_bool bVol=FALSE;
+    int       m, i, j, a, b, ap, bp, i0, i1, tmp;
+    real      ediff = 0, delta = 0, dpV = 0;
+    gmx_bool  bPrint, bMultiEx;
+    gmx_bool *bEx      = re->bEx;
+    real     *prob     = re->prob;
+    int      *pind     = re->destinations; /* permuted index */
+    gmx_bool  bEpot    = FALSE;
+    gmx_bool  bDLambda = FALSE;
+    gmx_bool  bVol     = FALSE;
 
     bMultiEx = (re->nex > 1);  /* multiple exchanges at each state */
-    fprintf(fplog,"Replica exchange at step " gmx_large_int_pfmt " time %g\n",step,time);
+    fprintf(fplog, "Replica exchange at step " gmx_large_int_pfmt " time %g\n", step, time);
 
     if (re->bNPT)
     {
-        for (i=0;i<re->nrepl;i++)
+        for (i = 0; i < re->nrepl; i++)
         {
             re->Vol[i] = 0;
         }
-        bVol = TRUE;
+        bVol               = TRUE;
         re->Vol[re->repl]  = vol;
     }
     if ((re->type == ereTEMP || re->type == ereTL))
     {
-        for (i=0;i<re->nrepl;i++)
+        for (i = 0; i < re->nrepl; i++)
         {
             re->Epot[i] = 0;
         }
-        bEpot = TRUE;
+        bEpot              = TRUE;
         re->Epot[re->repl] = enerd->term[F_EPOT];
         /* temperatures of different states*/
-        for (i=0;i<re->nrepl;i++)
+        for (i = 0; i < re->nrepl; i++)
         {
             re->beta[i] = 1.0/(re->q[ereTEMP][i]*BOLTZ);
         }
     }
     else
     {
-        for (i=0;i<re->nrepl;i++)
+        for (i = 0; i < re->nrepl; i++)
         {
             re->beta[i] = 1.0/(re->temp*BOLTZ);  /* we have a single temperature */
         }
@@ -933,14 +940,14 @@ test_for_replica_exchange(FILE *fplog,
         /* lambda differences. */
         /* de[i][j] is the energy of the jth simulation in the ith Hamiltonian
            minus the energy of the jth simulation in the jth Hamiltonian */
-        for (i=0;i<re->nrepl;i++)
+        for (i = 0; i < re->nrepl; i++)
         {
-            for (j=0;j<re->nrepl;j++)
+            for (j = 0; j < re->nrepl; j++)
             {
                 re->de[i][j] = 0;
             }
         }
-        for (i=0;i<re->nrepl;i++)
+        for (i = 0; i < re->nrepl; i++)
         {
             re->de[i][re->repl] = (enerd->enerpart_lambda[(int)re->q[ereLAMBDA][i]+1]-enerd->enerpart_lambda[0]);
         }
@@ -949,22 +956,22 @@ test_for_replica_exchange(FILE *fplog,
     /* now actually do the communication */
     if (bVol)
     {
-        gmx_sum_sim(re->nrepl,re->Vol,ms);
+        gmx_sum_sim(re->nrepl, re->Vol, ms);
     }
     if (bEpot)
     {
-        gmx_sum_sim(re->nrepl,re->Epot,ms);
+        gmx_sum_sim(re->nrepl, re->Epot, ms);
     }
     if (bDLambda)
     {
-        for (i=0;i<re->nrepl;i++)
+        for (i = 0; i < re->nrepl; i++)
         {
-            gmx_sum_sim(re->nrepl,re->de[i],ms);
+            gmx_sum_sim(re->nrepl, re->de[i], ms);
         }
     }
 
     /* make a duplicate set of indices for shuffling */
-    for(i=0;i<re->nrepl;i++)
+    for (i = 0; i < re->nrepl; i++)
     {
         pind[i] = re->ind[i];
     }
@@ -972,7 +979,7 @@ test_for_replica_exchange(FILE *fplog,
     if (bMultiEx)
     {
         /* multiple random switch exchange */
-        for (i=0;i<re->nex;i++)
+        for (i = 0; i < re->nex; i++)
         {
             /* randomly select a pair  */
             /* in theory, could reduce this by identifying only which switches had a nonneglibible
@@ -981,14 +988,14 @@ test_for_replica_exchange(FILE *fplog,
                more work that useful. */
             i0 = (int)(re->nrepl*rando(&(re->seed)));
             i1 = (int)(re->nrepl*rando(&(re->seed)));
-            if (i0==i1)
+            if (i0 == i1)
             {
                 i--;
                 continue;  /* self-exchange, back up and do it again */
             }
 
-            a = re->ind[i0]; /* what are the indices of these states? */
-            b = re->ind[i1];
+            a  = re->ind[i0]; /* what are the indices of these states? */
+            b  = re->ind[i1];
             ap = pind[i0];
             bp = pind[i1];
 
@@ -997,7 +1004,7 @@ test_for_replica_exchange(FILE *fplog,
             /* if the code changes to flip the STATES, rather than the configurations,
                use the commented version of the code */
             /* delta = calc_delta(fplog,bPrint,re,a,b,ap,bp); */
-            delta = calc_delta(fplog,bPrint,re,ap,bp,a,b);
+            delta = calc_delta(fplog, bPrint, re, ap, bp, a, b);
 
             /* we actually only use the first space in the prob and bEx array,
                since there are actually many switches between pairs. */
@@ -1006,7 +1013,7 @@ test_for_replica_exchange(FILE *fplog,
             {
                 /* accepted */
                 prob[0] = 1;
-                bEx[0] = TRUE;
+                bEx[0]  = TRUE;
             }
             else
             {
@@ -1026,31 +1033,32 @@ test_for_replica_exchange(FILE *fplog,
             if (bEx[0])
             {
                 /* swap the states */
-                tmp = pind[i0];
+                tmp      = pind[i0];
                 pind[i0] = pind[i1];
                 pind[i1] = tmp;
             }
         }
         re->nattempt[0]++;  /* keep track of total permutation trials here */
-        print_allswitchind(fplog,re->nrepl,re->ind,pind,re->allswaps,re->tmpswap);
+        print_allswitchind(fplog, re->nrepl, re->ind, pind, re->allswaps, re->tmpswap);
     }
     else
     {
         /* standard nearest neighbor replica exchange */
         m = (step / re->nst) % 2;
-        for(i=1; i<re->nrepl; i++)
+        for (i = 1; i < re->nrepl; i++)
         {
             a = re->ind[i-1];
             b = re->ind[i];
-            
-            bPrint = (re->repl==a || re->repl==b);
+
+            bPrint = (re->repl == a || re->repl == b);
             if (i % 2 == m)
             {
-                delta = calc_delta(fplog,bPrint,re,a,b,a,b);
-                if (delta <= 0) {
+                delta = calc_delta(fplog, bPrint, re, a, b, a, b);
+                if (delta <= 0)
+                {
                     /* accepted */
                     prob[i] = 1;
-                    bEx[i] = TRUE;
+                    bEx[i]  = TRUE;
                 }
                 else
                 {
@@ -1070,30 +1078,30 @@ test_for_replica_exchange(FILE *fplog,
                 if (bEx[i])
                 {
                     /* swap these two */
-                    tmp = pind[i-1];
+                    tmp       = pind[i-1];
                     pind[i-1] = pind[i];
-                    pind[i] = tmp;
+                    pind[i]   = tmp;
                     re->nexchange[i]++;  /* statistics for back compatibility */
                 }
             }
             else
             {
                 prob[i] = -1;
-                bEx[i] = FALSE;
+                bEx[i]  = FALSE;
             }
         }
         /* print some statistics */
-        print_ind(fplog,"ex",re->nrepl,re->ind,bEx);
-        print_prob(fplog,"pr",re->nrepl,prob);
-        fprintf(fplog,"\n");
+        print_ind(fplog, "ex", re->nrepl, re->ind, bEx);
+        print_prob(fplog, "pr", re->nrepl, prob);
+        fprintf(fplog, "\n");
         re->nattempt[m]++;
     }
 
     /* record which moves were made and accepted */
-    for (i=0;i<re->nrepl;i++)
+    for (i = 0; i < re->nrepl; i++)
     {
-        re->nmoves[re->ind[i]][pind[i]] +=1;
-        re->nmoves[pind[i]][re->ind[i]] +=1;
+        re->nmoves[re->ind[i]][pind[i]] += 1;
+        re->nmoves[pind[i]][re->ind[i]] += 1;
     }
     fflush(fplog); /* make sure we can see what the last exchange was */
 }
@@ -1104,29 +1112,29 @@ static void write_debug_x(t_state *state)
 
     if (debug)
     {
-        for(i=0; i<state->natoms; i+=10)
+        for (i = 0; i < state->natoms; i += 10)
         {
-            fprintf(debug,"dx %5d %10.5f %10.5f %10.5f\n",i,state->x[i][XX],state->x[i][YY],state->x[i][ZZ]);
+            fprintf(debug, "dx %5d %10.5f %10.5f %10.5f\n", i, state->x[i][XX], state->x[i][YY], state->x[i][ZZ]);
         }
     }
 }
 
 static void
-cyclic_decomposition(FILE *fplog,
+cyclic_decomposition(FILE      *fplog,
                      const int *destinations,
-                     int **cyclic,
-                     gmx_bool *incycle,
-                     const int nrepl,
-                     int *nswap)
+                     int      **cyclic,
+                     gmx_bool  *incycle,
+                     const int  nrepl,
+                     int       *nswap)
 {
 
-    int i,j,c,p;
+    int i, j, c, p;
     int maxlen = 1;
-    for (i=0;i<nrepl;i++)
+    for (i = 0; i < nrepl; i++)
     {
         incycle[i] = FALSE;
     }
-    for (i=0;i<nrepl;i++)  /* one cycle for each replica */
+    for (i = 0; i < nrepl; i++)  /* one cycle for each replica */
     {
         if (incycle[i])
         {
@@ -1134,13 +1142,13 @@ cyclic_decomposition(FILE *fplog,
             continue;
         }
         cyclic[i][0] = i;
-        incycle[i] = TRUE;
-        c = 1;
-        p = i;
-        for (j=0;j<nrepl;j++)  /* potentially all cycles are part, but we will break first */
+        incycle[i]   = TRUE;
+        c            = 1;
+        p            = i;
+        for (j = 0; j < nrepl; j++) /* potentially all cycles are part, but we will break first */
         {
-            p = destinations[p]; /* start permuting */
-            if (p==i)
+            p = destinations[p];    /* start permuting */
+            if (p == i)
             {
                 cyclic[i][c] = -1;
                 if (c > maxlen)
@@ -1152,7 +1160,7 @@ cyclic_decomposition(FILE *fplog,
             else
             {
                 cyclic[i][c] = p;  /* each permutation gives a new member of the cycle */
-                incycle[p] = TRUE;
+                incycle[p]   = TRUE;
                 c++;
             }
         }
@@ -1161,43 +1169,43 @@ cyclic_decomposition(FILE *fplog,
 
     if (debug)
     {
-        for (i=0;i<nrepl;i++)
+        for (i = 0; i < nrepl; i++)
         {
-            fprintf(debug,"Cycle %d:",i);
-            for (j=0;j<nrepl;j++)
+            fprintf(debug, "Cycle %d:", i);
+            for (j = 0; j < nrepl; j++)
             {
                 if (cyclic[i][j] < 0)
                 {
                     break;
                 }
-                fprintf(debug,"%2d",cyclic[i][j]);
+                fprintf(debug, "%2d", cyclic[i][j]);
             }
-            fprintf(debug,"\n");
+            fprintf(debug, "\n");
         }
         fflush(debug);
     }
 }
 
 static void
-compute_exchange_order(FILE *fplog,
-                       int **cyclic,
-                       int **order,
+compute_exchange_order(FILE     *fplog,
+                       int     **cyclic,
+                       int     **order,
                        const int nrepl,
                        const int maxswap)
 {
-    int i,j;
+    int i, j;
 
-    for (j=0;j<maxswap;j++)
+    for (j = 0; j < maxswap; j++)
     {
-        for (i=0;i<nrepl;i++)
+        for (i = 0; i < nrepl; i++)
         {
             if (cyclic[i][j+1] >= 0)
             {
                 order[cyclic[i][j+1]][j] = cyclic[i][j];
-                order[cyclic[i][j]][j] = cyclic[i][j+1];
+                order[cyclic[i][j]][j]   = cyclic[i][j+1];
             }
         }
-        for (i=0;i<nrepl;i++)
+        for (i = 0; i < nrepl; i++)
         {
             if (order[i][j] < 0)
             {
@@ -1208,33 +1216,36 @@ compute_exchange_order(FILE *fplog,
 
     if (debug)
     {
-        fprintf(fplog,"Replica Exchange Order\n");
-        for (i=0;i<nrepl;i++)
+        fprintf(fplog, "Replica Exchange Order\n");
+        for (i = 0; i < nrepl; i++)
         {
-            fprintf(fplog,"Replica %d:",i);
-            for (j=0;j<maxswap;j++)
+            fprintf(fplog, "Replica %d:", i);
+            for (j = 0; j < maxswap; j++)
             {
-                if (order[i][j] < 0) break;
-                fprintf(debug,"%2d",order[i][j]);
+                if (order[i][j] < 0)
+                {
+                    break;
+                }
+                fprintf(debug, "%2d", order[i][j]);
             }
-            fprintf(fplog,"\n");
+            fprintf(fplog, "\n");
         }
         fflush(fplog);
     }
 }
 
 static void
-prepare_to_do_exchange(FILE *fplog,
+prepare_to_do_exchange(FILE      *fplog,
                        const int *destinations,
-                       const int replica_id,
-                       const int nrepl,
-                       int *maxswap,
-                       int **order,
-                       int **cyclic,
-                       int *incycle,
-                       gmx_bool *bThisReplicaExchanged)
+                       const int  replica_id,
+                       const int  nrepl,
+                       int       *maxswap,
+                       int      **order,
+                       int      **cyclic,
+                       int       *incycle,
+                       gmx_bool  *bThisReplicaExchanged)
 {
-    int i,j;
+    int i, j;
     /* Hold the cyclic decomposition of the (multiple) replica
      * exchange. */
     gmx_bool bAnyReplicaExchanged = FALSE;
@@ -1242,7 +1253,8 @@ prepare_to_do_exchange(FILE *fplog,
 
     for (i = 0; i < nrepl; i++)
     {
-        if (destinations[i] != i) {
+        if (destinations[i] != i)
+        {
             /* only mark as exchanged if the index has been shuffled */
             bAnyReplicaExchanged = TRUE;
             break;
@@ -1256,17 +1268,17 @@ prepare_to_do_exchange(FILE *fplog,
             for (j = 0; j < nrepl; j++)
             {
                 cyclic[i][j] = -1;
-                order[i][j] = -1;
+                order[i][j]  = -1;
             }
         }
 
         /* Identify the cyclic decomposition of the permutation (very
          * fast if neighbor replica exchange). */
-        cyclic_decomposition(fplog,destinations,cyclic,incycle,nrepl,maxswap);
+        cyclic_decomposition(fplog, destinations, cyclic, incycle, nrepl, maxswap);
 
         /* Now translate the decomposition into a replica exchange
          * order at each step. */
-        compute_exchange_order(fplog,cyclic,order,nrepl,*maxswap);
+        compute_exchange_order(fplog, cyclic, order, nrepl, *maxswap);
 
         /* Did this replica do any exchange at any point? */
         for (j = 0; j < *maxswap; j++)
@@ -1280,11 +1292,11 @@ prepare_to_do_exchange(FILE *fplog,
     }
 }
 
-gmx_bool replica_exchange(FILE *fplog,const t_commrec *cr,struct gmx_repl_ex *re,
-                          t_state *state,gmx_enerdata_t *enerd,
-                          t_state *state_local,gmx_large_int_t step,real time)
+gmx_bool replica_exchange(FILE *fplog, const t_commrec *cr, struct gmx_repl_ex *re,
+                          t_state *state, gmx_enerdata_t *enerd,
+                          t_state *state_local, gmx_large_int_t step, real time)
 {
-    int i,j;
+    int i, j;
     int replica_id = 0;
     int exchange_partner;
     int maxswap = 0;
@@ -1297,9 +1309,9 @@ gmx_bool replica_exchange(FILE *fplog,const t_commrec *cr,struct gmx_repl_ex *re
     if (MASTER(cr))
     {
         replica_id  = re->repl;
-        test_for_replica_exchange(fplog,cr->ms,re,enerd,det(state_local->box),step,time);
-        prepare_to_do_exchange(fplog,re->destinations,replica_id,re->nrepl,&maxswap,
-                               re->order,re->cyclic,re->incycle,&bThisReplicaExchanged);
+        test_for_replica_exchange(fplog, cr->ms, re, enerd, det(state_local->box), step, time);
+        prepare_to_do_exchange(fplog, re->destinations, replica_id, re->nrepl, &maxswap,
+                               re->order, re->cyclic, re->incycle, &bThisReplicaExchanged);
     }
     /* Do intra-simulation broadcast so all processors belonging to
      * each simulation know whether they need to participate in
@@ -1308,7 +1320,7 @@ gmx_bool replica_exchange(FILE *fplog,const t_commrec *cr,struct gmx_repl_ex *re
     if (PAR(cr))
     {
 #ifdef GMX_MPI
-        MPI_Bcast(&bThisReplicaExchanged,sizeof(gmx_bool),MPI_BYTE,MASTERRANK(cr),
+        MPI_Bcast(&bThisReplicaExchanged, sizeof(gmx_bool), MPI_BYTE, MASTERRANK(cr),
                   cr->mpi_comm_mygroup);
 #endif
     }
@@ -1322,14 +1334,14 @@ gmx_bool replica_exchange(FILE *fplog,const t_commrec *cr,struct gmx_repl_ex *re
             /* Collect the global state on the master node */
             if (DOMAINDECOMP(cr))
             {
-                dd_collect_state(cr->dd,state_local,state);
+                dd_collect_state(cr->dd, state_local, state);
             }
             else
             {
-                pd_collect_state(cr,state);
+                pd_collect_state(cr, state);
             }
         }
-        
+
         if (MASTER(cr))
         {
             /* There will be only one swap cycle with standard replica
@@ -1345,16 +1357,16 @@ gmx_bool replica_exchange(FILE *fplog,const t_commrec *cr,struct gmx_repl_ex *re
                     /* Exchange the global states between the master nodes */
                     if (debug)
                     {
-                        fprintf(debug,"Exchanging %d with %d\n",replica_id,exchange_partner);
+                        fprintf(debug, "Exchanging %d with %d\n", replica_id, exchange_partner);
                     }
-                    exchange_state(cr->ms,exchange_partner,state);
+                    exchange_state(cr->ms, exchange_partner, state);
                 }
             }
             /* For temperature-type replica exchange, we need to scale
              * the velocities. */
             if (re->type == ereTEMP || re->type == ereTL)
             {
-                scale_velocities(state,sqrt(re->q[ereTEMP][replica_id]/re->q[ereTEMP][re->destinations[replica_id]]));
+                scale_velocities(state, sqrt(re->q[ereTEMP][replica_id]/re->q[ereTEMP][re->destinations[replica_id]]));
             }
 
         }
@@ -1363,11 +1375,11 @@ gmx_bool replica_exchange(FILE *fplog,const t_commrec *cr,struct gmx_repl_ex *re
         if (!DOMAINDECOMP(cr))
         {
             /* Copy the global state to the local state data structure */
-            copy_state_nonatomdata(state,state_local);
-            
+            copy_state_nonatomdata(state, state_local);
+
             if (PAR(cr))
             {
-                bcast_state(cr,state,FALSE);
+                bcast_state(cr, state, FALSE);
             }
         }
     }
@@ -1375,19 +1387,19 @@ gmx_bool replica_exchange(FILE *fplog,const t_commrec *cr,struct gmx_repl_ex *re
     return bThisReplicaExchanged;
 }
 
-void print_replica_exchange_statistics(FILE *fplog,struct gmx_repl_ex *re)
+void print_replica_exchange_statistics(FILE *fplog, struct gmx_repl_ex *re)
 {
     int  i;
 
-    fprintf(fplog,"\nReplica exchange statistics\n");
+    fprintf(fplog, "\nReplica exchange statistics\n");
 
     if (re->nex == 0)
     {
-        fprintf(fplog,"Repl  %d attempts, %d odd, %d even\n",
-                re->nattempt[0]+re->nattempt[1],re->nattempt[1],re->nattempt[0]);
+        fprintf(fplog, "Repl  %d attempts, %d odd, %d even\n",
+                re->nattempt[0]+re->nattempt[1], re->nattempt[1], re->nattempt[0]);
 
-        fprintf(fplog,"Repl  average probabilities:\n");
-        for(i=1; i<re->nrepl; i++)
+        fprintf(fplog, "Repl  average probabilities:\n");
+        for (i = 1; i < re->nrepl; i++)
         {
             if (re->nattempt[i%2] == 0)
             {
@@ -1398,15 +1410,15 @@ void print_replica_exchange_statistics(FILE *fplog,struct gmx_repl_ex *re)
                 re->prob[i] =  re->prob_sum[i]/re->nattempt[i%2];
             }
         }
-        print_ind(fplog,"",re->nrepl,re->ind,NULL);
-        print_prob(fplog,"",re->nrepl,re->prob);
+        print_ind(fplog, "", re->nrepl, re->ind, NULL);
+        print_prob(fplog, "", re->nrepl, re->prob);
 
-        fprintf(fplog,"Repl  number of exchanges:\n");
-        print_ind(fplog,"",re->nrepl,re->ind,NULL);
-        print_count(fplog,"",re->nrepl,re->nexchange);
+        fprintf(fplog, "Repl  number of exchanges:\n");
+        print_ind(fplog, "", re->nrepl, re->ind, NULL);
+        print_count(fplog, "", re->nrepl, re->nexchange);
 
-        fprintf(fplog,"Repl  average number of exchanges:\n");
-        for(i=1; i<re->nrepl; i++) 
+        fprintf(fplog, "Repl  average number of exchanges:\n");
+        for (i = 1; i < re->nrepl; i++)
         {
             if (re->nattempt[i%2] == 0)
             {
@@ -1417,11 +1429,11 @@ void print_replica_exchange_statistics(FILE *fplog,struct gmx_repl_ex *re)
                 re->prob[i] =  ((real)re->nexchange[i])/re->nattempt[i%2];
             }
         }
-        print_ind(fplog,"",re->nrepl,re->ind,NULL);
-        print_prob(fplog,"",re->nrepl,re->prob);
+        print_ind(fplog, "", re->nrepl, re->ind, NULL);
+        print_prob(fplog, "", re->nrepl, re->prob);
 
-        fprintf(fplog,"\n");
+        fprintf(fplog, "\n");
     }
     /* print the transition matrix */
-    print_transition_matrix(fplog,"",re->nrepl,re->nmoves,re->nattempt);
+    print_transition_matrix(fplog, "", re->nrepl, re->nmoves, re->nattempt);
 }