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

Comparing trunk/src/restraints/ThermoIntegrationForceManager.cpp (file contents):
Revision 1389 by cli2, Mon Sep 7 16:31:51 2009 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42  
# Line 46 | Line 46
46   #include <mpi.h>
47   #endif
48  
49 < namespace oopse {
49 > namespace OpenMD {
50    
51    ThermoIntegrationForceManager::ThermoIntegrationForceManager(SimInfo* info):
52      RestraintForceManager(info){
# Line 60 | Line 60 | namespace oopse {
60        tIntLambda_ = 1.0;
61        sprintf(painCave.errMsg,
62                "ThermoIntegration error: the transformation parameter\n"
63 <              "\t(lambda) was not specified. OOPSE will use a default\n"
63 >              "\t(lambda) was not specified. OpenMD will use a default\n"
64                "\tvalue of %f. To set lambda, use the \n"
65                "\tthermodynamicIntegrationLambda variable.\n",
66                tIntLambda_);
# Line 75 | Line 75 | namespace oopse {
75        tIntK_ = 1.0;
76        sprintf(painCave.errMsg,
77                "ThermoIntegration Warning: the tranformation parameter\n"
78 <              "\texponent (k) was not specified. OOPSE will use a default\n"
78 >              "\texponent (k) was not specified. OpenMD will use a default\n"
79                "\tvalue of %f. To set k, use the thermodynamicIntegrationK\n"
80                "\tvariable.\n",
81                tIntK_);

Diff Legend

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