*
* Copyright (c) 1991-2000, University of Groningen, The Netherlands.
* Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014, 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.
* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
-#include "string2.h"
-#include <stdio.h>
#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+
#include "gen_vsite.h"
-#include "smalloc.h"
#include "resall.h"
#include "add_par.h"
-#include "vec.h"
+#include "gromacs/math/vec.h"
#include "toputil.h"
-#include "physics.h"
-#include "index.h"
-#include "names.h"
-#include "gromacs/fileio/futil.h"
+#include "gromacs/math/units.h"
+#include "gromacs/legacyheaders/names.h"
+#include "gromacs/utility/futil.h"
#include "gpp_atomtype.h"
#include "fflibutil.h"
-#include "macros.h"
+
+#include "gromacs/topology/residuetypes.h"
+#include "gromacs/topology/symtab.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/smalloc.h"
#define MAXNAME 32
#define OPENDIR '[' /* starting sign for directive */
*nvsiteconf = nvsite;
*nvsitetop = ntop;
- ffclose(ddb);
+ gmx_ffclose(ddb);
}
static int nitrogen_is_planar(t_vsiteconf vsiteconflist[], int nvsiteconf, char atomtype[])
}
static int get_atype(int atom, t_atoms *at, int nrtp, t_restp rtp[],
- gmx_residuetype_t rt)
+ gmx_residuetype_t *rt)
{
int type;
gmx_bool bNterm;
}
static real get_amass(int atom, t_atoms *at, int nrtp, t_restp rtp[],
- gmx_residuetype_t rt)
+ gmx_residuetype_t *rt)
{
real mass;
gmx_bool bNterm;
for (j = 0; j < NMASS; j++)
{
sprintf(name, "MW%d", j+1);
- (*newatomname) [atM[j]] = put_symtab(symtab, name);
- (*newatom) [atM[j]].m = (*newatom)[atM[j]].mB = mM[j];
- (*newatom) [atM[j]].q = (*newatom)[atM[j]].qB = 0.0;
- (*newatom) [atM[j]].type = (*newatom)[atM[j]].typeB = tpM;
- (*newatom) [atM[j]].ptype = eptAtom;
- (*newatom) [atM[j]].resind = at->atom[i0].resind;
+ (*newatomname) [atM[j]] = put_symtab(symtab, name);
+ (*newatom) [atM[j]].m = (*newatom)[atM[j]].mB = mM[j];
+ (*newatom) [atM[j]].q = (*newatom)[atM[j]].qB = 0.0;
+ (*newatom) [atM[j]].type = (*newatom)[atM[j]].typeB = tpM;
+ (*newatom) [atM[j]].ptype = eptAtom;
+ (*newatom) [atM[j]].resind = at->atom[i0].resind;
(*newatom) [atM[j]].elem[0] = 'M';
(*newatom) [atM[j]].elem[1] = '\0';
- (*newvsite_type)[atM[j]] = NOTSET;
- (*newcgnr) [atM[j]] = (*cgnr)[i0];
+ (*newvsite_type)[atM[j]] = NOTSET;
+ (*newcgnr) [atM[j]] = (*cgnr)[i0];
}
/* renumber cgnr: */
for (i = i0; i < at->nr; i++)
rvec_add(r1, x[ats[atHH]], (*newx)[atM]);
strcpy(name, "MW1");
- (*newatomname) [atM] = put_symtab(symtab, name);
- (*newatom) [atM].m = (*newatom)[atM].mB = mM;
- (*newatom) [atM].q = (*newatom)[atM].qB = 0.0;
- (*newatom) [atM].type = (*newatom)[atM].typeB = tpM;
- (*newatom) [atM].ptype = eptAtom;
- (*newatom) [atM].resind = at->atom[i0].resind;
+ (*newatomname) [atM] = put_symtab(symtab, name);
+ (*newatom) [atM].m = (*newatom)[atM].mB = mM;
+ (*newatom) [atM].q = (*newatom)[atM].qB = 0.0;
+ (*newatom) [atM].type = (*newatom)[atM].typeB = tpM;
+ (*newatom) [atM].ptype = eptAtom;
+ (*newatom) [atM].resind = at->atom[i0].resind;
(*newatom) [atM].elem[0] = 'M';
(*newatom) [atM].elem[1] = '\0';
- (*newvsite_type)[atM] = NOTSET;
- (*newcgnr) [atM] = (*cgnr)[i0];
+ (*newvsite_type)[atM] = NOTSET;
+ (*newcgnr) [atM] = (*cgnr)[i0];
/* renumber cgnr: */
for (i = i0; i < at->nr; i++)
{
char **db;
int nvsiteconf, nvsitetop, cmplength;
gmx_bool isN, planarN, bFound;
- gmx_residuetype_t rt;
+ gmx_residuetype_t*rt;
t_vsiteconf *vsiteconflist;
/* pointer to a list of CH3/NH3/NH2 configuration entries.
{
name[k+1] = (*at->atomname[Heavy])[k];
}
- name[k+1] = atomnamesuffix[j];
- name[k+2] = '\0';
- newatomname[ni0+j] = put_symtab(symtab, name);
- newatom[ni0+j].m = newatom[ni0+j].mB = mtot/NMASS;
- newatom[ni0+j].q = newatom[ni0+j].qB = 0.0;
- newatom[ni0+j].type = newatom[ni0+j].typeB = tpM;
- newatom[ni0+j].ptype = eptAtom;
- newatom[ni0+j].resind = at->atom[i0].resind;
+ name[k+1] = atomnamesuffix[j];
+ name[k+2] = '\0';
+ newatomname[ni0+j] = put_symtab(symtab, name);
+ newatom[ni0+j].m = newatom[ni0+j].mB = mtot/NMASS;
+ newatom[ni0+j].q = newatom[ni0+j].qB = 0.0;
+ newatom[ni0+j].type = newatom[ni0+j].typeB = tpM;
+ newatom[ni0+j].ptype = eptAtom;
+ newatom[ni0+j].resind = at->atom[i0].resind;
newatom[ni0+j].elem[0] = 'M';
newatom[ni0+j].elem[1] = '\0';
- newvsite_type[ni0+j] = NOTSET;
- newcgnr[ni0+j] = (*cgnr)[i0];
+ newvsite_type[ni0+j] = NOTSET;
+ newcgnr[ni0+j] = (*cgnr)[i0];
}
/* add constraints between dummy masses and to heavies[0] */
/* 'add_shift' says which atoms won't be renumbered afterwards */
{
if (debug)
{
- fprintf(debug, " [%u -> %u]", params->param[i].a[j],
+ fprintf(debug, " [%d -> %d]", params->param[i].a[j],
params->param[i].a[j]-add_shift);
}
params->param[i].a[j] = params->param[i].a[j]-add_shift;
{
if (debug)
{
- fprintf(debug, " [%u -> %d]", params->param[i].a[j],
+ fprintf(debug, " [%d -> %d]", params->param[i].a[j],
o2n[params->param[i].a[j]]);
}
params->param[i].a[j] = o2n[params->param[i].a[j]];