ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/heatflux/src/UseTheForce/EAM_FF.cpp
(Generate patch)

Comparing trunk/src/UseTheForce/EAM_FF.cpp (file contents):
Revision 366 by gezelter, Fri Feb 18 15:58:22 2005 UTC vs.
Revision 1282 by gezelter, Wed Jul 30 18:11:19 2008 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 40 | Line 40
40   */
41  
42   #include "UseTheForce/EAM_FF.hpp"
43 + #include "UseTheForce/DarkSide/eam_interface.h"
44   #include "UseTheForce/DarkSide/lj_interface.h"
44 #include "UseTheForce/DarkSide/charge_interface.h"
45 #include "UseTheForce/DarkSide/dipole_interface.h"
45   #include "UseTheForce/DarkSide/sticky_interface.h"
46   #include "UseTheForce/ForceFieldFactory.hpp"
47 < #include "io/DirectionalAtomTypesSectionParser.hpp"
47 > #include "io/BaseAtomTypesSectionParser.hpp"
48   #include "io/AtomTypesSectionParser.hpp"
50 #include "io/LennardJonesAtomTypesSectionParser.hpp"
51 #include "io/ElectrostaticAtomTypesSectionParser.hpp"
49   #include "io/EAMAtomTypesSectionParser.hpp"
50 < #include "io/StickyAtomTypesSectionParser.hpp"
54 < #include "io/BondTypesSectionParser.hpp"
55 < #include "io/BendTypesSectionParser.hpp"
56 < #include "io/TorsionTypesSectionParser.hpp"
50 > #include "io/OptionSectionParser.hpp"
51   #include "UseTheForce/ForceFieldCreator.hpp"
52   #include "utils/simError.h"
53   namespace oopse {
54      
55 < EAM_FF::EAM_FF(){
55 >  EAM_FF::EAM_FF(){
56  
57      //set default force field filename
58      setForceFieldFileName("EAM.frc");
59  
60      //the order of adding section parsers are important
61 <    //DirectionalAtomTypesSectionParser should be added before AtomTypesSectionParser Since
62 <    //These two section parsers will actually create "real" AtomTypes (AtomTypesSectionParser will create
63 <    //AtomType and DirectionalAtomTypesSectionParser will creat DirectionalAtomType which is a subclass
70 <    //of AtomType, therefore it should come first). Other AtomTypes Section Parser will not create the
71 <    //"real" AtomType, they only add and set some attribute of the AtomType. Thus their order are not
72 <    //important. AtomTypesSectionParser should be added before other atom type section parsers.
73 <    //Make sure they are added after DirectionalAtomTypesSectionParser and AtomTypesSectionParser.
74 <    //The order of BondTypesSectionParser, BendTypesSectionParser and TorsionTypesSectionParser are
75 <    //not important.
76 <    spMan_.push_back(new DirectionalAtomTypesSectionParser());
61 >    //OptionSectionParser must come first to set options for other parsers
62 >    spMan_.push_back(new OptionSectionParser(forceFieldOptions_));
63 >    spMan_.push_back(new BaseAtomTypesSectionParser());
64      spMan_.push_back(new AtomTypesSectionParser());
65 <    spMan_.push_back(new LennardJonesAtomTypesSectionParser());
66 <    spMan_.push_back(new ElectrostaticAtomTypesSectionParser());
80 <    spMan_.push_back(new EAMAtomTypesSectionParser());
81 <    spMan_.push_back(new StickyAtomTypesSectionParser());
82 <    spMan_.push_back(new BondTypesSectionParser());
83 <    spMan_.push_back(new BendTypesSectionParser());
84 <    spMan_.push_back(new TorsionTypesSectionParser());
85 <    
86 < }
65 >    spMan_.push_back(new EAMAtomTypesSectionParser(forceFieldOptions_));
66 >  }
67  
68 < void EAM_FF::parse(const std::string& filename) {
68 >  void EAM_FF::parse(const std::string& filename) {
69      ifstrstream* ffStream;
70      ffStream = openForceFieldFile(filename);
71  
# Line 95 | Line 75 | void EAM_FF::parse(const std::string& filename) {
75      AtomType* at;
76  
77      for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) {
78 <        at->makeFortranAtomType();
78 >      // useBase sets the responsibilities, and these have to be done
79 >      // after the atomTypes and Base types have all been scanned:
80 >
81 >      std::vector<AtomType*> ayb = at->allYourBase();      
82 >      if (ayb.size() > 1) {
83 >        for (int j = ayb.size()-1; j > 0; j--) {
84 >          
85 >          ayb[j-1]->useBase(ayb[j]);
86 >
87 >        }
88 >      }
89 >      at->makeFortranAtomType();
90      }
91  
92      for (at = atomTypeCont_.beginType(i); at != NULL; at = atomTypeCont_.nextType(i)) {
93 <        at->complete();
93 >      at->complete();
94      }
104    
105 }
95  
96 +    delete ffStream;
97 +  }
98  
99 < double EAM_FF::getRcutFromAtomType(AtomType* at){
100 <    double rcut = 0.0;    
99 >
100 >  RealType EAM_FF::getRcutFromAtomType(AtomType* at){
101 >    RealType rcut = 0.0;    
102      if (at->isEAM()) {
103 <        GenericData* data = at->getPropertyByName("EAM");
104 <        if (data != NULL) {
105 <            EAMParamGenericData* eamData = dynamic_cast<EAMParamGenericData*>(data);
103 >      GenericData* data = at->getPropertyByName("EAM");
104 >      if (data != NULL) {
105 >        EAMParamGenericData* eamData = dynamic_cast<EAMParamGenericData*>(data);
106  
107 <            if (eamData != NULL) {
107 >        if (eamData != NULL) {
108  
109 <                EAMParam& eamParam = eamData->getData();
110 <                rcut =  eamParam.rcut;
111 <            } else {
112 <                    sprintf( painCave.errMsg,
113 <                           "Can not cast GenericData to EAMParam\n");
114 <                    painCave.severity = OOPSE_ERROR;
115 <                    painCave.isFatal = 1;
116 <                    simError();          
117 <            }
118 <        } else {
119 <            sprintf( painCave.errMsg, "Can not find EAM Parameters\n");
120 <            painCave.severity = OOPSE_ERROR;
121 <            painCave.isFatal = 1;
122 <            simError();          
123 <        }
109 >          EAMParam& eamParam = eamData->getData();
110 >          rcut =  eamParam.rcut;
111 >        } else {
112 >          sprintf( painCave.errMsg,
113 >                   "Can not cast GenericData to EAMParam\n");
114 >          painCave.severity = OOPSE_ERROR;
115 >          painCave.isFatal = 1;
116 >          simError();          
117 >        }
118 >      } else {
119 >        sprintf( painCave.errMsg, "Can not find EAM Parameters\n");
120 >        painCave.severity = OOPSE_ERROR;
121 >        painCave.isFatal = 1;
122 >        simError();          
123 >      }
124      }    else {
125 <        rcut = ForceField::getRcutFromAtomType(at);
125 >      rcut = ForceField::getRcutFromAtomType(at);
126      }
127    
128      return rcut;    
129 < }
129 >  }
130  
131 +  EAM_FF::~EAM_FF(){
132 +    // We need to clean up the fortran side so we don't have bad things happen if
133 +    // we try to create a second EAM force field.
134 +    destroyEAMTypes();
135 +  }
136   } //end namespace oopse

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines