--- trunk/src/io/Globals.cpp 2005/01/12 22:41:40 246 +++ trunk/src/io/Globals.cpp 2005/09/16 16:07:39 603 @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. * * The University of Notre Dame grants you ("Licensee") a @@ -51,7 +51,7 @@ /* * The following section lists all of the defined tokens for the - * gloabal assignment statements. All are prefixed with a G_ to avoid + * global assignment statements. All are prefixed with a G_ to avoid * stepping on any previously defined enumerations. * * NOTE: tokens start at 1, 0 is a resrved token number @@ -83,35 +83,43 @@ #define G_THERMALTIME 21 #define G_USEPBC 22 #define G_MIXINGRULE 23 -#define G_USERF 24 -#define G_TARGETPRESSURE 25 -#define G_TAUTHERMOSTAT 26 -#define G_TAUBAROSTAT 27 -#define G_ZCONSTIME 28 -#define G_NZCONSTRAINTS 29 -#define G_ZCONSTOL 30 -#define G_ZCONSFORCEPOLICY 31 -#define G_SEED 32 -#define G_RESETTIME 33 -#define G_USEINITTIME 34 -#define G_USEINIT_XS_STATE 35 -#define G_ORTHOBOXTOLERANCE 36 -#define G_MINIMIZER 37 -#define G_MIN_MAXITER 38 -#define G_MIN_WRITEFRQ 39 -#define G_MIN_STEPSIZE 40 -#define G_MIN_FTOL 41 -#define G_MIN_GTOL 42 -#define G_MIN_LSTOL 43 -#define G_MIN_LSMAXITER 44 -#define G_ZCONSGAP 45 -#define G_ZCONSFIXTIME 46 -#define G_ZCONSUSINGSMD 47 -#define G_USE_SOLID_THERM_INT 48 -#define G_USE_LIQUID_THERM_INT 49 -#define G_THERM_INT_LAMBDA 50 -#define G_THERM_INT_K 51 -#define G_FORCEFIELD_VARIANT 52 +#define G_TARGETPRESSURE 24 +#define G_TAUTHERMOSTAT 25 +#define G_TAUBAROSTAT 26 +#define G_ZCONSTIME 27 +#define G_NZCONSTRAINTS 28 +#define G_ZCONSTOL 29 +#define G_ZCONSFORCEPOLICY 30 +#define G_SEED 31 +#define G_RESETTIME 32 +#define G_USEINITTIME 33 +#define G_USEINIT_XS_STATE 34 +#define G_ORTHOBOXTOLERANCE 35 +#define G_MINIMIZER 36 +#define G_MIN_MAXITER 37 +#define G_MIN_WRITEFRQ 38 +#define G_MIN_STEPSIZE 39 +#define G_MIN_FTOL 40 +#define G_MIN_GTOL 41 +#define G_MIN_LSTOL 42 +#define G_MIN_LSMAXITER 43 +#define G_ZCONSGAP 44 +#define G_ZCONSFIXTIME 45 +#define G_ZCONSUSINGSMD 46 +#define G_USE_SOLID_THERM_INT 47 +#define G_USE_LIQUID_THERM_INT 48 +#define G_THERM_INT_LAMBDA 49 +#define G_THERM_INT_K 50 +#define G_FORCEFIELD_VARIANT 51 +#define G_FORCEFIELD_FILENAME 52 +#define G_THERM_INT_DIST_SPRING 53 +#define G_THERM_INT_THETA_SPRING 54 +#define G_THERM_INT_OMEGA_SPRING 55 +#define G_SURFACETENSION 56 +#define G_PRINTPRESSURETENSOR 57 +#define G_ELECTRO_SUM_METHOD 58 +#define G_DAMPING_ALPHA 59 +#define G_CUTOFFPOLICY 60 Globals::Globals(){ initalize(); @@ -119,12 +127,6 @@ Globals::~Globals(){ Globals::~Globals(){ int i; - - for( i=0; imatch( lhs ); + + CommandMapType::iterator iter; + std::string keyword(lhs); + iter = command_table.find(keyword); + if (iter != command_table.end()) { + token = iter->second; + } if( token ){ @@ -1079,24 +1094,6 @@ int Globals::globalAssign( event* the_event ){ return 0; break; - case G_USERF: - if( the_type == STRING ){ - - if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) useRF = 1; - else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) useRF = 0; - else{ - the_event->err_msg = - strdup( "Error in parsing meta-data file!\n\tuseReactionField was not \"true\" or \"false\".\n" ); - return 0; - } - return 1; - } - - the_event->err_msg = - strdup( "Error in parsing meta-data file!\n\tuseReactionField was not \"true\" or \"false\".\n" ); - return 0; - break; - case G_TARGETPRESSURE: switch( the_type ){ @@ -1246,14 +1243,14 @@ int Globals::globalAssign( event* the_event ){ switch( the_type ){ case STRING: - strcpy(zconsForcePolicy, the_event->evt.asmt.rhs.sval); + strcpy(zconsForcePolicy, the_event->evt.asmt.rhs.sval); - for(int i = 0; zconsForcePolicy[i] != '\0'; i++) - { - zconsForcePolicy[i] = toupper(zconsForcePolicy[i]); - } + 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: @@ -1604,21 +1601,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; @@ -1722,7 +1719,8 @@ int Globals::globalAssign( event* the_event ){ return 0; break; } - break; + break; + case G_FORCEFIELD_VARIANT: if( the_type == STRING ){ strcpy( forcefield_variant, the_event->evt.asmt.rhs.sval ); @@ -1735,6 +1733,256 @@ int Globals::globalAssign( event* the_event ){ return 0; break; // add more token cases here. + + case G_FORCEFIELD_FILENAME: + if( the_type == STRING ){ + strcpy( forcefield_filename, the_event->evt.asmt.rhs.sval ); + have_forcefield_filename = 1; + return 1; + } + + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tforceFieldFileName was not a string assignment.\n" ); + return 0; + break; + + case G_THERM_INT_DIST_SPRING: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tthermIntDistSpringConst is not a double or int.\n" ); + return 1; + break; + + case DOUBLE: + therm_int_dist_spring = the_event->evt.asmt.rhs.dval; + have_dist_spring_constant = 1; + return 1; + break; + + case INT: + therm_int_dist_spring = (double)the_event->evt.asmt.rhs.dval; + have_dist_spring_constant = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tthermIntDistSpringConst unrecognized.\n" ); + return 0; + 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\tthermIntThetaSpringConst is not a double or int.\n" ); + return 1; + break; + + case DOUBLE: + therm_int_theta_spring = the_event->evt.asmt.rhs.dval; + have_theta_spring_constant = 1; + return 1; + break; + + case INT: + therm_int_theta_spring = (double)the_event->evt.asmt.rhs.dval; + have_theta_spring_constant = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tthermIntThetaSpringConst unrecognized.\n" ); + return 0; + break; + } + break; + + case G_THERM_INT_OMEGA_SPRING: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tthermIntOmegaSpringConst is not a double or int.\n" ); + return 1; + break; + + case DOUBLE: + therm_int_omega_spring = the_event->evt.asmt.rhs.dval; + have_omega_spring_constant = 1; + return 1; + break; + + case INT: + therm_int_omega_spring = (double)the_event->evt.asmt.rhs.dval; + have_omega_spring_constant = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tthermIntOmegaSpringConst unrecognized.\n" ); + return 0; + break; + } + break; + + case G_SURFACETENSION: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tsurfaceTension is not a double or int.\n" ); + return 1; + break; + + case DOUBLE: + surface_tension= the_event->evt.asmt.rhs.dval; + have_surface_tension = 1; + return 1; + break; + + case INT: + surface_tension = (double)the_event->evt.asmt.rhs.dval; + have_surface_tension = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tsurfaceTension unrecognized.\n" ); + return 0; + break; + } + break; + + case G_PRINTPRESSURETENSOR: + 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_ELECTRO_SUM_METHOD: + switch( the_type ){ + + case STRING: + strcpy(electrostaticSummationMethod, the_event->evt.asmt.rhs.sval); + + for(int i = 0; electrostaticSummationMethod[i] != '\0'; i++) + { + electrostaticSummationMethod[i] = toupper(electrostaticSummationMethod[i]); + } + have_electro_sum_method = 1; + return 1; + break; + + case DOUBLE: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\telectrostaticSummationMethod should be a string!\n" ); + return 0; + break; + + case INT: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\telectrostaticSummationMethod should be a string!\n" ); + return 0; + break; + + default: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\telectrostaticSummationMethod unrecognized.\n" ); + return 0; + break; + } + break; + + case G_DAMPING_ALPHA: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tdampingAlpha is not a double or int.\n" ); + return 1; + break; + + case DOUBLE: + dampingAlpha = the_event->evt.asmt.rhs.dval; + have_damping_alpha = 1; + return 1; + break; + + case INT: + dampingAlpha = (double)the_event->evt.asmt.rhs.dval; + have_damping_alpha = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tdampingAlpha unrecognized.\n" ); + return 0; + break; + } + break; + + case G_CUTOFFPOLICY: + switch( the_type ){ + + case STRING: + strcpy(cutoffPolicy, the_event->evt.asmt.rhs.sval); + + for(int i = 0; cutoffPolicy[i] != '\0'; i++) + { + cutoffPolicy[i] = toupper(cutoffPolicy[i]); + } + have_cutoff_policy = 1; + return 1; + break; + + case DOUBLE: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tcutoffPolicy should be a string!\n" ); + return 0; + break; + + case INT: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tcutoffPolicy should be a string!\n" ); + return 0; + break; + + default: + the_event->err_msg = + strdup( "Error in parsing meta-data file!\n\tcutoffPolicy unrecognized.\n" ); + return 0; + break; + } + break; + + + // add more token cases here. } } @@ -1825,46 +2073,3 @@ int Globals::globalEnd( event* the_event ){ return 1; } -int Globals::hash( char* text ){ - - register unsigned short int i = 0; // loop counter - int key = 0; // the hash key - - while( text[i] != '\0' ){ - - key = ( ( key << hash_shift ) + text[i] ) % hash_size; - - i++; - } - - if( key < 0 ){ - - // if the key is less than zero, we've had an overflow error - - sprintf( painCave.errMsg, - "There has been an overflow error in the Globals' hash key."); - painCave.isFatal = 1; - simError(); -#ifdef IS_MPI - if( painCave.isEventLoop ){ - if( worldRank == 0 ) mpiInterfaceExit(); - } -#endif //is_mpi - } - - return key; -} - -void Globals::addHash( char* text, int token ){ - - int key; - LinkedCommand* the_element; - - the_element = new LinkedCommand; - the_element->setValues( text, token ); - - key = hash( text ); - - the_element->setNext( command_table[key] ); - command_table[key] = the_element; -}