--- trunk/OOPSE/libBASS/Globals.cpp 2003/08/12 19:56:49 689 +++ trunk/OOPSE/libBASS/Globals.cpp 2004/01/19 16:08:21 957 @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #include "Globals.hpp" #include "simError.h" @@ -17,42 +17,53 @@ */ //required parameters -#define G_FORCEFIELD 1 -#define G_NCOMPONENTS 2 -#define G_TARGETTEMP 3 -#define G_ENSEMBLE 4 -#define G_DT 5 -#define G_RUNTIME 6 +#define G_FORCEFIELD 1 +#define G_NCOMPONENTS 2 +#define G_TARGETTEMP 3 +#define G_ENSEMBLE 4 +#define G_DT 5 +#define G_RUNTIME 6 //optional parameters -#define G_INITIALCONFIG 7 -#define G_FINALCONFIG 8 -#define G_NMOL 9 -#define G_DENSITY 10 -#define G_BOX 11 -#define G_BOXX 12 -#define G_BOXY 13 -#define G_BOXZ 14 -#define G_SAMPLETIME 15 -#define G_STATUSTIME 16 -#define G_ECR 17 -#define G_DIELECTRIC 18 -#define G_TEMPSET 19 -#define G_THERMALTIME 20 -#define G_USEPBC 21 -#define G_MIXINGRULE 22 -#define G_EST 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_INITIALCONFIG 7 +#define G_FINALCONFIG 8 +#define G_NMOL 9 +#define G_DENSITY 10 +#define G_BOX 11 +#define G_BOXX 12 +#define G_BOXY 13 +#define G_BOXZ 14 +#define G_SAMPLETIME 15 +#define G_STATUSTIME 16 +#define G_ECR 17 +#define G_DIELECTRIC 18 +#define G_TEMPSET 19 +#define G_THERMALTIME 20 +#define G_USEPBC 21 +#define G_MIXINGRULE 22 +#define G_EST 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_LJRCUT 37 + Globals::Globals(){ int i; + + hash_size = 23; + hash_shift = 4; components = NULL; @@ -76,6 +87,7 @@ Globals::Globals(){ addHash( "boxY", G_BOXY ); addHash( "boxZ", G_BOXZ ); addHash( "sampleTime", G_SAMPLETIME ); + addHash( "resetTime", G_RESETTIME ); addHash( "statusTime", G_STATUSTIME ); addHash( "electrostaticCutoffRadius", G_ECR ); addHash( "dielectric", G_DIELECTRIC ); @@ -90,14 +102,24 @@ Globals::Globals(){ addHash( "tauBarostat", G_TAUBAROSTAT); addHash( "zconsTime", G_ZCONSTIME); addHash( "nZconstraints", G_NZCONSTRAINTS); - addHash( "zconsTol", G_ZCONSTOL); + addHash( "zconsTol", G_ZCONSTOL); + addHash( "zconsForcePolicy", G_ZCONSFORCEPOLICY); + addHash( "seed", G_SEED); + addHash( "useInitialTime", G_USEINITTIME); + addHash( "useInitialExtendedSystemState", G_USEINIT_XS_STATE); + addHash( "orthoBoxTolerance", G_ORTHOBOXTOLERANCE); + addHash( "LJrcut", G_LJRCUT); + // define some default values 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 + useInitXSstate = 1; // default to pull the extended state from the init file + orthoBoxTolerance = 1E-6; + have_force_field = 0; have_n_components = 0; have_target_temp = 0; @@ -116,6 +138,7 @@ Globals::Globals(){ have_box_z = 0; have_sample_time = 0; have_status_time = 0; + have_reset_time = 0; have_thermal_time = 0; have_ecr = 0; have_dielectric = 0; @@ -129,10 +152,9 @@ Globals::Globals(){ have_n_zConstraints = 0; have_zConstraints = 0; have_zcons_tol = 0; - + have_seed = 0; + have_ljrcut = 0; - strcpy( initial_config, "./fooBar" ); - } Globals::~Globals(){ @@ -381,6 +403,35 @@ int Globals::globalAssign( event* the_event ){ default: the_event->err_msg = strdup( "Global error. targetTemp unrecognized.\n" ); + return 0; + break; + } + break; + + case G_ORTHOBOXTOLERANCE: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Global error. orthoBoxTolerance is not a double or int.\n" ); + return 0; + break; + + case DOUBLE: + orthoBoxTolerance = the_event->evt.asmt.rhs.dval; + have_target_temp = 1; + return 1; + break; + + case INT: + orthoBoxTolerance = (double)the_event->evt.asmt.rhs.ival; + have_target_temp = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Global error.orthoBoxTolerance unrecognized.\n" ); return 0; break; } @@ -723,6 +774,35 @@ int Globals::globalAssign( event* the_event ){ } break; + case G_RESETTIME: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Global error. resetTime is not a double or int.\n" ); + return 0; + break; + + case DOUBLE: + resetTime = the_event->evt.asmt.rhs.dval; + have_reset_time = 1; + return 1; + break; + + case INT: + resetTime = (double)the_event->evt.asmt.rhs.ival; + have_reset_time = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Global error. resetTime unrecognized.\n" ); + return 0; + break; + } + break; + case G_THERMALTIME: switch( the_type ){ @@ -751,6 +831,35 @@ int Globals::globalAssign( event* the_event ){ break; } break; + + case G_LJRCUT: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Global error. LJrcut is not a double or int.\n" ); + return 0; + break; + + case DOUBLE: + LJrcut = the_event->evt.asmt.rhs.dval; + have_ljrcut = 1; + return 1; + break; + + case INT: + LJrcut = (double)the_event->evt.asmt.rhs.ival; + have_ljrcut = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Global error. LJrcut unrecognized.\n" ); + return 0; + break; + } + break; case G_ECR: switch( the_type ){ @@ -855,6 +964,44 @@ int Globals::globalAssign( event* the_event ){ the_event->err_msg = 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_USEINIT_XS_STATE: + if( the_type == STRING ){ + + if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) + useInitXSstate = 1; + else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) + useInitXSstate = 0; + else{ + the_event->err_msg = + strdup( "Global error. useInitExtendedSystemState was not \"true\" or \"false\".\n" ); + return 0; + } + return 1; + } + + the_event->err_msg = + strdup( "Global error. useInitExtendedSystemState was not \"true\" or \"false\".\n" ); return 0; break; @@ -1039,8 +1186,70 @@ int Globals::globalAssign( event* the_event ){ } break; + case G_ZCONSFORCEPOLICY: + 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]); + } + have_zcons_force_policy = 1; + return 1; + break; + + case DOUBLE: + the_event->err_msg = + strdup( "Global error. zconsForcePolicy is not a double or int.\n" ); + return 0; + break; + + case INT: + the_event->err_msg = + strdup( "Global error. zconsForcePolicy is not a double or int.\n" ); + return 0; + break; + + default: + the_event->err_msg = + strdup( "Global error. zconsForcePolicy unrecognized.\n" ); + return 0; + break; + } + break; // add more token cases here. + case G_SEED: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Global error. seed is not a string.\n" ); + return 0; + return 0; + break; + + case DOUBLE: + 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 ; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Global error. seed unrecognized.\n" ); + return 0; + break; + } + break; + // add more token cases here. } }