Merge origin/release-2020 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / lincs_cuda.cu

diff --git a/src/gromacs/mdlib/lincs_cuda.cu b/src/gromacs/mdlib/lincs_cuda.cu
index 84325141ad5365b3e9a5200799835f4eac332a8f..ce1b442f84902e61797ac90035188e9309839be1 100644 (file)
--- a/src/gromacs/mdlib/lincs_cuda.cu
+++ b/src/gromacs/mdlib/lincs_cuda.cu
@@ -40,8 +40,6 @@
  * using CUDA, including class initialization, data-structures management
  * and GPU kernel.
  *
- * \note Management of periodic boundary should be unified with SETTLE and
- *       removed from here.
  * \todo Reconsider naming, i.e. "cuda" suffics should be changed to "gpu".
  *
  * \author Artem Zhmurov <zhmurov@gmail.com>
@@ -434,7 +432,8 @@ void LincsCuda::apply(const float3* d_x,
                       float3*       d_v,
                       const real    invdt,
                       const bool    computeVirial,
-                      tensor        virialScaled)
+                      tensor        virialScaled,
+                      const PbcAiuc pbcAiuc)
 {
     ensureNoPendingCudaError("In CUDA version of LINCS");
 
@@ -478,6 +477,8 @@ void LincsCuda::apply(const float3* d_x,
     }
     config.stream = commandStream_;
 
+    kernelParams_.pbcAiuc = pbcAiuc;
+
     const auto kernelArgs =
             prepareGpuKernelArguments(kernelPtr, config, &kernelParams_, &d_x, &d_xp, &d_v, &invdt);
 
@@ -892,9 +893,4 @@ void LincsCuda::set(const t_idef& idef, const t_mdatoms& md)
                        GpuApiCallBehavior::Sync, nullptr);
 }
 
-void LincsCuda::setPbc(const t_pbc* pbc)
-{
-    setPbcAiuc(pbc->ndim_ePBC, pbc->box, &kernelParams_.pbcAiuc);
-}
-
 } // namespace gmx