--- trunk/src/io/Globals.cpp 2005/03/10 20:28:17 425 +++ trunk/src/io/Globals.cpp 2005/05/19 04:28:26 536 @@ -116,6 +116,7 @@ #define G_THERM_INT_DIST_SPRING 54 #define G_THERM_INT_THETA_SPRING 55 #define G_THERM_INT_OMEGA_SPRING 56 +#define G_TARGETSTRESS 57 Globals::Globals(){ initalize(); @@ -190,6 +191,7 @@ void Globals::initalize(){ command_table.insert(CommandMapType::value_type("thermIntDistSpringConst", G_THERM_INT_DIST_SPRING)); 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("targetStress", G_TARGETSTRESS)); strcpy( mixingRule,"standard"); //default mixing rules to standard. @@ -252,6 +254,7 @@ void Globals::initalize(){ have_dist_spring_constant = 0; have_theta_spring_constant = 0; have_omega_spring_constant = 0; + have_targetStress = 0; } int Globals::newComponent( event* the_event ){ @@ -1249,14 +1252,14 @@ int Globals::globalAssign( event* the_event ){ switch( the_type ){ case STRING: - strcpy(zconsForcePolicy, the_event->evt.asmt.rhs.sval); - - for(int i = 0; zconsForcePolicy[i] != '\0'; i++) - { - zconsForcePolicy[i] = toupper(zconsForcePolicy[i]); - } + strcpy(zconsForcePolicy, the_event->evt.asmt.rhs.sval); + + for(int i = 0; zconsForcePolicy[i] != '\0'; i++) + { + zconsForcePolicy[i] = toupper(zconsForcePolicy[i]); + } have_zcons_force_policy = 1; - return 1; + return 1; break; case DOUBLE: @@ -1607,21 +1610,21 @@ int Globals::globalAssign( event* the_event ){ switch( the_type ){ case STRING: - the_event->err_msg = + the_event->err_msg = strdup( "Error in parsing meta-data file!\n\tseed is not a string.\n" ); return 0; - return 0; + return 0; break; case DOUBLE: - have_seed = 1; - seed = (int)the_event->evt.asmt.rhs.dval; + have_seed = 1; + seed = (int)the_event->evt.asmt.rhs.dval; return 1; break; case INT: - have_seed = 1; - seed = the_event->evt.asmt.rhs.ival ; + have_seed = 1; + seed = the_event->evt.asmt.rhs.ival ; return 1; break; @@ -1810,7 +1813,7 @@ int Globals::globalAssign( event* the_event ){ } break; - case G_THERM_INT_OMEGA_SPRING: + case G_THERM_INT_OMEGA_SPRING: switch( the_type ){ case STRING: @@ -1838,6 +1841,38 @@ int Globals::globalAssign( event* the_event ){ break; } break; + + case G_THERM_INT_THETA_SPRING: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\ttargetStress is not a double or int.\n" ); + return 1; + break; + + case DOUBLE: + target_stress= the_event->evt.asmt.rhs.dval; + have_targetstress = 1; + return 1; + break; + + case INT: + target_stress = (double)the_event->evt.asmt.rhs.dval; + have_targetstress = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tttargetStress unrecognized.\n" ); + return 0; + break; + } + break; + + + // add more token cases here. } }