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 1066 by tim, Tue Feb 24 16:36:33 2004 UTC vs.
Revision 1091 by tim, Tue Mar 16 19:22:56 2004 UTC

# Line 64 | Line 64
64   #define G_MIN_GTOL 43
65   #define G_MIN_LSTOL 44
66   #define G_MIN_LSMAXITER 45
67 + #define G_ZCONSGAP 46
68 + #define G_ZCONSFIXTIME 47
69  
68 –
70   Globals::Globals(){
71    
72    int i;
# Line 125 | Line 126 | Globals::Globals(){
126    addHash( "minGTol", G_MIN_GTOL);
127    addHash( "minLSTol", G_MIN_LSTOL);
128    addHash( "minLSMaxIter", G_MIN_LSMAXITER);
129 <  
129 >  addHash( "zconsGap", G_ZCONSGAP);
130 >  addHash( "zconsFixtime", G_ZCONSFIXTIME);
131  
132    strcpy( mixingRule,"standard");  //default mixing rules to standard.
133    usePBC = 1; //default  periodic boundry conditions to on
# Line 1231 | Line 1233 | int Globals::globalAssign( event* the_event ){
1233            strdup( "Global error. zconsForcePolicy unrecognized.\n" );
1234          return 0;
1235          break;
1236 +      }
1237 +      break;
1238 +      
1239 +    case G_ZCONSGAP:
1240 +      switch( the_type ){
1241 +  
1242 +      case STRING:
1243 +        the_event->err_msg =
1244 +          strdup( "Global error. zcons_gap is not a double or int.\n" );
1245 +        return 0;
1246 +        break;
1247 +  
1248 +      case DOUBLE:
1249 +        zcons_gap = the_event->evt.asmt.rhs.dval;
1250 +        have_zcons_gap= 1;
1251 +        return 1;
1252 +        break;
1253 +  
1254 +      case INT:
1255 +        zcons_gap= (double)the_event->evt.asmt.rhs.ival;
1256 +        have_zcons_gap= 1;
1257 +        return 1;
1258 +        break;
1259 +  
1260 +      default:
1261 +        the_event->err_msg =
1262 +          strdup( "Global error. zcons_gap unrecognized.\n" );
1263 +        return 0;
1264 +        break;
1265        }
1266        break;
1267  
1268 +    case G_ZCONSFIXTIME:
1269 +      switch( the_type ){
1270 +  
1271 +      case STRING:
1272 +        the_event->err_msg =
1273 +          strdup( "Global error. zcons_fixtime is not a double or int.\n" );
1274 +        return 0;
1275 +        break;
1276 +  
1277 +      case DOUBLE:
1278 +        zcons_fixtime= the_event->evt.asmt.rhs.dval;
1279 +        have_zcons_fixtime= 1;
1280 +        return 1;
1281 +        break;
1282 +  
1283 +      case INT:
1284 +        zcons_fixtime= (double)the_event->evt.asmt.rhs.ival;
1285 +        have_zcons_fixtime= 1;
1286 +        return 1;
1287 +        break;
1288 +  
1289 +      default:
1290 +        the_event->err_msg =
1291 +          strdup( "Global error. zcons_fixtime unrecognized.\n" );
1292 +        return 0;
1293 +        break;
1294 +      }
1295 +      break;
1296 +      
1297      case G_MINIMIZER:
1298        switch( the_type ){
1299  

Diff Legend

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