Make PBC type enumeration into PbcType enum class

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_h2order.cpp

diff --git a/src/gromacs/gmxana/gmx_h2order.cpp b/src/gromacs/gmxana/gmx_h2order.cpp
index f3abed6da444b5267e2afd33e542ee97dad36172..1e52fe0b491ac09cc4d5024cae6931318e39455b 100644 (file)
--- a/src/gromacs/gmxana/gmx_h2order.cpp
+++ b/src/gromacs/gmxana/gmx_h2order.cpp
@@ -72,7 +72,7 @@ static void calc_h2order(const char*             fn,
                          real*                   slWidth,
                          int*                    nslices,
                          const t_topology*       top,
-                         int                     ePBC,
+                         PbcType                 pbcType,
                          int                     axis,
                          gmx_bool                bMicel,
                          int                     micel[],
@@ -133,7 +133,7 @@ static void calc_h2order(const char*             fn,
 
     teller = 0;
 
-    gpbc = gmx_rmpbc_init(&top->idef, ePBC, natoms);
+    gpbc = gmx_rmpbc_init(&top->idef, pbcType, natoms);
     /*********** Start processing trajectory ***********/
     do
     {
@@ -301,7 +301,7 @@ int gmx_h2order(int argc, char* argv[])
     int ngx,          /* nr. of atomsin sol group   */
             nmic = 0; /* nr. of atoms in micelle    */
     t_topology* top;  /* topology           */
-    int         ePBC;
+    PbcType     pbcType;
     int *       index, /* indices for solvent group  */
             *micelle = nullptr;
     gmx_bool bMicel  = FALSE; /* think we're a micel        */
@@ -323,7 +323,7 @@ int gmx_h2order(int argc, char* argv[])
     }
     bMicel = opt2bSet("-nm", NFILE, fnm);
 
-    top = read_top(ftp2fn(efTPR, NFILE, fnm), &ePBC); /* read topology file */
+    top = read_top(ftp2fn(efTPR, NFILE, fnm), &pbcType); /* read topology file */
 
     rd_index(ftp2fn(efNDX, NFILE, fnm), 1, &ngx, &index, &grpname);
 
@@ -333,7 +333,7 @@ int gmx_h2order(int argc, char* argv[])
     }
 
     calc_h2order(ftp2fn(efTRX, NFILE, fnm), index, ngx, &slDipole, &slOrder, &slWidth, &nslices,
-                 top, ePBC, axis, bMicel, micelle, nmic, oenv);
+                 top, pbcType, axis, bMicel, micelle, nmic, oenv);
 
     h2order_plot(slDipole, slOrder, opt2fn("-o", NFILE, fnm), nslices, slWidth, oenv);