/*
+ * This file is part of the GROMACS molecular simulation package.
*
- * This source code is part of
+ * Copyright (c) 2009,2010,2011,2012,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.
*
- * G R O M A C S
+ * GROMACS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
*
- * GROningen MAchine for Chemical Simulations
+ * GROMACS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * Written by David van der Spoel, Erik Lindahl, Berk Hess, and others.
- * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
- * Copyright (c) 2001-2009, The GROMACS development team,
- * check out http://www.gromacs.org for more information.
-
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with GROMACS; if not, see
+ * http://www.gnu.org/licenses, or write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
- * If you want to redistribute modifications, please consider that
- * scientific software is very special. Version control is crucial -
- * bugs must be traceable. We will be happy to consider code for
- * inclusion in the official distribution, but derived work must not
- * be called official GROMACS. Details are found in the README & COPYING
- * files - if they are missing, get the official version at www.gromacs.org.
+ * If you want to redistribute modifications to GROMACS, please
+ * consider that scientific software is very special. Version
+ * control is crucial - bugs must be traceable. We will be happy to
+ * consider code for inclusion in the official distribution, but
+ * derived work must not be called official GROMACS. Details are found
+ * in the README & COPYING files - if they are missing, get the
+ * official version at http://www.gromacs.org.
*
* To help us fund GROMACS development, we humbly ask that you cite
- * the papers on the package - you can find them in the top README file.
- *
- * For more info, check our website at http://www.gromacs.org
+ * the research papers on the package. Check out http://www.gromacs.org.
*/
/*! \internal \file
* \brief
* Implements functions in selmethod.h.
*
- * \author Teemu Murtola <teemu.murtola@cbr.su.se>
+ * \author Teemu Murtola <teemu.murtola@gmail.com>
* \ingroup module_selection
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
+
+#include "selmethod.h"
#include <ctype.h>
#include <stdarg.h>
#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/legacyheaders/string2.h"
-
-#include "gromacs/selection/selmethod.h"
+#include "gromacs/utility/cstringutil.h"
#include "gromacs/utility/exceptions.h"
#include "symrec.h"
bOk = false;
}
} /* End of parameter loop */
- /* Check parameters of existing methods */
+ /* Check parameters of existing methods */
gmx::SelectionParserSymbolIterator symbol
= symtab.beginIterator(gmx::SelectionParserSymbol::MethodSymbol);
while (symbol != symtab.endIterator())
{
gmx_ana_selmethod_t *method = symbol->methodValue();
- gmx_ana_selparam_t *param =
+ gmx_ana_selparam_t *param =
gmx_ana_selmethod_find_param(name, method);
if (param)
{
report_error(fp, method->name, "error: outinit should be provided because the method has POS_VALUE");
bOk = false;
}
+ /* Check presence of outinit for variable output count methods */
+ if ((method->flags & SMETH_VARNUMVAL) && !method->outinit)
+ {
+ report_error(fp, method->name, "error: outinit should be provided because the method has SMETH_VARNUMVAL");
+ bOk = false;
+ }
/* Warn of dynamic callbacks in static methods */
if (!(method->flags & SMETH_MODIFIER))
{
return bOk;
}
-/*!
+/*! \brief
* Checks the validity of a selection method.
*
* \param[in] fp File handle to use for diagnostic messages
return bOk;
}
-/*!
+/*! \brief
* Checks the validity of a selection modifier method.
*
* \param[in] fp File handle to use for diagnostic messages
gmx_ana_selmethod_register_defaults(gmx::SelectionParserSymbolTable *symtab)
{
size_t i;
- int rc;
- bool bOk;
+ int rc;
+ bool bOk;
bOk = true;
for (i = 0; i < asize(smtable_def); ++i)
biod.pnpi.spb.ru / alexxy / gromacs.git / blobdiff