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

Comparing trunk/OOPSE/libBASS/BASS_interface.cpp (file contents):
Revision 981 by gezelter, Mon Jan 26 18:52:42 2004 UTC vs.
Revision 1153 by gezelter, Tue May 11 04:21:52 2004 UTC

# Line 16 | Line 16 | typedef enum { GLOBAL_BLK, MOLECULE_BLK, ATOM_BLK, BON
16  
17   typedef enum { GLOBAL_BLK, MOLECULE_BLK, ATOM_BLK, BOND_BLK, BEND_BLK,
18                 TORSION_BLK, COMPONENT_BLK, ZCONSTRAINT_BLK,
19 <               RIGIDBODY_BLK } block_type;
19 >               RIGIDBODY_BLK, CUTOFFGROUP_BLK } block_type;
20  
21   block_type current_block = GLOBAL_BLK;
22   #define MAX_NEST 20 // the max number of nested blocks
# Line 56 | Line 56 | int event_handler( event* the_event ){
56        incr_block( ZCONSTRAINT_BLK );
57        handled = the_globals->newZconstraint( the_event );
58        break;
59 –
60 –    case RIGIDBODY:
61 –      incr_block( RIGIDBODY_BLK );
62 –      handled = the_stamps->newRigidBody( the_event );
63 –      break;
59        
60      case COMPONENT:
61        incr_block( COMPONENT_BLK );
# Line 88 | Line 83 | int event_handler( event* the_event ){
83        
84      case ATOM:
85        incr_block( ATOM_BLK );
86 <      handled = the_stamps->newAtomInMolecule( the_event );
86 >      handled = the_stamps->newAtom( the_event );
87        break;
88        
89      case BOND:
# Line 111 | Line 106 | int event_handler( event* the_event ){
106        handled = the_stamps->newRigidBody( the_event );
107        break;
108  
109 +    case CUTOFFGROUP:
110 +      incr_block( CUTOFFGROUP_BLK );
111 +      handled = the_stamps->newCutoffGroup( the_event );
112 +      break;
113 +
114      case ASSIGNMENT:
115        handled = the_stamps->moleculeAssign( the_event );
116        break;
# Line 132 | Line 132 | int event_handler( event* the_event ){
132      
133      switch( the_event->event_type ){
134        
135 –    case ATOM:
136 –      incr_block( ATOM_BLK );
137 –      handled = the_stamps->newAtomInRigidBody( the_event );
138 –      break;
139 –      
140 –    case POSITION:
141 –      handled = the_stamps->rigidBodyPosition( the_event );
142 –      break;
143 –      
144 –    case ORIENTATION:
145 –      handled = the_stamps->rigidBodyOrientation( the_event );
146 –      break;
147 –
135      case ASSIGNMENT:
136        handled = the_stamps->rigidBodyAssign( the_event );
137        break;
138  
139 +    case MEMBERS:
140 +      handled = the_stamps->rigidBodyMembers( the_event );
141 +      break;
142 +      
143      case BLOCK_END:
144        decr_block();
145        handled = the_stamps->rigidBodyEnd( the_event );
146        break;
147 <
147 >      
148      default:
149        the_event->err_msg =
150          strdup( "Not a valid RigidBody event\n" );
# Line 161 | Line 152 | int event_handler( event* the_event ){
152      }
153      break;
154  
155 +  case CUTOFFGROUP_BLK:
156 +    
157 +    switch( the_event->event_type ){
158 +      
159 +    case ASSIGNMENT:
160 +      handled = the_stamps->cutoffGroupAssign( the_event );
161 +      break;
162  
163 +    case MEMBERS:
164 +      handled = the_stamps->cutoffGroupMembers( the_event );
165 +      break;
166 +      
167 +    case BLOCK_END:
168 +      decr_block();
169 +      handled = the_stamps->cutoffGroupEnd( the_event );
170 +      break;
171 +      
172 +    default:
173 +      the_event->err_msg =
174 +        strdup( "Not a valid CutoffGroup event\n" );
175 +      return 0;
176 +    }
177 +    break;
178 +    
179 +
180    case ATOM_BLK:
181      
182      switch( the_event->event_type ){
# Line 198 | Line 213 | int event_handler( event* the_event ){
213        handled = the_stamps->bondAssign( the_event );
214        break;
215        
216 <    case MEMBER:
217 <      handled = the_stamps->bondMember( the_event );
216 >    case MEMBERS:
217 >      handled = the_stamps->bondMembers( the_event );
218        break;
219        
220      case CONSTRAINT:
# Line 226 | Line 241 | int event_handler( event* the_event ){
241        handled = the_stamps->bendAssign( the_event );
242        break;
243        
244 <    case MEMBER:
245 <      handled = the_stamps->bendMember( the_event );
244 >    case MEMBERS:
245 >      handled = the_stamps->bendMembers( the_event );
246        break;
247        
248      case CONSTRAINT:
# Line 254 | Line 269 | int event_handler( event* the_event ){
269        handled = the_stamps->torsionAssign( the_event );
270        break;
271        
272 <    case MEMBER:
273 <      handled = the_stamps->torsionMember( the_event );
272 >    case MEMBERS:
273 >      handled = the_stamps->torsionMembers( the_event );
274        break;
275        
276      case CONSTRAINT:

Diff Legend

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