ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/no-template-branch/OOPSE/libmdtools/InitializeFromFile.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/InitializeFromFile.cpp (file contents):
Revision 690 by mmeineke, Tue Aug 12 21:44:06 2003 UTC vs.
Revision 787 by mmeineke, Thu Sep 25 19:27:15 2003 UTC

# Line 72 | Line 72 | void InitializeFromFile :: readInit( SimInfo* the_simn
72  
73   void InitializeFromFile :: readInit( SimInfo* the_simnfo ){
74  
75 <  int i, j, done, which_node, which_atom; // loop counter
75 >  int i, j;
76 >  
77 > #ifdef IS_MPI
78 >  int done, which_node, which_atom; // loop counter
79 > #endif //is_mpi
80  
81    const int BUFFERSIZE = 2000; // size of the read buffer
82    int n_atoms; // the number of atoms
83    char read_buffer[BUFFERSIZE]; //the line buffer for reading
80 – #ifdef IS_MPI
81 –  char send_buffer[BUFFERSIZE];
82 – #endif
84  
85    char *eof_test; // ptr to see when we reach the end of the file
86    char *parseErr;
87 <  int procIndex;
87 >
88    double currTime;
89    double boxMat[9];
90    double theBoxMat3[3][3];
# Line 102 | Line 103 | void InitializeFromFile :: readInit( SimInfo* the_simn
103    }
104  
105    n_atoms = atoi( read_buffer );
105 –
106 –  Atom **atoms = simnfo->atoms;
107 –  DirectionalAtom* dAtom;
106  
107    if( n_atoms != simnfo->n_atoms ){
108      sprintf( painCave.errMsg,
# Line 181 | Line 179 | void InitializeFromFile :: readInit( SimInfo* the_simn
179      eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
180      if( eof_test == NULL ){
181        sprintf( painCave.errMsg,
182 <               "Error reading 1st line of %d \n ",c_in_name);
182 >               "Error reading 1st line of %s \n ",c_in_name);
183        haveError = 1;
184        simError();
185      }
186      
187      n_atoms = atoi( read_buffer );
188      
191 –    Atom **atoms = simnfo->atoms;
192 –    DirectionalAtom* dAtom;
193 –
189      // Check to see that the number of atoms in the intial configuration file is the
190      // same as declared in simBass.
191      
# Line 333 | Line 328 | char* InitializeFromFile::parseDumpLine(char* readLine
328    Atom **atoms = simnfo->atoms;
329    DirectionalAtom* dAtom;
330    
331 <  int j, n_atoms, atomIndex;
331 >  int n_atoms, atomIndex;
332  
333   #ifdef IS_MPI
334 +  int j;
335 +
336    n_atoms = mpiSim->getTotAtoms();
337    atomIndex=-1;        
338    for (j=0; j < mpiSim->getMyNlocal(); j++) {
# Line 544 | Line 541 | char* InitializeFromFile::parseBoxLine(char* readLine,
541                                         double &time ){
542  
543    char *foo; // the pointer to the current string token
547 –  int j;
544  
545    // set the string tokenizer
546    

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines