ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/utils/GenericData.hpp

Comparing:
trunk/src/utils/GenericData.hpp (file contents), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/utils/GenericData.hpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

#	Line 6 | Line 6
6		* redistribute this software in source and binary code form, provided
7		* that the following conditions are met:
8		*
9	<	* 1. Acknowledgement of the program authors must be made in any
10	<	*    publication of scientific results based in part on use of the
11	<	*    program.  An acceptable form of acknowledgement is citation of
12	<	*    the article in which the program was described (Matthew
13	<	*    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14	<	*    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15	<	*    Parallel Simulation Engine for Molecular Dynamics,"
16	<	*    J. Comput. Chem. 26, pp. 252-271 (2005))
17	<	*
18	<	* 2. Redistributions of source code must retain the above copyright
9	>	* 1. Redistributions of source code must retain the above copyright
10		*    notice, this list of conditions and the following disclaimer.
11		*
12	<	* 3. Redistributions in binary form must reproduce the above copyright
12	>	* 2. Redistributions in binary form must reproduce the above copyright
13		*    notice, this list of conditions and the following disclaimer in the
14		*    documentation and/or other materials provided with the
15		*    distribution.
#	Line 37 | Line 28
28		* arising out of the use of or inability to use software, even if the
29		* University of Notre Dame has been advised of the possibility of
30		* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
35	+	*
36	+	* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37	+	* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	+	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
39	+	* [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	+	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		/**
#	Line 55 | Line 56
56		#include <string>
57		#include <vector>
58		#include "config.h"
59	<	namespace oopse{
59	>	namespace OpenMD{
60
61		/**
62		* @ class GenericData GenericData.hpp "utils/GenericData.hpp"
#	Line 161 | Line 162 | namespace oopse{
162		*   PropertyMap propMap;
163		*   GenericData* gdata;
164		*
165	<	*   s->setData("OOPSE");
165	>	*   s->setData("OpenMD");
166		*   propMap->addProperty(s);
167		*
168		*   gdata = propMap->getPropertyByName("MyStringGenericData");
#	Line 233 | Line 234 | namespace oopse{
234		*  std::vector<std::string>::iterator iter;
235		*
236		*  sv->push_back("Hello World");
237	<	*  sv->push_back("OOPSE");
237	>	*  sv->push_back("OpenMD");
238		*
239		*  propMap.addProperty(sv);
240		*
#	Line 253 | Line 254 | namespace oopse{
254		typedef VectorTypeData<std::string> StringVectorGenericData;
255
256
257	<	} // namespace oopse
257	>	} // namespace OpenMD
258		#endif //UTIL _GENERICDATA_HPP

Comparing:
trunk/src/utils/GenericData.hpp (property svn:keywords), Revision 963 by tim, Wed May 17 21:51:42 2006 UTC vs.
branches/development/src/utils/GenericData.hpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines