ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-3.0/src/UseTheForce/ForceFields.hpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/UseTheForce/ForceFields.hpp (file contents):
Revision 1490 by gezelter, Fri Sep 24 04:16:43 2004 UTC vs.
Revision 1617 by chuckv, Wed Oct 20 20:46:20 2004 UTC

# Line 9 | Line 9
9   #include <stdlib.h>
10   #include <math.h>
11  
12 < #include "Atom.hpp"
13 < #include "SimInfo.hpp"
14 < #include "StuntDouble.hpp"
12 > #include "primitives/Atom.hpp"
13 > #include "brains/SimInfo.hpp"
14 > #include "primitives/StuntDouble.hpp"
15  
16   #ifdef IS_MPI
17 < #include "mpiForceField.h"
17 > #include "UseTheForce/mpiForceField.h"
18   #endif
19  
20 < #include "fForceField.h"
21 < #include "fortranWrapDefines.hpp"
20 > #include "UseTheForce/fForceField.h"
21 > //#include "UseTheForce/fortranWrapDefines.hpp"
22  
23   class bond_pair{
24   public:
# Line 86 | Line 86 | class ForceFields{ (public)
86  
87    virtual double getAtomTypeMass(char* atomType) = 0;
88  
89 <  void setFortranForceLoop( doForceLoop_TD fsub ){
90 <    fortranForceLoop = fsub;
91 <  }
92 <
89 >
90   protected:
91    
92    void initFortran( int ljMixPolicy, int useReactionField );
93 <  doForceLoop_TD fortranForceLoop;
93 >  
94  
95    FILE *frcFile;
96    SimInfo* entry_plug;
# Line 215 | Line 212 | class WATER : public ForceFields{ (private)
212  
213   };
214  
215 + class Shapes_FF : public ForceFields{
216 +
217 + public:
218 +  Shapes_FF();
219 +  Shapes_FF(char* the_variant);
220 +  virtual ~Shapes_FF();
221 +  
222 +
223 +  void readParams();
224 +  void cleanMe( void );
225 +
226 +  void initializeAtoms( int nAtoms, Atom** atomArray );
227 +  void initializeBonds( int nBonds, Bond** bondArray,
228 +                        bond_pair* the_bonds );
229 +  void initializeBends( int nBends, Bend** bendArray,
230 +                        bend_set* the_bends );
231 +  void initializeTorsions( int nTorsions, Torsion** torsionArray,
232 +                           torsion_set* the_torsions );
233 +
234 +  void initForceField( int ljMixRule );
235 +
236 +  void calcRcut( void );
237 +  double getAtomTypeMass(char* atomType);
238 + private:
239 +
240 +  void fastForward( char* stopText, char* searchOwner );
241 +  
242 +  double shapesRcut;
243 + };
244 +
245 +
246   #endif
247  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines