--- trunk/OOPSE/libBASS/BASS_interface.cpp 2004/01/27 20:34:11 993 +++ trunk/OOPSE/libBASS/BASS_interface.cpp 2004/05/11 04:21:52 1153 @@ -16,7 +16,7 @@ typedef enum { GLOBAL_BLK, MOLECULE_BLK, ATOM_BLK, BON typedef enum { GLOBAL_BLK, MOLECULE_BLK, ATOM_BLK, BOND_BLK, BEND_BLK, TORSION_BLK, COMPONENT_BLK, ZCONSTRAINT_BLK, - RIGIDBODY_BLK, MEMBER_BLK } block_type; + RIGIDBODY_BLK, CUTOFFGROUP_BLK } block_type; block_type current_block = GLOBAL_BLK; #define MAX_NEST 20 // the max number of nested blocks @@ -106,6 +106,11 @@ int event_handler( event* the_event ){ handled = the_stamps->newRigidBody( the_event ); break; + case CUTOFFGROUP: + incr_block( CUTOFFGROUP_BLK ); + handled = the_stamps->newCutoffGroup( the_event ); + break; + case ASSIGNMENT: handled = the_stamps->moleculeAssign( the_event ); break; @@ -131,9 +136,8 @@ int event_handler( event* the_event ){ handled = the_stamps->rigidBodyAssign( the_event ); break; - case MEMBER: - incr_block( MEMBER_BLK ); - handled = the_stamps->newMember( the_event ); + case MEMBERS: + handled = the_stamps->rigidBodyMembers( the_event ); break; case BLOCK_END: @@ -144,6 +148,30 @@ int event_handler( event* the_event ){ default: the_event->err_msg = strdup( "Not a valid RigidBody event\n" ); + return 0; + } + break; + + case CUTOFFGROUP_BLK: + + switch( the_event->event_type ){ + + case ASSIGNMENT: + handled = the_stamps->cutoffGroupAssign( the_event ); + break; + + case MEMBERS: + handled = the_stamps->cutoffGroupMembers( the_event ); + break; + + case BLOCK_END: + decr_block(); + handled = the_stamps->cutoffGroupEnd( the_event ); + break; + + default: + the_event->err_msg = + strdup( "Not a valid CutoffGroup event\n" ); return 0; } break; @@ -261,26 +289,6 @@ int event_handler( event* the_event ){ } break; - case MEMBER_BLK: - - switch( the_event->event_type ){ - - case ASSIGNMENT: - handled = the_stamps->memberAssign( the_event ); - break; - - case BLOCK_END: - decr_block(); - handled = the_stamps->memberEnd(the_event ); - break; - - default: - the_event->err_msg = - strdup( "not a valid member event\n" ); - return 0; - } - break; - case ZCONSTRAINT_BLK: switch( the_event->event_type ){