--- trunk/OOPSE/libBASS/Globals.cpp 2003/09/05 21:28:52 747 +++ trunk/OOPSE/libBASS/Globals.cpp 2003/10/21 19:33:19 811 @@ -52,6 +52,7 @@ #define G_ZCONSFORCEPOLICY 31 #define G_SEED 32 #define G_RESETTIME 33 +#define G_USEINITTIME 34 Globals::Globals(){ @@ -100,6 +101,7 @@ Globals::Globals(){ addHash( "zconsTol", G_ZCONSTOL); addHash( "zconsForcePolicy", G_ZCONSFORCEPOLICY); addHash( "seed", G_SEED); + addHash( "useInitTime", G_USEINITTIME), // define some default values @@ -107,6 +109,7 @@ Globals::Globals(){ strcpy( mixingRule,"standard"); //default mixing rules to standard. usePBC = 1; //default periodic boundry conditions to on useRF = 0; + useInitTime = 1; // default to pull init time from the init file have_force_field = 0; have_n_components = 0; @@ -895,6 +898,24 @@ int Globals::globalAssign( event* the_event ){ strdup( "Global error. tempSet was not \"true\" or \"false\".\n" ); return 0; break; + + case G_USEINITTIME: + if( the_type == STRING ){ + + if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) useInitTime = 1; + else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) useInitTime = 0; + else{ + the_event->err_msg = + strdup( "Global error. useInitTime was not \"true\" or \"false\".\n" ); + return 0; + } + return 1; + } + + the_event->err_msg = + strdup( "Global error. useInitTime was not \"true\" or \"false\".\n" ); + return 0; + break; case G_USEPBC: if( the_type == STRING ){