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 699 by tim, Fri Aug 15 19:24:13 2003 UTC vs.
Revision 745 by mmeineke, Thu Sep 4 21:48:07 2003 UTC

# Line 48 | Line 48
48   #define G_TAUBAROSTAT    27
49   #define G_ZCONSTIME      28
50   #define G_NZCONSTRAINTS  29
51 < #define G_ZCONSTOL 30
51 > #define G_ZCONSTOL       30
52   #define G_ZCONSFORCEPOLICY 31
53 + #define G_SEED           32
54 + #define G_RESETTIME      33
55  
56   Globals::Globals(){
57    
# Line 77 | Line 79 | Globals::Globals(){
79    addHash( "boxY",          G_BOXY );
80    addHash( "boxZ",          G_BOXZ );
81    addHash( "sampleTime",    G_SAMPLETIME );
82 +  addHash( "resetTime",     G_RESETTIME );
83    addHash( "statusTime",    G_STATUSTIME );
84    addHash( "electrostaticCutoffRadius",            G_ECR );
85    addHash( "dielectric",    G_DIELECTRIC );
# Line 91 | Line 94 | Globals::Globals(){
94    addHash( "tauBarostat",                          G_TAUBAROSTAT);
95    addHash( "zconsTime",                            G_ZCONSTIME);
96    addHash( "nZconstraints",                        G_NZCONSTRAINTS);
97 <  addHash( "zconsTol",                               G_ZCONSTOL);
98 <  addHash( "zconsForcePolicy",                    G_ZCONSFORCEPOLICY);
97 >  addHash( "zconsTol",                             G_ZCONSTOL);
98 >  addHash( "zconsForcePolicy",                     G_ZCONSFORCEPOLICY);
99 >  addHash( "seed",                                 G_SEED);
100          
101          
102    // define some default values
# Line 119 | Line 123 | Globals::Globals(){
123    have_box_z =          0;
124    have_sample_time =    0;
125    have_status_time =    0;
126 +  have_reset_time =     0;
127    have_thermal_time =   0;
128    have_ecr =            0;
129    have_dielectric =     0;
# Line 132 | Line 137 | Globals::Globals(){
137    have_n_zConstraints = 0;
138    have_zConstraints   = 0;
139    have_zcons_tol = 0;
140 +  have_seed = 0;
141  
142   }
143  
# Line 723 | Line 729 | int Globals::globalAssign( event* the_event ){
729        }
730        break;
731  
732 +    case G_RESETTIME:
733 +      switch( the_type ){
734 +        
735 +      case STRING:
736 +        the_event->err_msg =
737 +          strdup( "Global error. resetTime is not a double or int.\n" );
738 +        return 0;
739 +        break;
740 +        
741 +      case DOUBLE:
742 +        resetTime = the_event->evt.asmt.rhs.dval;
743 +        have_reset_time = 1;
744 +        return 1;
745 +        break;
746 +        
747 +      case INT:
748 +        resetTime = (double)the_event->evt.asmt.rhs.ival;
749 +        have_reset_time = 1;
750 +        return 1;
751 +        break;
752 +        
753 +      default:
754 +        the_event->err_msg =
755 +          strdup( "Global error. resetTime unrecognized.\n" );
756 +        return 0;
757 +        break;
758 +      }
759 +      break;
760 +
761      case G_THERMALTIME:
762        switch( the_type ){
763          
# Line 1073 | Line 1108 | int Globals::globalAssign( event* the_event ){
1108        }
1109        break;
1110        // add more token cases here.
1111 +    case G_SEED:
1112 +      switch( the_type ){
1113 +        
1114 +      case STRING:
1115 +   the_event->err_msg =
1116 +          strdup( "Global error. seed is not a string.\n" );
1117 +        return 0;
1118 +   return 0;
1119 +        break;
1120 +        
1121 +      case DOUBLE:
1122 +   have_seed = 1;
1123 +   seed = (int)the_event->evt.asmt.rhs.dval;
1124 +        return 1;
1125 +        break;
1126 +        
1127 +      case INT:
1128 +   have_seed = 1;
1129 +   seed =  the_event->evt.asmt.rhs.ival ;
1130 +        return 1;
1131 +        break;
1132 +        
1133 +      default:
1134 +        the_event->err_msg =
1135 +          strdup( "Global error. seed unrecognized.\n" );
1136 +        return 0;
1137 +        break;
1138 +      }
1139 +      break;
1140 +      // add more token cases here.
1141  
1142      }
1143    }

Diff Legend

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