ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libBASS/Globals.cpp
(Generate patch)

Comparing trunk/OOPSE/libBASS/Globals.cpp (file contents):
Revision 1091 by tim, Tue Mar 16 19:22:56 2004 UTC vs.
Revision 1093 by tim, Wed Mar 17 14:22:59 2004 UTC

# Line 66 | Line 66
66   #define G_MIN_LSMAXITER 45
67   #define G_ZCONSGAP 46
68   #define G_ZCONSFIXTIME 47
69 + #define G_ZCONSUSINGSMD 48
70  
71   Globals::Globals(){
72    
# Line 128 | Line 129 | Globals::Globals(){
129    addHash( "minLSMaxIter", G_MIN_LSMAXITER);
130    addHash( "zconsGap", G_ZCONSGAP);
131    addHash( "zconsFixtime", G_ZCONSFIXTIME);
132 +    addHash( "zconsUsingSMD", G_ZCONSUSINGSMD);
133  
134    strcpy( mixingRule,"standard");  //default mixing rules to standard.
135    usePBC = 1; //default  periodic boundry conditions to on
# Line 168 | Line 170 | Globals::Globals(){
170    have_n_zConstraints = 0;
171    have_zConstraints   = 0;
172    have_zcons_tol = 0;
173 +  have_zcons_gap = 0;
174 +  have_zcons_fixtime = 0;
175 +  have_zcons_using_smd = 0;  
176    have_seed = 0;
177    have_ljrcut = 0;
178  
# Line 1289 | Line 1294 | int Globals::globalAssign( event* the_event ){
1294        default:
1295          the_event->err_msg =
1296            strdup( "Global error. zcons_fixtime unrecognized.\n" );
1297 +        return 0;
1298 +        break;
1299 +      }
1300 +      break;
1301 +
1302 +    case G_ZCONSUSINGSMD:
1303 +      switch( the_type ){
1304 +  
1305 +      case STRING:
1306 +        the_event->err_msg =
1307 +          strdup( "Global error. zcons_fixtime is not an  int.\n" );
1308 +        return 0;
1309 +        break;
1310 +  
1311 +      case DOUBLE:
1312 +        the_event->err_msg =
1313 +          strdup( "Global error. zcons_fixtime is not an  int.\n" );
1314 +        return 0;
1315 +        break;
1316 +  
1317 +      case INT:
1318 +        zcons_using_smd= the_event->evt.asmt.rhs.ival;
1319 +        have_zcons_using_smd= 1;
1320 +        return 1;
1321 +        break;
1322 +  
1323 +      default:
1324 +        the_event->err_msg =
1325 +          strdup( "Global error. zcons_usingsmd unrecognized.\n" );
1326          return 0;
1327          break;
1328        }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines