ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/SHAPES/forcer.cpp
(Generate patch)

Comparing trunk/SHAPES/forcer.cpp (file contents):
Revision 1274 by gezelter, Tue Jun 15 20:29:26 2004 UTC vs.
Revision 1279 by chrisfen, Fri Jun 18 19:01:40 2004 UTC

# Line 5 | Line 5
5   #include "forcerCmd.h"
6   #include "PDBReader.hpp"
7   #include "RigidBody.hpp"
8 + #include "GridBuilder.hpp"
9  
10   #define MK_STR(s) # s
11   #define STR_DEFINE(t, s) t = MK_STR(s)
# Line 52 | Line 53 | int main(int argc, char* argv[]){
53    vector<VDWAtom*> theAtoms;
54    vector<VDWAtom*>::iterator j;
55    VDWAtom* atom;
56 <
56 >  GridBuilder* gb;
57 >  vector<double> sigmaGrid;
58 >  vector<double> epsGrid;
59 >  vector<double> sGrid;
60 >  
61    double mass, rpar, eps;
62    string fileName;  
63    char vdwFileName[2002];
# Line 69 | Line 74 | int main(int argc, char* argv[]){
74    int lineNum;
75    int nTokens;
76    int FF;
77 +  int bandwidth;
78    short int gotMatch;
79  
80    //parse the command line options
# Line 83 | Line 89 | int main(int argc, char* argv[]){
89      exit(1);
90    }
91  
92 +  //the bandwidth has a default value (default=8), so it is always given
93 +  bandwidth = args_info.bandwidth_arg;
94 +  
95    if (args_info.charmm_given) {
96      FF=CHARMM;
97      strcpy(vdwFileName, "charmm27.vdw");
# Line 233 | Line 242 | int main(int argc, char* argv[]){
242      rb->addAtom(*j);
243    }
244    
245 <  //GridBuilder gb = new GridBuilder(rb);
246 <  //gb->launchProbe(FF, sigmaGrid, sGrid, epsGrid);
245 >  rb->calcRefCoords();
246 >  
247 >  gb = new GridBuilder(rb, bandwidth);
248 >
249 >  gb->launchProbe(FF, sigmaGrid, sGrid, epsGrid);
250 >
251    
252   }
253  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines