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

Comparing trunk/src/applications/oopse/oopse.cpp (file contents):
Revision 1290 by cli2, Wed Sep 10 19:51:45 2008 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   #ifdef IS_MPI
# Line 50 | Line 50
50   #include "brains/SimCreator.hpp"
51   #include "brains/SimInfo.hpp"
52   #include "constraints/ZconstraintForceManager.hpp"
53 + #include "restraints/RestraintForceManager.hpp"
54   #include "integrators/IntegratorFactory.hpp"
55   #include "integrators/Integrator.hpp"
56   #include "minimizers/MinimizerFactory.hpp"
57   #include "minimizers/Minimizer.hpp"
58   #include "restraints/ThermoIntegrationForceManager.hpp"
59  
60 < using namespace oopse;
60 > using namespace OpenMD;
61  
62  
63   int main(int argc,char* argv[]){
# Line 148 | Line 149 | int main(int argc,char* argv[]){
149                  
150      //Thermodynamic Integration Method
151      //set the force manager for thermodynamic integration if specified
152 <    if (simParams->getUseSolidThermInt() || simParams->getUseLiquidThermInt()){
152 >    if (simParams->getUseThermodynamicIntegration()){
153        ForceManager* fman = new ThermoIntegrationForceManager(info);
154        myIntegrator->setForceManager(fman);
155      }
156  
157 +    // Restraints
158 +    if (simParams->getUseRestraints() && !simParams->getUseThermodynamicIntegration()) {
159 +      ForceManager* fman = new RestraintForceManager(info);
160 +      myIntegrator->setForceManager(fman);
161 +    }
162 +
163      //Zconstraint-Method
164      if (simParams->getNZconsStamps() > 0) {
165        info->setNZconstraint(simParams->getNZconsStamps());
# Line 168 | Line 175 | int main(int argc,char* argv[]){
175      painCave.isFatal = 1;
176      simError();
177    }
171
172
178      
179    delete info;
180  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines