--- trunk/OOPSE/libBASS/Globals.cpp 2004/03/16 19:22:56 1091 +++ trunk/OOPSE/libBASS/Globals.cpp 2004/03/17 14:22:59 1093 @@ -66,6 +66,7 @@ #define G_MIN_LSMAXITER 45 #define G_ZCONSGAP 46 #define G_ZCONSFIXTIME 47 +#define G_ZCONSUSINGSMD 48 Globals::Globals(){ @@ -128,6 +129,7 @@ Globals::Globals(){ addHash( "minLSMaxIter", G_MIN_LSMAXITER); addHash( "zconsGap", G_ZCONSGAP); addHash( "zconsFixtime", G_ZCONSFIXTIME); + addHash( "zconsUsingSMD", G_ZCONSUSINGSMD); strcpy( mixingRule,"standard"); //default mixing rules to standard. usePBC = 1; //default periodic boundry conditions to on @@ -168,6 +170,9 @@ Globals::Globals(){ have_n_zConstraints = 0; have_zConstraints = 0; have_zcons_tol = 0; + have_zcons_gap = 0; + have_zcons_fixtime = 0; + have_zcons_using_smd = 0; have_seed = 0; have_ljrcut = 0; @@ -1289,6 +1294,35 @@ int Globals::globalAssign( event* the_event ){ default: the_event->err_msg = strdup( "Global error. zcons_fixtime unrecognized.\n" ); + return 0; + break; + } + break; + + case G_ZCONSUSINGSMD: + switch( the_type ){ + + case STRING: + the_event->err_msg = + strdup( "Global error. zcons_fixtime is not an int.\n" ); + return 0; + break; + + case DOUBLE: + the_event->err_msg = + strdup( "Global error. zcons_fixtime is not an int.\n" ); + return 0; + break; + + case INT: + zcons_using_smd= the_event->evt.asmt.rhs.ival; + have_zcons_using_smd= 1; + return 1; + break; + + default: + the_event->err_msg = + strdup( "Global error. zcons_usingsmd unrecognized.\n" ); return 0; break; }