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

Comparing trunk/OOPSE/libmdtools/InitializeFromFile.cpp (file contents):
Revision 787 by mmeineke, Thu Sep 25 19:27:15 2003 UTC vs.
Revision 1131 by tim, Thu Apr 22 21:33:55 2004 UTC

# Line 1 | Line 1
1 + #define _FILE_OFFSET_BITS 64
2   #include <iostream>
3 < #include <cmath>
3 > #include <math.h>
4  
5   #include <stdio.h>
6   #include <stdlib.h>
# Line 10 | Line 11
11  
12   #include "ReadWrite.hpp"
13   #include "simError.h"
14 + #include "GenericData.hpp"
15  
16   #ifdef IS_MPI
17   #include <mpi.h>
18   #include "mpiSimulation.hpp"
19 < #define TAKE_THIS_TAG_CHAR 0
20 < #define TAKE_THIS_TAG_INT 1
19 > #define TAKE_THIS_TAG_CHAR 3134
20 > #define TAKE_THIS_TAG_INT 3135
21  
22   namespace initFile{
23    void nodeZeroError( void );
# Line 39 | Line 41 | InitializeFromFile::InitializeFromFile( char *in_name
41      painCave.isFatal = 1;
42      simError();
43    }
44 <  
44 >
45    strcpy( c_in_name, in_name);
46   #ifdef IS_MPI
47    }
48 < strcpy( checkPointMsg, "Infile opened for reading successfully." );
48 >  else{
49 >          sprintf( c_in_name, "mpiNodeParser_%d", worldRank );
50 >  }
51 >  
52 >  strcpy( checkPointMsg, "Infile opened for reading successfully." );
53    MPIcheckPoint();
54   #endif
55 <  return;  
55 >  return;
56   }
57  
58   InitializeFromFile::~InitializeFromFile( ){
# Line 73 | Line 79 | void InitializeFromFile :: readInit( SimInfo* the_simn
79   void InitializeFromFile :: readInit( SimInfo* the_simnfo ){
80  
81    int i, j;
82 <  
82 >
83   #ifdef IS_MPI
84    int done, which_node, which_atom; // loop counter
85   #endif //is_mpi
86  
87    const int BUFFERSIZE = 2000; // size of the read buffer
88 <  int n_atoms; // the number of atoms
89 <  char read_buffer[BUFFERSIZE]; //the line buffer for reading
88 >  int nTotObjs; // the number of atoms
89 >  char read_buffer[BUFFERSIZE]; //the line buffer for reading
90  
91 <  char *eof_test; // ptr to see when we reach the end of the file
91 >  char *eof_test; // ptr to see when we reach the end of the file
92    char *parseErr;
93  
94 <  double currTime;
89 <  double boxMat[9];
90 <  double theBoxMat3[3][3];
94 >  vector<StuntDouble*> integrableObjects;
95  
96    simnfo = the_simnfo;
97  
# Line 102 | Line 106 | void InitializeFromFile :: readInit( SimInfo* the_simn
106      simError();
107    }
108  
109 <  n_atoms = atoi( read_buffer );
109 >  nTotObjs = atoi( read_buffer );
110  
111 <  if( n_atoms != simnfo->n_atoms ){
111 >  if( nTotObjs != simnfo->getTotIntegrableObjects() ){
112      sprintf( painCave.errMsg,
113               "Initialize from File error. %s n_atoms, %d, "
114               "does not match the BASS file's n_atoms, %d.\n",
115 <             c_in_name, n_atoms, simnfo->n_atoms );
115 >             c_in_name, nTotObjs, simnfo->getTotIntegrableObjects());
116      painCave.isFatal = 1;
117      simError();
118    }
119 <  
120 <  //read the box mat from the comment line
121 <  
119 >
120 >  //read the box mat from the comment line
121 >
122    eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
123    if(eof_test == NULL){
124      sprintf( painCave.errMsg,
# Line 123 | Line 127 | void InitializeFromFile :: readInit( SimInfo* the_simn
127      simError();
128    }
129  
130 <  parseErr = parseBoxLine( read_buffer, boxMat, currTime );
130 >  parseErr = parseCommentLine( read_buffer, simnfo);
131    if( parseErr != NULL ){
132      strcpy( painCave.errMsg, parseErr );
133      painCave.isFatal = 1;
134      simError();
135    }
136  
137 <  for(i=0;i<3;i++)
134 <    for(j=0;j<3;j++) theBoxMat3[i][j] = boxMat[3*j+i];
137 >  //parse dump lines
138  
139 <  simnfo->setBoxM( theBoxMat3 );
137 <  simnfo->setTime( currTime );
139 >  for( i=0; i < simnfo->n_mol; i++){
140  
141 +    integrableObjects = (simnfo->molecules[i]).getIntegrableObjects();
142  
143 <  for( i=0; i < n_atoms; i++){
141 <    
142 <    eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
143 <    if(eof_test == NULL){
144 <      sprintf(painCave.errMsg,
145 <              "error in reading file %s\n"
146 <              "natoms  = %d; index = %d\n"
147 <              "error reading the line from the file.\n",
148 <              c_in_name, n_atoms, i );
149 <      painCave.isFatal = 1;
150 <      simError();
151 <    }
143 >    for(j = 0; j < integrableObjects.size(); j++){
144  
145 <    
146 <    parseErr = parseDumpLine( read_buffer, i );
147 <    if( parseErr != NULL ){
148 <      strcpy( painCave.errMsg, parseErr );
149 <      painCave.isFatal = 1;
150 <      simError();
145 >      eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
146 >      if(eof_test == NULL){
147 >        sprintf(painCave.errMsg,
148 >              "error in reading file %s\n"
149 >              "natoms  = %d; index = %d\n"
150 >              "error reading the line from the file.\n",
151 >              c_in_name, nTotObjs, i );
152 >        painCave.isFatal = 1;
153 >        simError();
154 >      }
155 >      
156 >      parseErr = parseDumpLine( read_buffer, integrableObjects[j]);
157 >      if( parseErr != NULL ){
158 >        strcpy( painCave.errMsg, parseErr );
159 >        painCave.isFatal = 1;
160 >        simError();
161 >      }
162      }
163    }
164  
162 –
165    // MPI Section of code..........
166   #else //IS_MPI
167  
# Line 168 | Line 170 | void InitializeFromFile :: readInit( SimInfo* the_simn
170  
171    int myStatus; // 1 = wakeup & success; 0 = error; -1 = AllDone
172    int haveError;
173 <  
173 >
174    MPI_Status istatus;
175 <  int *AtomToProcMap = mpiSim->getAtomToProcMap();
175 >  int *MolToProcMap = mpiSim->getMolToProcMap();
176 >  int localIndex;
177 >  int nCurObj;
178 >  int nItems;
179  
180 <  
180 >  nTotObjs = simnfo->getTotIntegrableObjects();
181    haveError = 0;
182    if (worldRank == 0) {
183  
# Line 183 | Line 188 | void InitializeFromFile :: readInit( SimInfo* the_simn
188        haveError = 1;
189        simError();
190      }
191 <    
192 <    n_atoms = atoi( read_buffer );
193 <    
194 <    // Check to see that the number of atoms in the intial configuration file is the
191 >
192 >    nItems = atoi( read_buffer );
193 >
194 >    // Check to see that the number of integrable objects  in the intial configuration file is the
195      // same as declared in simBass.
196 <    
197 <    if( n_atoms != mpiSim->getTotAtoms() ){
196 >
197 >    if( nTotObjs != nItems){
198        sprintf( painCave.errMsg,
199                 "Initialize from File error. %s n_atoms, %d, "
200                 "does not match the BASS file's n_atoms, %d.\n",
201 <               c_in_name, n_atoms, simnfo->n_atoms );
201 >               c_in_name, nTotObjs, simnfo->getTotIntegrableObjects());
202        haveError= 1;
203        simError();
204      }
205 <    
206 <    //read the boxMat from the comment line
207 <    
205 >
206 >    //read the boxMat from the comment line
207 >
208      eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
209      if(eof_test == NULL){
210        sprintf( painCave.errMsg,
# Line 207 | Line 212 | void InitializeFromFile :: readInit( SimInfo* the_simn
212        haveError = 1;
213        simError();
214      }
215 <    
216 <    parseErr = parseBoxLine( read_buffer, boxMat, currTime );
215 >
216 >    //Every single processor will parse the comment line by itself
217 >    //By using this way, we might lose some efficiency, but if we want to add
218 >    //more parameters into comment line, we only need to modify function
219 >    //parseCommentLine
220 >
221 >    MPI_Bcast(read_buffer, BUFFERSIZE, MPI_CHAR, 0, MPI_COMM_WORLD);
222 >
223 >
224 >    parseErr = parseCommentLine( read_buffer, simnfo);
225 >
226      if( parseErr != NULL ){
227        strcpy( painCave.errMsg, parseErr );
228        haveError = 1;
229        simError();
230      }
231  
232 <    MPI_Bcast(boxMat, 9, MPI_DOUBLE, 0, MPI_COMM_WORLD );
233 <    MPI_Bcast(&currTime, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD );
234 <  
235 <    if(haveError) nodeZeroError();
232 >    for (i=0 ; i < mpiSim->getTotNmol(); i++) {
233 >      which_node = MolToProcMap[i];
234 >      if(which_node == 0){
235 >       //molecules belong to master node
236  
237 <    for (i=0 ; i < mpiSim->getTotAtoms(); i++) {
224 <      
225 <      eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
226 <      if(eof_test == NULL){
227 <        sprintf(painCave.errMsg,
228 <                "error in reading file %s\n"
229 <                "natoms  = %d; index = %d\n"
230 <                "error reading the line from the file.\n",
231 <                c_in_name, n_atoms, i );
232 <        haveError= 1;
233 <        simError();
234 <      }
235 <    
236 <      if(haveError) nodeZeroError();
237 >      localIndex = mpiSim->getGlobalToLocalMol(i);
238  
239 <      // Get the Node number which wants this atom:
240 <      which_node = AtomToProcMap[i];    
241 <      if (which_node == 0) {
242 <        parseErr = parseDumpLine( read_buffer, i );
242 <        if( parseErr != NULL ){
243 <          strcpy( painCave.errMsg, parseErr );
244 <          haveError = 1;
245 <          simError();
246 <        }    
247 <        if(haveError) nodeZeroError();
248 <      }
249 <      
250 <      else {
251 <      
252 <        myStatus = 1;
253 <        MPI_Send(&myStatus, 1, MPI_INT, which_node,
254 <                 TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
255 <        MPI_Send(read_buffer, BUFFERSIZE, MPI_CHAR, which_node,
256 <                 TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
257 <        MPI_Send(&i, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT,
258 <                 MPI_COMM_WORLD);
259 <        MPI_Recv(&myStatus, 1, MPI_INT, which_node, TAKE_THIS_TAG_INT,
260 <                 MPI_COMM_WORLD, &istatus);
261 <        
262 <        if(!myStatus) nodeZeroError();
239 >      if(localIndex == -1) {
240 >        strcpy(painCave.errMsg, "Molecule not found on node 0!");
241 >        haveError = 1;
242 >        simError();
243        }
244 <    }
245 <    myStatus = -1;
246 <    for (j = 0; j < mpiSim->getNumberProcessors(); j++) {      
247 <      MPI_Send( &myStatus, 1, MPI_INT, j,
248 <                TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
249 <    }
250 <    
251 <  } else {
252 <    
253 <    MPI_Bcast(boxMat, 9, MPI_DOUBLE, 0, MPI_COMM_WORLD);
254 <    MPI_Bcast(&currTime, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
244 >
245 >       integrableObjects = (simnfo->molecules[localIndex]).getIntegrableObjects();
246 >       for(j=0; j < integrableObjects.size(); j++){
247 >        
248 >          eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
249 >          if(eof_test == NULL){
250 >                sprintf(painCave.errMsg,
251 >                    "error in reading file %s\n"
252 >                    "natoms  = %d; index = %d\n"
253 >                    "error reading the line from the file.\n",
254 >                    c_in_name, nTotObjs, i );
255 >                haveError= 1;
256 >                simError();
257 >          }
258 >          
259 >          if(haveError) nodeZeroError();
260  
261 <    done = 0;
262 <    while (!done) {
261 >          parseDumpLine(read_buffer, integrableObjects[j]);
262 >          
263 >       }
264  
279 –      MPI_Recv(&myStatus, 1, MPI_INT, 0,
280 –               TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
281 –      
282 –      if(!myStatus) anonymousNodeDie();
283 –      
284 –      if(myStatus < 0) break;
265  
266 <      MPI_Recv(read_buffer, BUFFERSIZE, MPI_CHAR, 0,
267 <               TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus);
268 <      MPI_Recv(&which_atom, 1, MPI_INT, 0,
266 >      }
267 >      else{
268 >      //molecule belongs to slave nodes
269 >
270 >        MPI_Recv(&nCurObj, 1, MPI_INT, which_node,
271                 TAKE_THIS_TAG_INT, MPI_COMM_WORLD, &istatus);
272 <      
273 <      myStatus = 1;
274 <      parseErr = parseDumpLine( read_buffer, which_atom );
275 <      if( parseErr != NULL ){
276 <        strcpy( painCave.errMsg, parseErr );
277 <        myStatus = 0;;
278 <        simError();
272 >
273 >       for(j=0; j < nCurObj; j++){
274 >        
275 >          eof_test = fgets(read_buffer, sizeof(read_buffer), c_in_file);
276 >          if(eof_test == NULL){
277 >                sprintf(painCave.errMsg,
278 >                    "error in reading file %s\n"
279 >                    "natoms  = %d; index = %d\n"
280 >                    "error reading the line from the file.\n",
281 >                    c_in_name, nTotObjs, i );
282 >                haveError= 1;
283 >                simError();
284 >          }
285 >          
286 >          if(haveError) nodeZeroError();
287 >
288 >            MPI_Send(read_buffer, BUFFERSIZE, MPI_CHAR, which_node,
289 >                      TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD);
290 >
291 >       }
292 >
293        }
294        
299 –      MPI_Send( &myStatus, 1, MPI_INT, 0,
300 –                TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
301 –      
295      }
296 +    
297    }
298 <    
299 < // last  thing last, enable  fatalities.
306 <  painCave.isEventLoop = 0;
298 >  else{
299 >  //actions taken at slave nodes
300  
301 <  for(i=0;i<3;i++)
309 <    for(j=0;j<3;j++) theBoxMat3[i][j] = boxMat[3*j+i];
301 >    MPI_Bcast(read_buffer, BUFFERSIZE, MPI_CHAR, 0, MPI_COMM_WORLD);
302  
303 <  simnfo->setBoxM( theBoxMat3 );
312 <  simnfo->setTime( currTime );
303 >    parseErr = parseCommentLine( read_buffer, simnfo);
304  
305 <  
305 >    if( parseErr != NULL ){
306 >      strcpy( painCave.errMsg, parseErr );
307 >      haveError = 1;
308 >      simError();
309 >    }
310 >  
311 >    for (i=0 ; i < mpiSim->getTotNmol(); i++) {
312 >      which_node = MolToProcMap[i];
313 >      
314 >      if(which_node == worldRank){
315 >      //molecule with global index i belongs to this processor
316 >      
317 >        localIndex = mpiSim->getGlobalToLocalMol(i);
318 >
319 >        if(localIndex == -1) {
320 >          sprintf(painCave.errMsg, "Molecule not found on node %d\n", worldRank);
321 >          haveError = 1;
322 >          simError();
323 >        }
324 >
325 >        integrableObjects = (simnfo->molecules[localIndex]).getIntegrableObjects();        
326 >
327 >        nCurObj = integrableObjects.size();
328 >        
329 >        MPI_Send(&nCurObj, 1, MPI_INT, 0,
330 >                        TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
331 >
332 >        for(j = 0; j < integrableObjects.size(); j++){
333 >
334 >          MPI_Recv(read_buffer, BUFFERSIZE, MPI_CHAR, 0,
335 >                              TAKE_THIS_TAG_CHAR, MPI_COMM_WORLD, &istatus);
336 >
337 >          parseErr = parseDumpLine(read_buffer, integrableObjects[j]);
338 >
339 >          if( parseErr != NULL ){
340 >                strcpy( painCave.errMsg, parseErr );
341 >                simError();
342 >          }
343 >
344 >        }
345 >          
346 >      }
347 >      
348 >    }
349 >
350 >  }
351   #endif
352   }
353  
354 < char* InitializeFromFile::parseDumpLine(char* readLine, int globalIndex){
354 > char* InitializeFromFile::parseDumpLine(char* readLine, StuntDouble* sd){
355  
356 <  char *foo; // the pointer to the current string token
357 <  
356 >  char *foo; // the pointer to the current string token
357 >
358    double pos[3]; // position place holders
359    double vel[3]; // velocity placeholders
360    double q[4]; // the quaternions
361 <  double jx, jy, jz; // angular velocity placeholders;
361 >  double ji[3]; // angular velocity placeholders;
362    double qSqr, qLength; // needed to normalize the quaternion vector.
327 –  
328 –  Atom **atoms = simnfo->atoms;
329 –  DirectionalAtom* dAtom;
330 –  
331 –  int n_atoms, atomIndex;
363  
333 – #ifdef IS_MPI
334 –  int j;
364  
336 –  n_atoms = mpiSim->getTotAtoms();
337 –  atomIndex=-1;        
338 –  for (j=0; j < mpiSim->getMyNlocal(); j++) {
339 –    if (atoms[j]->getGlobalIndex() == globalIndex) atomIndex = j;
340 –  }
341 –  if (atomIndex == -1) {
342 –    sprintf( painCave.errMsg,
343 –             "Initialize from file error. Atom at index %d "
344 –             "in file %s does not exist on processor %d .\n",
345 –             globalIndex, c_in_name, mpiSim->getMyNode() );
346 –    return strdup( painCave.errMsg );
347 –  }  
348 – #else
349 –  n_atoms = simnfo->n_atoms;
350 –  atomIndex = globalIndex;
351 – #endif // is_mpi
352 –
365    // set the string tokenizer
366 <  
366 >
367    foo = strtok(readLine, " ,;\t");
368 <  
368 >
369    // check the atom name to the current atom
370 <  
371 <  if( strcmp( foo, atoms[atomIndex]->getType() ) ){
370 >
371 >  if( strcmp( foo, sd->getType() ) ){
372      sprintf( painCave.errMsg,
373 <             "Initialize from file error. Atom %s at index %d "
362 <             "in file %s does not"
373 >             "Initialize from file error.  Does not"
374               " match the BASS atom %s.\n",
375 <             foo, atomIndex, c_in_name, atoms[atomIndex]->getType() );
375 >             sd->getType() );
376      return strdup( painCave.errMsg );
377    }
378 <    
378 >
379    // get the positions
380  
381    foo = strtok(NULL, " ,;\t");
382    if(foo == NULL){
383      sprintf( painCave.errMsg,
384 <             "error in reading postition x from %s\n"
385 <             "natoms  = %d, index = %d\n",
375 <             c_in_name, n_atoms, atomIndex );
384 >             "error in reading postition x from %s\n",
385 >             c_in_name);
386      return strdup( painCave.errMsg );
387    }
388    pos[0] = atof( foo );
389 <  
389 >
390    foo = strtok(NULL, " ,;\t");
391    if(foo == NULL){
392      sprintf( painCave.errMsg,
393 <             "error in reading postition y from %s\n"
394 <             "natoms  = %d, index = %d\n",
385 <             c_in_name, n_atoms, atomIndex );
393 >             "error in reading postition y from %s\n",
394 >             c_in_name);
395      return strdup( painCave.errMsg );
396    }
397    pos[1] = atof( foo );
398 <    
398 >
399    foo = strtok(NULL, " ,;\t");
400    if(foo == NULL){
401      sprintf( painCave.errMsg,
402 <             "error in reading postition z from %s\n"
403 <             "natoms  = %d, index = %d\n",
395 <             c_in_name, n_atoms, atomIndex );
402 >             "error in reading postition z from %s\n",
403 >             c_in_name);
404      return strdup( painCave.errMsg );
405    }
406 <  pos[2] = atof( foo );    
406 >  pos[2] = atof( foo );
407  
408  
409    // get the velocities
# Line 403 | Line 411 | char* InitializeFromFile::parseDumpLine(char* readLine
411    foo = strtok(NULL, " ,;\t");
412    if(foo == NULL){
413      sprintf( painCave.errMsg,
414 <             "error in reading velocity x from %s\n"
415 <             "natoms  = %d, index = %d\n",
408 <             c_in_name, n_atoms, atomIndex );
414 >             "error in reading velocity x from %s\n",
415 >             c_in_name );
416      return strdup( painCave.errMsg );
417    }
418    vel[0] = atof( foo );
419 <    
419 >
420    foo = strtok(NULL, " ,;\t");
421    if(foo == NULL){
422      sprintf( painCave.errMsg,
423 <             "error in reading velocity y from %s\n"
424 <             "natoms  = %d, index = %d\n",
418 <             c_in_name, n_atoms, atomIndex );
423 >             "error in reading velocity x from %s\n",
424 >             c_in_name );
425      return strdup( painCave.errMsg );
426    }
427    vel[1] = atof( foo );
428 <    
428 >
429    foo = strtok(NULL, " ,;\t");
430    if(foo == NULL){
431      sprintf( painCave.errMsg,
432 <             "error in reading velocity z from %s\n"
433 <             "natoms  = %d, index = %d\n",
428 <             c_in_name, n_atoms, atomIndex );
432 >             "error in reading velocity x from %s\n",
433 >             c_in_name );
434      return strdup( painCave.errMsg );
435    }
436    vel[2] = atof( foo );
437 <    
438 <    
437 >
438 >
439 >  // add the positions and velocities to the atom
440 >
441 >  sd->setPos( pos );
442 >  sd->setVel( vel );
443 >
444 >  if (!sd->isDirectional())
445 >    return NULL;
446 >
447    // get the quaternions
448 <    
449 <  if( atoms[atomIndex]->isDirectional() ){
450 <      
448 >
449 >  if( sd->isDirectional() ){
450 >
451      foo = strtok(NULL, " ,;\t");
452      if(foo == NULL){
453 <      sprintf(painCave.errMsg,
454 <              "error in reading quaternion 0 from %s\n"
455 <              "natoms  = %d, index = %d\n",
443 <              c_in_name, n_atoms, atomIndex );
453 >      sprintf( painCave.errMsg,
454 >                     "error in reading velocity x from %s\n",
455 >                      c_in_name );
456        return strdup( painCave.errMsg );
457      }
458      q[0] = atof( foo );
459 <      
459 >
460      foo = strtok(NULL, " ,;\t");
461      if(foo == NULL){
462        sprintf( painCave.errMsg,
463 <               "error in reading quaternion 1 from %s\n"
464 <               "natoms  = %d, index = %d\n",
453 <               c_in_name, n_atoms, atomIndex );
463 >                     "error in reading velocity x from %s\n",
464 >                      c_in_name );
465        return strdup( painCave.errMsg );
466      }
467      q[1] = atof( foo );
468 <      
468 >
469      foo = strtok(NULL, " ,;\t");
470      if(foo == NULL){
471        sprintf( painCave.errMsg,
472 <               "error in reading quaternion 2 from %s\n"
473 <               "natoms  = %d, index = %d\n",
463 <               c_in_name, n_atoms, atomIndex );
472 >                     "error in reading velocity x from %s\n",
473 >                      c_in_name );
474        return strdup( painCave.errMsg );
475      }
476      q[2] = atof( foo );
477 <      
477 >
478      foo = strtok(NULL, " ,;\t");
479      if(foo == NULL){
480        sprintf( painCave.errMsg,
481 <               "error in reading quaternion 3 from %s\n"
482 <               "natoms  = %d, index = %d\n",
473 <               c_in_name, n_atoms, atomIndex );
481 >                     "error in reading velocity x from %s\n",
482 >                      c_in_name );
483        return strdup( painCave.errMsg );
484      }
485      q[3] = atof( foo );
486 <      
486 >
487      // get the angular velocities
488 <      
488 >
489      foo = strtok(NULL, " ,;\t");
490      if(foo == NULL){
491        sprintf( painCave.errMsg,
492 <               "error in reading angular momentum jx from %s\n"
493 <               "natoms  = %d, index = %d\n",
485 <               c_in_name, n_atoms, atomIndex );
492 >                     "error in reading velocity x from %s\n",
493 >                      c_in_name );
494        return strdup( painCave.errMsg );
495      }
496 <    jx = atof( foo );
497 <      
496 >    ji[0] = atof( foo );
497 >
498      foo = strtok(NULL, " ,;\t");
499      if(foo == NULL){
500        sprintf( painCave.errMsg,
501 <               "error in reading angular momentum jy from %s\n"
502 <               "natoms  = %d, index = %d\n",
495 <               c_in_name, n_atoms, atomIndex );
501 >                     "error in reading velocity x from %s\n",
502 >                      c_in_name );
503        return strdup( painCave.errMsg );
504      }
505 <    jy = atof(foo );
506 <      
505 >    ji[1] = atof(foo );
506 >
507      foo = strtok(NULL, " ,;\t");
508      if(foo == NULL){
509        sprintf( painCave.errMsg,
510 <               "error in reading angular momentum jz from %s\n"
511 <               "natoms  = %d, index = %d\n",
505 <               c_in_name, n_atoms, atomIndex );
510 >                     "error in reading velocity x from %s\n",
511 >                      c_in_name );
512        return strdup( painCave.errMsg );
513      }
514 <    jz = atof( foo );
509 <      
510 <    dAtom = ( DirectionalAtom* )atoms[atomIndex];
514 >    ji[2] = atof( foo );
515  
516 +
517      // check that the quaternion vector is normalized
518  
519      qSqr = (q[0] * q[0]) + (q[1] * q[1]) + (q[2] * q[2]) + (q[3] * q[3]);
520 <      
520 >
521      qLength = sqrt( qSqr );
522      q[0] = q[0] / qLength;
523      q[1] = q[1] / qLength;
524      q[2] = q[2] / qLength;
525      q[3] = q[3] / qLength;
521 –      
522 –    dAtom->setQ( q );
523 –      
524 –    // add the angular velocities
526  
527 <    dAtom->setJx( jx );
528 <    dAtom->setJy( jy );
529 <    dAtom->setJz( jz );
527 >    // add quaternion and angular velocities
528 >
529 >    sd->setQ( q );
530 >    sd->setJ( ji );
531    }
530 –    
531 –  // add the positions and velocities to the atom
532 –    
533 –  atoms[atomIndex]->setPos( pos );
534 –  atoms[atomIndex]->setVel( vel );
532  
533 +
534 +
535    return NULL;
536   }
537  
538  
539 < char* InitializeFromFile::parseBoxLine(char* readLine, double boxMat[9],
541 <                                       double &time ){
539 > char* InitializeFromFile::parseCommentLine(char* readLine, SimInfo* entry_plug){
540  
541 <  char *foo; // the pointer to the current string token
541 >  double currTime;
542 >  double boxMat[9];
543 >  double theBoxMat3[3][3];
544 >  double chi;
545 >  double integralOfChidt;
546 >  double eta[9];
547  
548 +  char *foo; // the pointer to the current string token
549 +
550    // set the string tokenizer
551 <  
551 >
552    foo = strtok(readLine, " ,;\t");
553    // set the timeToken.
554  
# Line 553 | Line 558 | char* InitializeFromFile::parseBoxLine(char* readLine,
558               c_in_name );
559      return strdup( painCave.errMsg );
560    }
556 –  time = atof( foo );
561  
562 <  // get the Hx vector
563 <
560 <  foo = strtok(NULL, " ,;\t");
561 <  if(foo == NULL){
562 <    sprintf( painCave.errMsg,
563 <             "error in reading Hx[0] from %s\n",
564 <             c_in_name );
565 <    return strdup( painCave.errMsg );
566 <  }
567 <  boxMat[0] = atof( foo );
568 <  
569 <  foo = strtok(NULL, " ,;\t");
570 <  if(foo == NULL){
571 <    sprintf( painCave.errMsg,
572 <             "error in reading Hx[1] from %s\n",
573 <             c_in_name );
574 <    return strdup( painCave.errMsg );
575 <  }
576 <  boxMat[1] = atof( foo );
577 <    
578 <  foo = strtok(NULL, " ,;\t");
579 <  if(foo == NULL){
580 <    sprintf( painCave.errMsg,
581 <             "error in reading Hx[2] from %s\n",
582 <             c_in_name );
583 <    return strdup( painCave.errMsg );
584 <  }
585 <  boxMat[2] = atof( foo );    
562 >  currTime = atof( foo );
563 >  entry_plug->setTime( currTime );
564  
565 <  // get the Hy vector
565 >  //get H-Matrix
566  
567 <  foo = strtok(NULL, " ,;\t");
568 <  if(foo == NULL){
569 <    sprintf( painCave.errMsg,
570 <             "error in reading Hy[0] from %s\n",
571 <             c_in_name );
572 <    return strdup( painCave.errMsg );
567 >  for(int i = 0 ; i < 9; i++){
568 >    foo = strtok(NULL, " ,;\t");
569 >    if(foo == NULL){
570 >      sprintf( painCave.errMsg,
571 >               "error in reading H[%d] from %s\n", i, c_in_name );
572 >      return strdup( painCave.errMsg );
573 >    }
574 >    boxMat[i] = atof( foo );
575    }
596 –  boxMat[3] = atof( foo );
597 –  
598 –  foo = strtok(NULL, " ,;\t");
599 –  if(foo == NULL){
600 –    sprintf( painCave.errMsg,
601 –             "error in reading Hy[1] from %s\n",
602 –             c_in_name );
603 –    return strdup( painCave.errMsg );
604 –  }
605 –  boxMat[4] = atof( foo );
606 –    
607 –  foo = strtok(NULL, " ,;\t");
608 –  if(foo == NULL){
609 –    sprintf( painCave.errMsg,
610 –             "error in reading Hy[2] from %s\n",
611 –             c_in_name );
612 –    return strdup( painCave.errMsg );
613 –  }
614 –  boxMat[5] = atof( foo );    
576  
577 <  // get the Hz vector
577 >  for(int i=0;i<3;i++)
578 >    for(int j=0;j<3;j++) theBoxMat3[i][j] = boxMat[3*j+i];
579  
580 <  foo = strtok(NULL, " ,;\t");
581 <  if(foo == NULL){
582 <    sprintf( painCave.errMsg,
583 <             "error in reading Hz[0] from %s\n",
584 <             c_in_name );
585 <    return strdup( painCave.errMsg );
580 >  //set H-Matrix
581 >  entry_plug->setBoxM( theBoxMat3 );
582 >
583 >  //get chi and integralOfChidt, they should appear by pair
584 >
585 >  if( entry_plug->useInitXSstate ){
586 >    foo = strtok(NULL, " ,;\t\n");
587 >    if(foo != NULL){
588 >      chi = atof(foo);
589 >      
590 >      foo = strtok(NULL, " ,;\t\n");
591 >      if(foo == NULL){
592 >        sprintf( painCave.errMsg,
593 >                 "chi and integralOfChidt should appear by pair in %s\n", c_in_name );
594 >        return strdup( painCave.errMsg );
595 >      }
596 >      integralOfChidt = atof( foo );
597 >      
598 >      //push chi and integralOfChidt into SimInfo::properties which can be
599 >      //retrieved by integrator later
600 >      DoubleData* chiValue = new DoubleData();
601 >      chiValue->setID(CHIVALUE_ID);
602 >      chiValue->setData(chi);
603 >      entry_plug->addProperty(chiValue);
604 >      
605 >      DoubleData* integralOfChidtValue = new DoubleData();
606 >      integralOfChidtValue->setID(INTEGRALOFCHIDT_ID);
607 >      integralOfChidtValue->setData(integralOfChidt);
608 >      entry_plug->addProperty(integralOfChidtValue);
609 >      
610 >    }
611 >    else
612 >      return NULL;
613 >    
614 >    //get eta
615 >    foo = strtok(NULL, " ,;\t\n");
616 >    if(foo != NULL ){
617 >  
618 >      for(int i = 0 ; i < 9; i++){
619 >        
620 >        if(foo == NULL){
621 >          sprintf( painCave.errMsg,
622 >                   "error in reading eta[%d] from %s\n", i, c_in_name );
623 >          return strdup( painCave.errMsg );
624 >        }
625 >        eta[i] = atof( foo );
626 >        foo = strtok(NULL, " ,;\t\n");
627 >      }
628 >    }
629 >    else
630 >      return NULL;
631 >    
632 >    //push eta into SimInfo::properties which can be
633 >    //retrieved by integrator later
634 >    
635 >    DoubleArrayData* etaValue = new DoubleArrayData();
636 >    etaValue->setID(ETAVALUE_ID);
637 >    etaValue->setData(eta, 9);
638 >    entry_plug->addProperty(etaValue);
639    }
625 –  boxMat[6] = atof( foo );
626 –  
627 –  foo = strtok(NULL, " ,;\t");
628 –  if(foo == NULL){
629 –    sprintf( painCave.errMsg,
630 –             "error in reading Hz[1] from %s\n",
631 –             c_in_name );
632 –    return strdup( painCave.errMsg );
633 –  }
634 –  boxMat[7] = atof( foo );
635 –    
636 –  foo = strtok(NULL, " ,;\t");
637 –  if(foo == NULL){
638 –    sprintf( painCave.errMsg,
639 –             "error in reading Hz[2] from %s\n",
640 –             c_in_name );
641 –    return strdup( painCave.errMsg );
642 –  }
643 –  boxMat[8] = atof( foo );    
640  
641    return NULL;
642   }
643  
648 –
644   #ifdef IS_MPI
645  
646   // a couple of functions to let us escape the read loop
647  
648   void initFile::nodeZeroError( void ){
649    int j, myStatus;
650 <  
650 >
651    myStatus = 0;
652 <  for (j = 0; j < mpiSim->getNumberProcessors(); j++) {      
653 <    MPI_Send( &myStatus, 1, MPI_INT, j,
652 >  for (j = 0; j < mpiSim->getNumberProcessors(); j++) {
653 >    MPI_Send( &myStatus, 1, MPI_INT, j,
654                TAKE_THIS_TAG_INT, MPI_COMM_WORLD);
655 <  }  
661 <  
655 >  }
656  
657 +
658    MPI_Finalize();
659    exit (0);
660 <  
660 >
661   }
662  
663   void initFile::anonymousNodeDie( void ){

Diff Legend

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