Redefine the default boolean type to gmx_bool.

[alexxy/gromacs.git] / src / kernel / grompp.c

diff --git a/src/kernel/grompp.c b/src/kernel/grompp.c
index e3d06e539a5d7e59cc4b7976f7e64e5d5ed6e650..2b0e76b257ac152fff989f2e2efe23945bf90857 100644 (file)
--- a/src/kernel/grompp.c
+++ b/src/kernel/grompp.c
@@ -199,7 +199,7 @@ static void check_vel(gmx_mtop_t *mtop,rvec v[])
   }
 }
 
-static bool nint_ftype(gmx_mtop_t *mtop,t_molinfo *mi,int ftype)
+static gmx_bool nint_ftype(gmx_mtop_t *mtop,t_molinfo *mi,int ftype)
 {
   int nint,mb;
 
@@ -278,12 +278,12 @@ static void molinfo2mtop(int nmi,t_molinfo *mi,gmx_mtop_t *mtop)
 
 static void
 new_status(const char *topfile,const char *topppfile,const char *confin,
-           t_gromppopts *opts,t_inputrec *ir,bool bZero,
-           bool bGenVel,bool bVerbose,t_state *state,
+           t_gromppopts *opts,t_inputrec *ir,gmx_bool bZero,
+           gmx_bool bGenVel,gmx_bool bVerbose,t_state *state,
            gpp_atomtype_t atype,gmx_mtop_t *sys,
            int *nmi,t_molinfo **mi,t_params plist[],
            int *comb,double *reppow,real *fudgeQQ,
-           bool bMorse,
+           gmx_bool bMorse,
            warninp_t wi)
 {
   t_molinfo   *molinfo=NULL;
@@ -292,12 +292,12 @@ new_status(const char *topfile,const char *topppfile,const char *confin,
   t_atoms     *confat;
   int         mb,i,nrmols,nmismatch;
   char        buf[STRLEN];
-  bool        bGB=FALSE;
+  gmx_bool        bGB=FALSE;
   char        warn_buf[STRLEN];
 
   init_mtop(sys);
 
-  /* Set boolean for GB */
+  /* Set gmx_boolean for GB */
   if(ir->implicit_solvent)
     bGB=TRUE;
   
@@ -429,7 +429,7 @@ new_status(const char *topfile,const char *topppfile,const char *confin,
 }
 
 static void cont_status(const char *slog,const char *ener,
-                       bool bNeedVel,bool bGenVel, real fr_time,
+                       gmx_bool bNeedVel,gmx_bool bGenVel, real fr_time,
                        t_inputrec *ir,t_state *state,
                        gmx_mtop_t *sys,
                         const output_env_t oenv)
@@ -486,13 +486,13 @@ static void cont_status(const char *slog,const char *ener,
   }
 }
 
-static void read_posres(gmx_mtop_t *mtop,t_molinfo *molinfo,bool bTopB,
+static void read_posres(gmx_mtop_t *mtop,t_molinfo *molinfo,gmx_bool bTopB,
                         char *fn,
                         int rc_scaling, int ePBC, 
                         rvec com,
                         warninp_t wi)
 {
-  bool   bFirst = TRUE;
+  gmx_bool   bFirst = TRUE;
   rvec   *x,*v,*xp;
   dvec   sum;
   double totmass;
@@ -981,13 +981,13 @@ int main (int argc, char *argv[])
   char         fn[STRLEN],fnB[STRLEN];
   const char   *mdparin;
   int          ntype;
-  bool         bNeedVel,bGenVel;
-  bool         have_atomnumber;
+  gmx_bool         bNeedVel,bGenVel;
+  gmx_bool         have_atomnumber;
   int             n12,n13,n14;
   t_params     *gb_plist = NULL;
   gmx_genborn_t *born = NULL;
   output_env_t oenv;
-  bool         bVerbose = FALSE;
+  gmx_bool         bVerbose = FALSE;
   warninp_t    wi;
   char         warn_buf[STRLEN];
 
@@ -1007,8 +1007,8 @@ int main (int argc, char *argv[])
 #define NFILE asize(fnm)
 
   /* Command line options */
-  static bool bRenum=TRUE;
-  static bool bRmVSBds=TRUE,bZero=FALSE;
+  static gmx_bool bRenum=TRUE;
+  static gmx_bool bRmVSBds=TRUE,bZero=FALSE;
   static int  i,maxwarn=0;
   static real fr_time=-1;
   t_pargs pa[] = {