--- trunk/OOPSE/libBASS/Globals.cpp 2003/07/29 16:32:06 655 +++ trunk/OOPSE/libBASS/Globals.cpp 2003/07/31 15:38:08 659 @@ -46,6 +46,8 @@ #define G_TARGETPRESSURE 25 #define G_TAUTHERMOSTAT 26 #define G_TAUBAROSTAT 27 +#define G_ZCONSTIME 28 +#define G_ZCONSMOLINDEX 29 Globals::Globals(){ @@ -86,7 +88,8 @@ Globals::Globals(){ addHash( "targetPressure", G_TARGETPRESSURE); addHash( "tauThermostat", G_TAUTHERMOSTAT); addHash( "tauBarostat", G_TAUBAROSTAT); - + addHash( "zconsTime", G_ZCONSTIME); + addHash( "zconsMolIndex", G_ZCONSMOLINDEX); // define some default values strcpy( mixingRule,"standard"); //default mixing rules to standard. @@ -120,6 +123,8 @@ Globals::Globals(){ have_q_mass = 0; have_tau_thermostat = 0; have_tau_barostat = 0; + have_zcons_time = 0; + have_index_of_all_zcons_mols = 0; } Globals::~Globals(){ @@ -882,7 +887,57 @@ int Globals::globalAssign( event* the_event ){ break; } break; - + + case G_ZCONSTIME: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Global error. zcons_time is not a double or int.\n" ); + return 0; + break; + + case DOUBLE: + zcons_time = the_event->evt.asmt.rhs.dval; + return 1; + break; + + case INT: + zcons_time = (double)the_event->evt.asmt.rhs.ival; + have_zcons_time = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Global error. zcons_time unrecognized.\n" ); + return 0; + break; + } + break; + + case G_ZCONSMOLINDEX: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Global error. zconsMolIndex is not a int.\n" ); + return 0; + break; + + case INT: + zconsMolIndex.push_back(the_event->evt.asmt.rhs.ival); + have_index_of_all_zcons_mols = 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Global error. zconsMolIndex unrecognized.\n" ); + return 0; + break; + } + break; // add more token cases here.