Refactor t_params to InteractionTypeParameters

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / topio.h

diff --git a/src/gromacs/gmxpreprocess/topio.h b/src/gromacs/gmxpreprocess/topio.h
index c71d5b7a38e9187d5770b89d7e6252a680dfb590..746aafe3a282b820e0e0cb4029d1756a66bb581e 100644 (file)
--- a/src/gromacs/gmxpreprocess/topio.h
+++ b/src/gromacs/gmxpreprocess/topio.h
@@ -41,6 +41,7 @@
 #include <memory>
 #include <vector>
 
+#include "gromacs/utility/arrayref.h"
 #include "gromacs/utility/real.h"
 
 struct gmx_molblock_t;
@@ -49,7 +50,7 @@ struct gpp_atomtype;
 struct t_gromppopts;
 struct t_inputrec;
 struct MoleculeInformation;
-struct t_params;
+struct InteractionTypeParameters;
 struct t_symtab;
 struct warninp;
 enum struct GmxQmmmMode;
@@ -58,24 +59,24 @@ typedef warninp *warninp_t;
 double check_mol(const gmx_mtop_t *mtop, warninp_t wi);
 /* Check mass and charge */
 
-char **do_top(bool                                               bVerbose,
-              const char                                        *topfile,
-              const char                                        *topppfile,
-              t_gromppopts                                      *opts,
-              bool                                               bZero,
-              t_symtab                                          *symtab,
-              t_params                                           plist[],
-              int                                               *combination_rule,
-              double                                            *repulsion_power,
-              real                                              *fudgeQQ,
-              gpp_atomtype                                      *atype,
-              int                                               *nrmols,
-              std::vector<MoleculeInformation>                  *molinfo,
-              std::unique_ptr<MoleculeInformation>              *intermolecular_interactions,
-              const t_inputrec                                  *ir,
-              std::vector<gmx_molblock_t>                       *molblock,
-              bool                                              *ffParametrizedWithHBondConstraints,
-              warninp_t                                          wi);
+char **do_top(bool                                                        bVerbose,
+              const char                                                 *topfile,
+              const char                                                 *topppfile,
+              t_gromppopts                                               *opts,
+              bool                                                        bZero,
+              t_symtab                                                   *symtab,
+              gmx::ArrayRef<InteractionTypeParameters>                    plist,
+              int                                                        *combination_rule,
+              double                                                     *repulsion_power,
+              real                                                       *fudgeQQ,
+              gpp_atomtype                                               *atype,
+              int                                                        *nrmols,
+              std::vector<MoleculeInformation>                           *molinfo,
+              std::unique_ptr<MoleculeInformation>                       *intermolecular_interactions,
+              const t_inputrec                                           *ir,
+              std::vector<gmx_molblock_t>                                *molblock,
+              bool                                                       *ffParametrizedWithHBondConstraints,
+              warninp_t                                                   wi);
 
 /* This routine expects sys->molt[m].ilist to be of size F_NRE and ordered. */
 void generate_qmexcl(gmx_mtop_t *sys, t_inputrec *ir, warninp_t wi, GmxQmmmMode qmmmMode);