--- trunk/OOPSE-4/src/io/BASS_interface.cpp 2004/09/24 16:27:58 1492 +++ trunk/OOPSE-4/src/io/BASS_interface.cpp 2005/01/12 22:41:40 1930 @@ -1,10 +1,50 @@ - + /* + * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. + * + * The University of Notre Dame grants you ("Licensee") a + * non-exclusive, royalty free, license to use, modify and + * redistribute this software in source and binary code form, provided + * that the following conditions are met: + * + * 1. Acknowledgement of the program authors must be made in any + * publication of scientific results based in part on use of the + * program. An acceptable form of acknowledgement is citation of + * the article in which the program was described (Matthew + * A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher + * J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented + * Parallel Simulation Engine for Molecular Dynamics," + * J. Comput. Chem. 26, pp. 252-271 (2005)) + * + * 2. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 3. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * This software is provided "AS IS," without a warranty of any + * kind. All express or implied conditions, representations and + * warranties, including any implied warranty of merchantability, + * fitness for a particular purpose or non-infringement, are hereby + * excluded. The University of Notre Dame and its licensors shall not + * be liable for any damages suffered by licensee as a result of + * using, modifying or distributing the software or its + * derivatives. In no event will the University of Notre Dame or its + * licensors be liable for any lost revenue, profit or data, or for + * direct, indirect, special, consequential, incidental or punitive + * damages, however caused and regardless of the theory of liability, + * arising out of the use of or inability to use software, even if the + * University of Notre Dame has been advised of the possibility of + * such damages. + */ + #include #include #include #include "io/Globals.hpp" -#include "io/BASS_interface.h" +#include "io/parse_me.h" #include "utils/simError.h" #ifdef IS_MPI @@ -27,7 +67,7 @@ Globals *the_globals; void decr_block(); MakeStamps *the_stamps; -Globals *the_globals; +Globals *the_simParams; // Functions ********************************************** @@ -54,20 +94,20 @@ int event_handler( event* the_event ){ case ZCONSTRAINT: incr_block( ZCONSTRAINT_BLK ); - handled = the_globals->newZconstraint( the_event ); + handled = the_simParams->newZconstraint( the_event ); break; case COMPONENT: incr_block( COMPONENT_BLK ); - handled = the_globals->newComponent( the_event ); + handled = the_simParams->newComponent( the_event ); break; case ASSIGNMENT: - handled = the_globals->globalAssign( the_event ); + handled = the_simParams->globalAssign( the_event ); break; case BLOCK_END: - handled = the_globals->globalEnd( the_event ); + handled = the_simParams->globalEnd( the_event ); break; default: @@ -294,12 +334,12 @@ int event_handler( event* the_event ){ switch( the_event->event_type ){ case ASSIGNMENT: - handled = the_globals->zConstraintAssign( the_event ); + handled = the_simParams->zConstraintAssign( the_event ); break; case BLOCK_END: decr_block(); - handled = the_globals->zConstraintEnd( the_event ); + handled = the_simParams->zConstraintEnd( the_event ); break; default: @@ -314,12 +354,12 @@ int event_handler( event* the_event ){ switch( the_event->event_type ){ case ASSIGNMENT: - handled = the_globals->componentAssign( the_event ); + handled = the_simParams->componentAssign( the_event ); break; case BLOCK_END: decr_block(); - handled = the_globals->componentEnd(the_event ); + handled = the_simParams->componentEnd(the_event ); break; default: @@ -381,6 +421,6 @@ void set_interface_stamps( MakeStamps* ms, Globals* g void set_interface_stamps( MakeStamps* ms, Globals* g ){ the_stamps = ms; - the_globals = g; + the_simParams = g; }