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

Comparing branches/new_design/OOPSE-3.0/src/io/DumpReader.cpp (file contents):
Revision 1900 by tim, Wed Dec 15 16:13:35 2004 UTC vs.
Revision 1901 by tim, Tue Jan 4 22:18:36 2005 UTC

# Line 455 | Line 455 | void DumpReader::parseDumpLine(char *line, StuntDouble
455          
456      }
457  
458 <    pos[0] = tokenizer.nextTokenAsFloat();
459 <    pos[1] = tokenizer.nextTokenAsFloat();
460 <    pos[2] = tokenizer.nextTokenAsFloat();
458 >    pos[0] = tokenizer.nextTokenAsDouble();
459 >    pos[1] = tokenizer.nextTokenAsDouble();
460 >    pos[2] = tokenizer.nextTokenAsDouble();
461      integrableObject->setPos(pos);
462      
463 <    vel[0] = tokenizer.nextTokenAsFloat();
464 <    vel[1] = tokenizer.nextTokenAsFloat();
465 <    vel[2] = tokenizer.nextTokenAsFloat();
463 >    vel[0] = tokenizer.nextTokenAsDouble();
464 >    vel[1] = tokenizer.nextTokenAsDouble();
465 >    vel[2] = tokenizer.nextTokenAsDouble();
466      integrableObject->setVel(vel);
467  
468      if (integrableObject->isDirectional()) {
469          
470 <        q[0] = tokenizer.nextTokenAsFloat();
471 <        q[1] = tokenizer.nextTokenAsFloat();
472 <        q[2] = tokenizer.nextTokenAsFloat();
473 <        q[3] = tokenizer.nextTokenAsFloat();
470 >        q[0] = tokenizer.nextTokenAsDouble();
471 >        q[1] = tokenizer.nextTokenAsDouble();
472 >        q[2] = tokenizer.nextTokenAsDouble();
473 >        q[3] = tokenizer.nextTokenAsDouble();
474  
475          double qlen = q.length();
476          if (qlen < oopse::epsilon) { //check quaternion is not equal to 0
# Line 486 | Line 486 | void DumpReader::parseDumpLine(char *line, StuntDouble
486                
487          integrableObject->setQ(q);
488          
489 <        ji[0] = tokenizer.nextTokenAsFloat();
490 <        ji[1] = tokenizer.nextTokenAsFloat();
491 <        ji[2] = tokenizer.nextTokenAsFloat();
489 >        ji[0] = tokenizer.nextTokenAsDouble();
490 >        ji[1] = tokenizer.nextTokenAsDouble();
491 >        ji[2] = tokenizer.nextTokenAsDouble();
492          integrableObject->setJ(ji);
493      }
494  
# Line 516 | Line 516 | void DumpReader::parseCommentLine(char* line, Snapshot
516      }
517  
518      //read current time
519 <    currTime = tokenizer.nextTokenAsFloat();
519 >    currTime = tokenizer.nextTokenAsDouble();
520      s->setTime(currTime);
521      
522      //read h-matrix
523 <    hmat(0, 0) = tokenizer.nextTokenAsFloat();
524 <    hmat(0, 1) = tokenizer.nextTokenAsFloat();
525 <    hmat(0, 2) = tokenizer.nextTokenAsFloat();
526 <    hmat(1, 0) = tokenizer.nextTokenAsFloat();
527 <    hmat(1, 1) = tokenizer.nextTokenAsFloat();
528 <    hmat(1, 2) = tokenizer.nextTokenAsFloat();
529 <    hmat(2, 0) = tokenizer.nextTokenAsFloat();
530 <    hmat(2, 1) = tokenizer.nextTokenAsFloat();
531 <    hmat(2, 2) = tokenizer.nextTokenAsFloat();
523 >    hmat(0, 0) = tokenizer.nextTokenAsDouble();
524 >    hmat(0, 1) = tokenizer.nextTokenAsDouble();
525 >    hmat(0, 2) = tokenizer.nextTokenAsDouble();
526 >    hmat(1, 0) = tokenizer.nextTokenAsDouble();
527 >    hmat(1, 1) = tokenizer.nextTokenAsDouble();
528 >    hmat(1, 2) = tokenizer.nextTokenAsDouble();
529 >    hmat(2, 0) = tokenizer.nextTokenAsDouble();
530 >    hmat(2, 1) = tokenizer.nextTokenAsDouble();
531 >    hmat(2, 2) = tokenizer.nextTokenAsDouble();
532      s->setHmat(hmat);
533      
534      //read chi and integrablOfChidt, they should apprear in pair
535      if (tokenizer.countTokens() >= 2) {
536 <        chi = tokenizer.nextTokenAsFloat();
537 <        integralOfChiDt = tokenizer.nextTokenAsFloat();            
536 >        chi = tokenizer.nextTokenAsDouble();
537 >        integralOfChiDt = tokenizer.nextTokenAsDouble();            
538  
539          s->setChi(chi);
540          s->setIntegralOfChiDt(integralOfChiDt);
# Line 542 | Line 542 | void DumpReader::parseCommentLine(char* line, Snapshot
542      
543      //read eta (eta is 3x3 matrix)
544      if (tokenizer.countTokens() >= 9) {
545 <        eta(0, 0) = tokenizer.nextTokenAsFloat();
546 <        eta(0, 1) = tokenizer.nextTokenAsFloat();
547 <        eta(0, 2) = tokenizer.nextTokenAsFloat();
548 <        eta(1, 0) = tokenizer.nextTokenAsFloat();
549 <        eta(1, 1) = tokenizer.nextTokenAsFloat();
550 <        eta(1, 2) = tokenizer.nextTokenAsFloat();
551 <        eta(2, 0) = tokenizer.nextTokenAsFloat();
552 <        eta(2, 1) = tokenizer.nextTokenAsFloat();
553 <        eta(2, 2) = tokenizer.nextTokenAsFloat();      
545 >        eta(0, 0) = tokenizer.nextTokenAsDouble();
546 >        eta(0, 1) = tokenizer.nextTokenAsDouble();
547 >        eta(0, 2) = tokenizer.nextTokenAsDouble();
548 >        eta(1, 0) = tokenizer.nextTokenAsDouble();
549 >        eta(1, 1) = tokenizer.nextTokenAsDouble();
550 >        eta(1, 2) = tokenizer.nextTokenAsDouble();
551 >        eta(2, 0) = tokenizer.nextTokenAsDouble();
552 >        eta(2, 1) = tokenizer.nextTokenAsDouble();
553 >        eta(2, 2) = tokenizer.nextTokenAsDouble();      
554  
555          s->setEta(eta);
556      }

Diff Legend

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