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

Comparing trunk/src/io/ForceFieldOptions.cpp (file contents):
Revision 820 by chuckv, Fri Dec 23 23:04:25 2005 UTC vs.
Revision 834 by chuckv, Fri Dec 30 23:15:59 2005 UTC

# Line 40 | Line 40
40   */
41   #define __C
42   #include "io/ForceFieldOptions.hpp"
43 < #include "UseTheForce/fForceOptions.h"
44 < #include "UseTheForce/DarkSide/fForceOptions_interface.h"
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 60 | Line 60 | namespace oopse {
60      }
61  
62  
63 <  void ForceFieldOptions::tellFortranOptions(){
64 <    ForceOptions fortranForceOptions;
63 >  void ForceFieldOptions::makeFortranOptions(ForceOptions& fortranForceOptions){
64      
65      fortranForceOptions.vdw14scale = this->getvdw14scale();
66 <    fortranForceOptions.vdw14scale = this->getvdw14scale();
68 <    
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