Merge branch 'release-2019' into master

[alexxy/gromacs.git] / src / gromacs / ewald / tests / pmetestcommon.cpp

diff --git a/src/gromacs/ewald/tests/pmetestcommon.cpp b/src/gromacs/ewald/tests/pmetestcommon.cpp
index 7475de602e6d2ea4d4373274321b00b353bb35ad..ad8905d0fdd27587f95514e1f21e07489f1e5adf 100644 (file)
--- a/src/gromacs/ewald/tests/pmetestcommon.cpp
+++ b/src/gromacs/ewald/tests/pmetestcommon.cpp
@@ -48,12 +48,12 @@
 #include <algorithm>
 
 #include "gromacs/domdec/domdec.h"
-#include "gromacs/ewald/pme-gather.h"
-#include "gromacs/ewald/pme-gpu-internal.h"
-#include "gromacs/ewald/pme-grid.h"
-#include "gromacs/ewald/pme-internal.h"
-#include "gromacs/ewald/pme-solve.h"
-#include "gromacs/ewald/pme-spread.h"
+#include "gromacs/ewald/pme_gather.h"
+#include "gromacs/ewald/pme_gpu_internal.h"
+#include "gromacs/ewald/pme_grid.h"
+#include "gromacs/ewald/pme_internal.h"
+#include "gromacs/ewald/pme_solve.h"
+#include "gromacs/ewald/pme_spread.h"
 #include "gromacs/fft/parallel_3dfft.h"
 #include "gromacs/gpu_utils/gpu_utils.h"
 #include "gromacs/math/invertmatrix.h"
@@ -179,7 +179,7 @@ PmeSafePointer pmeInitAtoms(const t_inputrec         *inputRec,
                             )
 {
     const index     atomCount = coordinates.size();
-    GMX_RELEASE_ASSERT(atomCount == charges.size(), "Mismatch in atom data");
+    GMX_RELEASE_ASSERT(atomCount == charges.ssize(), "Mismatch in atom data");
     PmeSafePointer  pmeSafe = pmeInitInternal(inputRec, mode, gpuInfo, pmeGpuProgram, atomCount, box);
     pme_atomcomm_t *atc     = nullptr;
 
@@ -382,7 +382,7 @@ void pmePerformGather(gmx_pme_t *pme, CodePath mode,
 {
     pme_atomcomm_t *atc                     = &(pme->atc[0]);
     const index     atomCount               = atc->n;
-    GMX_RELEASE_ASSERT(forces.size() == atomCount, "Invalid force buffer size");
+    GMX_RELEASE_ASSERT(forces.ssize() == atomCount, "Invalid force buffer size");
     const bool      forceReductionWithInput = (inputTreatment == PmeForceOutputHandling::ReduceWithInput);
     const real      scale                   = 1.0;
     const size_t    threadIndex             = 0;
@@ -448,7 +448,7 @@ void pmeSetSplineData(const gmx_pme_t *pme, CodePath mode,
     const index           atomCount   = atc->n;
     const index           pmeOrder    = pme->pme_order;
     const index           dimSize     = pmeOrder * atomCount;
-    GMX_RELEASE_ASSERT(dimSize == splineValues.size(), "Mismatch in spline data");
+    GMX_RELEASE_ASSERT(dimSize == splineValues.ssize(), "Mismatch in spline data");
     real                 *splineBuffer = pmeGetSplineDataInternal(pme, type, dimIndex);
 
     switch (mode)
@@ -473,7 +473,7 @@ void pmeSetGridLineIndices(const gmx_pme_t *pme, CodePath mode,
 {
     const pme_atomcomm_t       *atc         = &(pme->atc[0]);
     const index                 atomCount   = atc->n;
-    GMX_RELEASE_ASSERT(atomCount == gridLineIndices.size(), "Mismatch in gridline indices size");
+    GMX_RELEASE_ASSERT(atomCount == gridLineIndices.ssize(), "Mismatch in gridline indices size");
 
     IVec paddedGridSizeUnused, gridSize(0, 0, 0);
     pmeGetRealGridSizesInternal(pme, mode, gridSize, paddedGridSizeUnused);