Merge branch release-5-1 into release-2016

[alexxy/gromacs.git] / src / gromacs / mdlib / forcerec.h

diff --git a/src/gromacs/mdlib/forcerec.h b/src/gromacs/mdlib/forcerec.h
index 9ff5b250c1418a086645fce6960ed04a6fde779a..274d909bf82446a41c62461e03acac7e2639f165 100644 (file)
--- a/src/gromacs/mdlib/forcerec.h
+++ b/src/gromacs/mdlib/forcerec.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016, 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.
@@ -46,6 +46,7 @@
 
 struct t_commrec;
 struct t_fcdata;
+struct t_filenm;
 
 /*! \brief Create a new forcerec structure */
 t_forcerec *mk_forcerec(void);
@@ -98,7 +99,7 @@ void init_interaction_const_tables(FILE                   *fp,
  * \param[in]  box         Simulation box
  * \param[in]  tabfn       Table potential file for non-bonded interactions
  * \param[in]  tabpfn      Table potential file for pair interactions
- * \param[in]  tabbfn      Table potential file for bonded interactions
+ * \param[in]  tabbfnm     Table potential files for bonded interactions
  * \param[in]  nbpu_opt    Nonbonded Processing Unit (GPU/CPU etc.)
  * \param[in]  bNoSolvOpt  Do not use solvent optimization
  * \param[in]  print_force Print forces for atoms with force >= print_force
@@ -112,7 +113,7 @@ void init_forcerec(FILE                   *fplog,
                    matrix                  box,
                    const char             *tabfn,
                    const char             *tabpfn,
-                   const char             *tabbfn,
+                   const t_filenm         *tabbfnm,
                    const char             *nbpu_opt,
                    gmx_bool                bNoSolvOpt,
                    real                    print_force);