--- trunk/src/io/Globals.cpp 2005/05/20 16:01:38 539 +++ trunk/src/io/Globals.cpp 2005/08/30 18:23:50 580 @@ -117,6 +117,9 @@ #define G_THERM_INT_THETA_SPRING 55 #define G_THERM_INT_OMEGA_SPRING 56 #define G_SURFACETENSION 57 +#define G_PRINTPREESURETENSOR 58 +#define G_USE_UNDAMPED_WOLF 59 +#define G_USE_DAMPED_WOLF 60 Globals::Globals(){ initalize(); @@ -192,7 +195,9 @@ void Globals::initalize(){ command_table.insert(CommandMapType::value_type("thermIntThetaSpringConst", G_THERM_INT_THETA_SPRING)); command_table.insert(CommandMapType::value_type("thermIntOmegaSpringConst", G_THERM_INT_OMEGA_SPRING)); command_table.insert(CommandMapType::value_type("surfaceTension", G_SURFACETENSION)); - + command_table.insert(CommandMapType::value_type("printPressureTensor", G_PRINTPREESURETENSOR)); + command_table.insert(CommandMapType::value_type("useUndampedWolf", G_USE_UNDAMPED_WOLF)); + command_table.insert(CommandMapType::value_type("useDampedWolf", G_USE_DAMPED_WOLF)); strcpy( mixingRule,"standard"); //default mixing rules to standard. usePBC = 1; //default periodic boundry conditions to on @@ -255,6 +260,7 @@ void Globals::initalize(){ have_theta_spring_constant = 0; have_omega_spring_constant = 0; have_surface_tension = 0; + have_print_pressure_tensor = 0; } int Globals::newComponent( event* the_event ){ @@ -1870,9 +1876,66 @@ int Globals::globalAssign( event* the_event ){ break; } break; + + case G_PRINTPREESURETENSOR: + if( the_type == STRING ){ + if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) { + have_print_pressure_tensor= 1; + print_pressure_tensor = 1; + } else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) { + have_print_pressure_tensor= 1; + print_pressure_tensor = 0; + } else{ + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tprintPressureTensor was not \"true\" or \"false\".\n" ); + return 0; + } + return 1; + } + + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tprintPressureTensor was not \"true\" or \"false\".\n" ); + return 0; + break; + case G_USE_UNDAMPED_WOLF: + if( the_type == STRING ){ + + if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) useUndampedWolf = 1; + else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) useUndampedWolf = 0; + else{ + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tuseUndampedWolf was not \"true\" or \"false\".\n" ); + return 0; + } + return 1; + } + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tuseUndampedWolf was not \"true\" or \"false\".\n" ); + return 0; + break; + + case G_USE_DAMPED_WOLF: + if( the_type == STRING ){ + + if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) useDampedWolf = 1; + else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) useDampedWolf = 0; + else{ + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tuseDampedWolf was not \"true\" or \"false\".\n" ); + return 0; + } + return 1; + } + + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tuseDampedWolf was not \"true\" or \"false\".\n" ); + return 0; + break; + + // add more token cases here. } }