# | Line 1 | Line 1 | |
---|---|---|
1 | < | |
1 | > | /* |
2 | > | * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. |
3 | > | * |
4 | > | * The University of Notre Dame grants you ("Licensee") a |
5 | > | * non-exclusive, royalty free, license to use, modify and |
6 | > | * redistribute this software in source and binary code form, provided |
7 | > | * that the following conditions are met: |
8 | > | * |
9 | > | * 1. Acknowledgement of the program authors must be made in any |
10 | > | * publication of scientific results based in part on use of the |
11 | > | * program. An acceptable form of acknowledgement is citation of |
12 | > | * the article in which the program was described (Matthew |
13 | > | * A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher |
14 | > | * J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented |
15 | > | * Parallel Simulation Engine for Molecular Dynamics," |
16 | > | * J. Comput. Chem. 26, pp. 252-271 (2005)) |
17 | > | * |
18 | > | * 2. Redistributions of source code must retain the above copyright |
19 | > | * notice, this list of conditions and the following disclaimer. |
20 | > | * |
21 | > | * 3. Redistributions in binary form must reproduce the above copyright |
22 | > | * notice, this list of conditions and the following disclaimer in the |
23 | > | * documentation and/or other materials provided with the |
24 | > | * distribution. |
25 | > | * |
26 | > | * This software is provided "AS IS," without a warranty of any |
27 | > | * kind. All express or implied conditions, representations and |
28 | > | * warranties, including any implied warranty of merchantability, |
29 | > | * fitness for a particular purpose or non-infringement, are hereby |
30 | > | * excluded. The University of Notre Dame and its licensors shall not |
31 | > | * be liable for any damages suffered by licensee as a result of |
32 | > | * using, modifying or distributing the software or its |
33 | > | * derivatives. In no event will the University of Notre Dame or its |
34 | > | * licensors be liable for any lost revenue, profit or data, or for |
35 | > | * direct, indirect, special, consequential, incidental or punitive |
36 | > | * damages, however caused and regardless of the theory of liability, |
37 | > | * arising out of the use of or inability to use software, even if the |
38 | > | * University of Notre Dame has been advised of the possibility of |
39 | > | * such damages. |
40 | > | */ |
41 | > | |
42 | #include <string.h> | |
43 | #include <stdio.h> | |
44 | #include <stdlib.h> | |
45 | ||
46 | #include "io/Globals.hpp" | |
47 | < | #include "io/BASS_interface.h" |
47 | > | #include "io/parse_me.h" |
48 | #include "utils/simError.h" | |
49 | ||
50 | #ifdef IS_MPI | |
# | Line 27 | Line 67 | MakeStamps *the_stamps; | |
67 | void decr_block(); | |
68 | ||
69 | MakeStamps *the_stamps; | |
70 | < | Globals *the_globals; |
70 | > | Globals *the_simParams; |
71 | ||
72 | // Functions ********************************************** | |
73 | ||
# | Line 54 | Line 94 | int event_handler( event* the_event ){ | |
94 | ||
95 | case ZCONSTRAINT: | |
96 | incr_block( ZCONSTRAINT_BLK ); | |
97 | < | handled = the_globals->newZconstraint( the_event ); |
97 | > | handled = the_simParams->newZconstraint( the_event ); |
98 | break; | |
99 | ||
100 | case COMPONENT: | |
101 | incr_block( COMPONENT_BLK ); | |
102 | < | handled = the_globals->newComponent( the_event ); |
102 | > | handled = the_simParams->newComponent( the_event ); |
103 | break; | |
104 | ||
105 | case ASSIGNMENT: | |
106 | < | handled = the_globals->globalAssign( the_event ); |
106 | > | handled = the_simParams->globalAssign( the_event ); |
107 | break; | |
108 | ||
109 | case BLOCK_END: | |
110 | < | handled = the_globals->globalEnd( the_event ); |
110 | > | handled = the_simParams->globalEnd( the_event ); |
111 | break; | |
112 | ||
113 | default: | |
# | Line 294 | Line 334 | int event_handler( event* the_event ){ | |
334 | switch( the_event->event_type ){ | |
335 | ||
336 | case ASSIGNMENT: | |
337 | < | handled = the_globals->zConstraintAssign( the_event ); |
337 | > | handled = the_simParams->zConstraintAssign( the_event ); |
338 | break; | |
339 | ||
340 | case BLOCK_END: | |
341 | decr_block(); | |
342 | < | handled = the_globals->zConstraintEnd( the_event ); |
342 | > | handled = the_simParams->zConstraintEnd( the_event ); |
343 | break; | |
344 | ||
345 | default: | |
# | Line 314 | Line 354 | int event_handler( event* the_event ){ | |
354 | switch( the_event->event_type ){ | |
355 | ||
356 | case ASSIGNMENT: | |
357 | < | handled = the_globals->componentAssign( the_event ); |
357 | > | handled = the_simParams->componentAssign( the_event ); |
358 | break; | |
359 | ||
360 | case BLOCK_END: | |
361 | decr_block(); | |
362 | < | handled = the_globals->componentEnd(the_event ); |
362 | > | handled = the_simParams->componentEnd(the_event ); |
363 | break; | |
364 | ||
365 | default: | |
# | Line 327 | Line 367 | int event_handler( event* the_event ){ | |
367 | strdup( "not a valid component event\n" ); | |
368 | return 0; | |
369 | } | |
370 | < | break; |
370 | > | break; |
371 | ||
372 | default: | |
373 | the_event->err_msg = | |
# | Line 381 | Line 421 | void set_interface_stamps( MakeStamps* ms, Globals* g | |
421 | void set_interface_stamps( MakeStamps* ms, Globals* g ){ | |
422 | ||
423 | the_stamps = ms; | |
424 | < | the_globals = g; |
424 | > | the_simParams = g; |
425 | ||
426 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |