ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/simpleBuilder/simpleBuilder.cpp
(Generate patch)

Comparing trunk/src/applications/simpleBuilder/simpleBuilder.cpp (file contents):
Revision 1067 by gezelter, Tue Oct 10 18:34:12 2006 UTC vs.
Revision 1978 by gezelter, Thu Mar 13 13:03:11 2014 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, 234107 (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   #include <cstdlib>
# Line 61 | Line 62 | using namespace std;
62   #include "utils/StringUtils.hpp"
63  
64   using namespace std;
65 < using namespace oopse;
65 > using namespace OpenMD;
66  
67   void createMdFile(const std::string&oldMdFileName,
68                    const std::string&newMdFileName,
# Line 69 | Line 70 | int main(int argc, char *argv []) {
70  
71   int main(int argc, char *argv []) {
72  
72  // register force fields
73  registerForceFields();
73    registerLattice();
74      
75    gengetopt_args_info args_info;
# Line 158 | Line 157 | int main(int argc, char *argv []) {
157  
158    // Calculate lattice constant (in Angstroms)
159  
160 <  RealType avgMass = getMolMass(oldInfo->getMoleculeStamp(0),
161 <                                  oldInfo->getForceField());
160 >  RealType avgMass = MoLocator::getMolMass(oldInfo->getMoleculeStamp(0),
161 >                                           oldInfo->getForceField());
162  
163    latticeConstant = pow(rhoConvertConst * nMolPerCell * avgMass / density,
164                          (RealType)(1.0 / 3.0));
# Line 200 | Line 199 | int main(int argc, char *argv []) {
199  
200    createMdFile(inputFileName, outputFileName, nSites);
201  
202 <  if (oldInfo != NULL)
204 <    delete oldInfo;
202 >  delete oldInfo;
203  
204    // We need to read in the new SimInfo object, then Parse the
205    // md file and set up the system
# Line 253 | Line 251 | int main(int argc, char *argv []) {
251  
252    delete writer;
253  
254 <  sprintf(painCave.errMsg, "A new OOPSE MD file called \"%s\" has been "
254 >  sprintf(painCave.errMsg, "A new OpenMD file called \"%s\" has been "
255            "generated.\n", outputFileName.c_str());
256    painCave.isFatal = 0;
257 +  painCave.severity = OPENMD_INFO;
258    simError();
259    return 0;
260   }

Comparing trunk/src/applications/simpleBuilder/simpleBuilder.cpp (property svn:keywords):
Revision 1067 by gezelter, Tue Oct 10 18:34:12 2006 UTC vs.
Revision 1978 by gezelter, Thu Mar 13 13:03:11 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines