Fixed name clashes with pre-defined names in our favorite operating system from Redmo...

diff --git a/include/types/fcdata.h b/include/types/fcdata.h
index 05ca16fe0be2aa2eab8480b73fa31b5acc3811be..da947909fde8e4029e401e322114673c0cc11f25 100644 (file)
--- a/include/types/fcdata.h
+++ b/include/types/fcdata.h
@@ -73,7 +73,7 @@ typedef struct {
 typedef struct {
   real   fc;          /* Force constant for the restraints                  */
   real   edt;         /* Multiplication factor for time averaging           */
-  real   edt1;        /* 1 - edt                                            */
+  real   edt_1;        /* 1 - edt                                            */
   real   exp_min_t_tau; /* Factor for slowly switching on the force         */
   int    nr;          /* The number of orientation restraints               */
   int    nex;         /* The number of experiments                          */

diff --git a/src/gmxlib/orires.c b/src/gmxlib/orires.c
index 0b7dfec4cc480ca2d4b25a3e0cb78f08c17ddb83..0708c11075ca436cc4dc8c654c67760869f91116 100644 (file)
--- a/src/gmxlib/orires.c
+++ b/src/gmxlib/orires.c
@@ -111,13 +111,13 @@ void init_orires(FILE *fplog,const gmx_mtop_t *mtop,
     {
         od->Dtav = od->Dins;
         od->edt  = 0.0;
-        od->edt1 = 1.0;
+        od->edt_1= 1.0;
     }
     else
     {
         snew(od->Dtav,od->nr);
         od->edt  = exp(-ir->delta_t/ir->orires_tau);
-        od->edt1 = 1.0 - od->edt;
+        od->edt_1= 1.0 - od->edt;
 
         /* Extend the state with the orires history */
         state->flags |= (1<<estORIRE_INITF);
@@ -328,7 +328,7 @@ real calc_orires_dev(const gmx_multisim_t *ms,
                      t_fcdata *fcd,history_t *hist)
 {
     int          fa,d,i,j,type,ex,nref;
-    real         edt,edt1,invn,pfac,r2,invr,corrfac,weight,wsv2,sw,dev;
+    real         edt,edt_1,invn,pfac,r2,invr,corrfac,weight,wsv2,sw,dev;
     tensor       *S,R,TMP;
     rvec5        *Dinsl,*Dins,*Dtav,*rhs;
     real         *mref,***T;
@@ -348,7 +348,7 @@ real calc_orires_dev(const gmx_multisim_t *ms,
     
     bTAV = (od->edt != 0);
     edt  = od->edt;
-    edt1 = od->edt1;
+    edt_1= od->edt_1;
     S    = od->S;
     Dinsl= od->Dinsl;
     Dins = od->Dins;
@@ -475,7 +475,7 @@ real calc_orires_dev(const gmx_multisim_t *ms,
              */
             for(i=0; i<5; i++)
             {
-                Dtav[d][i] = edt*hist->orire_Dtav[d*5+i] + edt1*Dins[d][i];
+                Dtav[d][i] = edt*hist->orire_Dtav[d*5+i] + edt_1*Dins[d][i];
             }
         }