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

Comparing trunk/OOPSE/libBASS/MakeStamps.cpp (file contents):
Revision 957 by gezelter, Mon Jan 19 16:08:21 2004 UTC vs.
Revision 988 by gezelter, Tue Jan 27 19:37:48 2004 UTC

# Line 4 | Line 4
4  
5   #include "MakeStamps.hpp"
6   #include "MoleculeStamp.hpp"
7 + #include "RigidBodyStamp.hpp"
8   #include "simError.h"
9   #ifdef IS_MPI
10   #include "mpiBASS.h"
# Line 222 | Line 223 | int MakeStamps::newRigidBody( event* the_event ){
223    return 1;
224   }
225  
225 – int MakeStamps::rigidBodyPosition( event* the_event ){
226 –  
227 –  current_rigidbody->setPosition( the_event->evt.pos.x,
228 –                                  the_event->evt.pos.y,
229 –                                  the_event->evt.pos.z );
230 –  return 1;
231 – }
232 –
233 –
234 – int MakeStamps::rigidBodyOrientation( event* the_event ){
235 –  
236 –  current_rigidbody->setOrientation( the_event->evt.ornt.x,
237 –                                     the_event->evt.ornt.y,
238 –                                     the_event->evt.ornt.z );
239 –  return 1;
240 – }
241 –
226   int MakeStamps::rigidBodyAssign( event* the_event ){
227  
228    switch( the_event->evt.asmt.asmt_type ){
# Line 274 | Line 258 | int MakeStamps::rigidBodyAssign( event* the_event ){
258      break;
259    }
260    return 0;
261 + }
262 +
263 + int MakeStamps::rigidBodyMember( event* the_event ){
264 +
265 +  current_member = new MemberStamp;
266 +  
267 +  the_event->err_msg = current_rigidbody->addMember( current_member,
268 +                                                     the_event->evt.blk_index );
269 +  
270 +  if( the_event->err_msg != NULL ) return 0;
271 +  return 1;
272 +  
273   }
274  
275   int MakeStamps::rigidBodyEnd( event* the_event ){
# Line 290 | Line 286 | int MakeStamps::newAtom( event* the_event ){
286    
287    the_event->err_msg = current_mol->addAtom( current_atom,
288                                               the_event->evt.blk_index );
289 +  
290    if( the_event->err_msg != NULL ) return 0;
291    return 1;
292   }
# Line 398 | Line 395 | int MakeStamps::bondAssign( event* the_event ){
395    return 0;
396   }
397  
398 < int MakeStamps::bondMember( event* the_event ){
398 > int MakeStamps::bondMembers( event* the_event ){
399  
400 <  current_bond->members( the_event->evt.mbr.a,
401 <                         the_event->evt.mbr.b );
400 >  current_bond->members( the_event->evt.mbrs.a,
401 >                         the_event->evt.mbrs.b );
402    return 1;
403   }
404  
# Line 461 | Line 458 | int MakeStamps::bendAssign( event* the_event ){
458    return 0;
459   }
460  
461 < int MakeStamps::bendMember( event* the_event ){
461 > int MakeStamps::bendMembers( event* the_event ){
462  
463 <  current_bend->members( the_event->evt.mbr.a,
464 <                         the_event->evt.mbr.b,
465 <                         the_event->evt.mbr.c );
463 >  current_bend->members( the_event->evt.mbrs.a,
464 >                         the_event->evt.mbrs.b,
465 >                         the_event->evt.mbrs.c );
466    return 1;
467   }
468  
# Line 525 | Line 522 | int MakeStamps::torsionAssign( event* the_event ){
522    return 0;
523   }
524  
525 < int MakeStamps::torsionMember( event* the_event ){
525 > int MakeStamps::torsionMembers( event* the_event ){
526  
527 <  current_torsion->members( the_event->evt.mbr.a,
528 <                            the_event->evt.mbr.b,
529 <                            the_event->evt.mbr.c,
530 <                            the_event->evt.mbr.d );
527 >  current_torsion->members( the_event->evt.mbrs.a,
528 >                            the_event->evt.mbrs.b,
529 >                            the_event->evt.mbrs.c,
530 >                            the_event->evt.mbrs.d );
531    return 1;
532   }
533  
# Line 547 | Line 544 | int MakeStamps::torsionEnd( event* the_event ){
544    
545    return 1;
546   }
547 +
548 + int MakeStamps::newMember( event* the_event ){
549 +  
550 +  current_member = new MemberStamp;
551 +  
552 +  the_event->err_msg = current_rigidbody->addMember( current_member,
553 +                                                     the_event->evt.blk_index );
554 +  if( the_event->err_msg != NULL ) return 0;
555 +  
556 +  return 1;
557 + }
558 +
559 + int MakeStamps::memberAssign( event* the_event ){
560 +  
561 +  switch( the_event->evt.asmt.asmt_type ){
562 +    
563 +  case STRING:
564 +    current_member->assignString( the_event->evt.asmt.lhs,
565 +                                  the_event->evt.asmt.rhs.sval );
566 +    return 1;
567 +    break;
568 +    
569 +  case DOUBLE:
570 +    current_member->assignDouble( the_event->evt.asmt.lhs,
571 +                                  the_event->evt.asmt.rhs.dval );
572 +    return 1;
573 +    break;
574 +    
575 +  case INT:
576 +    current_member->assignInt( the_event->evt.asmt.lhs,
577 +                               the_event->evt.asmt.rhs.ival );
578 +    return 1;
579 +    break;
580 +    
581 +  default:
582 +    the_event->err_msg = strdup( "MakeStamp error. Invalid member"
583 +                                 " assignment type" );
584 +    return 0;
585 +    break;
586 +  }
587 +  return 0;
588 + }
589 +
590 + int MakeStamps::memberEnd( event* the_event ){
591 +  
592 +  the_event->err_msg = current_member->checkMe();
593 +  if( the_event->err_msg != NULL ) return 0;
594 +  
595 +  return 1;
596 + }

Diff Legend

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