static void push_atom_now(t_symtab *symtab, t_atoms *at, int atomnr,
int atomicnumber,
int type, char *ctype, int ptype,
- char *resnumberic, int cgnumber,
+ char *resnumberic,
char *resname, char *name, real m0, real q0,
int typeB, char *ctypeB, real mB, real qB)
{
push_cg(cgs, lastcg, cgnumber, nr);
push_atom_now(symtab, at, atomnr, get_atomtype_atomnumber(type, atype),
- type, ctype, ptype, resnumberic, cgnumber,
+ type, ctype, ptype, resnumberic,
resname, name, m0, q0, typeB,
typeB == type ? ctype : ctypeB, mB, qB);
}
return bFound;
}
-static gmx_bool default_cmap_params(int ftype, t_params bondtype[],
+static gmx_bool default_cmap_params(t_params bondtype[],
t_atoms *at, gpp_atomtype_t atype,
t_param *p, gmx_bool bB,
int *cmap_type, int *nparam_def)
void push_cmap(directive d, t_params bondtype[], t_params bond[],
t_atoms *at, gpp_atomtype_t atype, char *line,
- gmx_bool *bWarn_copy_A_B,
warninp_t wi)
{
const char *aaformat[MAXATOMLIST+1] =
}
/* Get the cmap type for this cmap angle */
- bFound = default_cmap_params(ftype, bondtype, at, atype, ¶m, FALSE, &cmap_type, &ncmap_params);
+ bFound = default_cmap_params(bondtype, at, atype, ¶m, FALSE, &cmap_type, &ncmap_params);
/* We want exactly one parameter (the cmap type in state A (currently no state B) back */
if (bFound && ncmap_params == 1)
-void push_vsitesn(directive d, t_params bondtype[], t_params bond[],
- t_atoms *at, gpp_atomtype_t atype, char *line,
+void push_vsitesn(directive d, t_params bond[],
+ t_atoms *at, char *line,
warninp_t wi)
{
char *ptr;