ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/io/ForceFieldOptions.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/io/ForceFieldOptions.cpp (file contents):
Revision 2488 by tim, Mon Dec 5 23:37:56 2005 UTC vs.
Revision 2549 by tim, Thu Jan 12 14:31:33 2006 UTC

# Line 1 | Line 1
1 < #include "io/ForceFieldOptions.hpp"
2 < namespace oopse {
3 <    ForceFieldOptions::ForceFieldOptions() {
4 <      std::cout << "\n";
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 > *
4 > * The University of Notre Dame grants you ("Licensee") a
5 > * non-exclusive, royalty free, license to use, modify and
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
19 > *    notice, this list of conditions and the following disclaimer.
20 > *
21 > * 3. Redistributions in binary form must reproduce the above copyright
22 > *    notice, this list of conditions and the following disclaimer in the
23 > *    documentation and/or other materials provided with the
24 > *    distribution.
25 > *
26 > * This software is provided "AS IS," without a warranty of any
27 > * kind. All express or implied conditions, representations and
28 > * warranties, including any implied warranty of merchantability,
29 > * fitness for a particular purpose or non-infringement, are hereby
30 > * excluded.  The University of Notre Dame and its licensors shall not
31 > * be liable for any damages suffered by licensee as a result of
32 > * using, modifying or distributing the software or its
33 > * derivatives. In no event will the University of Notre Dame or its
34 > * licensors be liable for any lost revenue, profit or data, or for
35 > * direct, indirect, special, consequential, incidental or punitive
36 > * damages, however caused and regardless of the theory of liability,
37 > * arising out of the use of or inability to use software, even if the
38 > * University of Notre Dame has been advised of the possibility of
39 > * such damages.
40 > */
41 > #define __C
42 > #include "io/ForceFieldOptions.hpp"
43 >
44 > namespace oopse {
45 >
46 >    ForceFieldOptions::ForceFieldOptions() {
47        DefineOptionalParameter(Name, "Name");
48 +      DefineOptionalParameter(CutoffPolicy, "cutoffPolicy");
49        DefineOptionalParameterWithDefaultValue(vdWtype, "vdWtype", "Lennard-Jones");
50        DefineOptionalParameterWithDefaultValue(DistanceMixingRule, "DistanceMixingRule", "arithmetic");
51        DefineOptionalParameterWithDefaultValue(DistanceType, "DistanceType", "sigma");
# Line 10 | Line 53 | namespace oopse {
53        DefineOptionalParameterWithDefaultValue(EnergyUnitScaling, "EnergyUnitScaling", 1.0);
54        DefineOptionalParameterWithDefaultValue(DistanceUnitScaling, "DistanceUnitScaling", 1.0);
55        DefineOptionalParameterWithDefaultValue(AngleUnitScaling, "AngleUnitScaling", 1.0);
56 <      DefineOptionalParameterWithDefaultValue(TorsionAngleConvention, "TorsionAngleConvention", "180 is trans");
56 >      DefineOptionalParameterWithDefaultValue(TorsionAngleConvention, "TorsionAngleConvention", "180_is_trans");
57        DefineOptionalParameterWithDefaultValue(vdw14scale, "vdW-14-scale", 0.0);
58        DefineOptionalParameterWithDefaultValue(electrostatic14scale, "electrostatic-14-scale", 0.0);
59        DefineOptionalParameterWithDefaultValue(dielectric, "dielectric", 1.0);
60      }
61 < }
61 >
62 >
63 >  void ForceFieldOptions::makeFortranOptions(ForceOptions& fortranForceOptions){
64 >    
65 >    fortranForceOptions.vdw14scale = this->getvdw14scale();
66 >    fortranForceOptions.electrostatic14scale = this->getelectrostatic14scale();
67 >
68 >    std::string DistanceMix = this->getDistanceMixingRule();
69 >    toUpper(DistanceMix);
70 >    if(DistanceMix == "ARITHMETIC"){
71 >      fortranForceOptions.DistanceMixingRule = ARITHMETIC_MIXING_RULE;
72 >    }else if(DistanceMix == "GEOMETRIC"){
73 >      fortranForceOptions.DistanceMixingRule = GEOMETRIC_MIXING_RULE;
74 >    }else{
75 >      fortranForceOptions.DistanceMixingRule = ARITHMETIC_MIXING_RULE;
76 >    }
77 >    std::string EnergyMix = this->getEnergyMixingRule();  
78 >    toUpper(EnergyMix);
79 >    if(EnergyMix == "ARITHMETIC"){
80 >      fortranForceOptions.EnergyMixingRule = ARITHMETIC_MIXING_RULE;
81 >    }else if(EnergyMix == "GEOMETRIC"){
82 >      fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
83 >    }else{
84 >      fortranForceOptions.EnergyMixingRule = GEOMETRIC_MIXING_RULE;
85 >    }
86 >
87 >
88 >  }
89 >
90 > }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines