Merge commit d30f2cb6 from release-2020 into master

[alexxy/gromacs.git] / src / gromacs / ewald / pme_load_balancing.h

diff --git a/src/gromacs/ewald/pme_load_balancing.h b/src/gromacs/ewald/pme_load_balancing.h
index 929188917aed6f6ffa0668f586d52da02cbc7eb3..b163d349eccbecec8372216bf2c2f9945c2ec090 100644 (file)
--- a/src/gromacs/ewald/pme_load_balancing.h
+++ b/src/gromacs/ewald/pme_load_balancing.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
+ * Copyright (c) 2012-2020, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -72,7 +72,6 @@ bool pme_loadbal_is_active(const pme_load_balancing_t* pme_lb);
  *
  * Initialize the PP-PME load balacing data and infrastructure.
  * The actual load balancing might start right away, later or never.
- * Returns in bPrinting whether the load balancing is printing to fp_err.
  * The PME grid in pmedata is reused for smaller grids to lower the memory
  * usage.
  */
@@ -84,8 +83,7 @@ void pme_loadbal_init(pme_load_balancing_t**     pme_lb_p,
                       const interaction_const_t& ic,
                       const nonbonded_verlet_t&  nbv,
                       gmx_pme_t*                 pmedata,
-                      gmx_bool                   bUseGPU,
-                      gmx_bool*                  bPrinting);
+                      gmx_bool                   bUseGPU);
 
 /*! \brief Process cycles and PME load balance when necessary
  *
@@ -106,7 +104,8 @@ void pme_loadbal_do(pme_load_balancing_t*          pme_lb,
                     gmx_wallcycle_t                wcycle,
                     int64_t                        step,
                     int64_t                        step_rel,
-                    gmx_bool*                      bPrinting);
+                    gmx_bool*                      bPrinting,
+                    bool                           useGpuPmePpCommunication);
 
 /*! \brief Finish the PME load balancing and print the settings when fplog!=NULL */
 void pme_loadbal_done(pme_load_balancing_t* pme_lb, FILE* fplog, const gmx::MDLogger& mdlog, gmx_bool bNonBondedOnGPU);