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 1181 by chrisfen, Thu May 20 20:27:26 2004 UTC vs.
Revision 1209 by chrisfen, Tue Jun 1 14:21:06 2004 UTC

# Line 66 | Line 66
66   #define G_ZCONSGAP          45
67   #define G_ZCONSFIXTIME      46
68   #define G_ZCONSUSINGSMD     47
69 < #define G_THERM_INT_LAMBDA  48
70 < #define G_THERM_INT_K       49
69 > #define G_USE_THERM_INT     48
70 > #define G_THERM_INT_LAMBDA  49
71 > #define G_THERM_INT_K       50
72  
73   Globals::Globals(){
74    
# Line 119 | Line 120 | Globals::Globals(){
120    addHash( "useInitialTime",                       G_USEINITTIME);
121    addHash( "useInitialExtendedSystemState",        G_USEINIT_XS_STATE);
122    addHash( "orthoBoxTolerance",                    G_ORTHOBOXTOLERANCE);
123 <  addHash( "minimizer", G_MINIMIZER);
124 <  addHash( "minMaxIter", G_MIN_MAXITER);
125 <  addHash( "minWriteFrq", G_MIN_WRITEFRQ);
126 <  addHash( "minStepSize", G_MIN_STEPSIZE);
127 <  addHash( "minFTol", G_MIN_FTOL);
128 <  addHash( "minGTol", G_MIN_GTOL);
129 <  addHash( "minLSTol", G_MIN_LSTOL);
130 <  addHash( "minLSMaxIter", G_MIN_LSMAXITER);
131 <  addHash( "zconsGap", G_ZCONSGAP);
132 <  addHash( "zconsFixtime", G_ZCONSFIXTIME);
133 <  addHash( "zconsUsingSMD", G_ZCONSUSINGSMD);
134 <  addHash( "thermodynamicIntegrationLambda", G_THERM_INT_LAMBDA);
135 <  addHash( "thermodynamicIntegrationK", G_THERM_INT_K);
123 >  addHash( "minimizer",                            G_MINIMIZER);
124 >  addHash( "minMaxIter",                           G_MIN_MAXITER);
125 >  addHash( "minWriteFrq",                          G_MIN_WRITEFRQ);
126 >  addHash( "minStepSize",                          G_MIN_STEPSIZE);
127 >  addHash( "minFTol",                              G_MIN_FTOL);
128 >  addHash( "minGTol",                              G_MIN_GTOL);
129 >  addHash( "minLSTol",                             G_MIN_LSTOL);
130 >  addHash( "minLSMaxIter",                         G_MIN_LSMAXITER);
131 >  addHash( "zconsGap",                             G_ZCONSGAP);
132 >  addHash( "zconsFixtime",                         G_ZCONSFIXTIME);
133 >  addHash( "zconsUsingSMD",                        G_ZCONSUSINGSMD);
134 >  addHash( "useSolidThermInt",                     G_USE_SOLID_THERM_INT);
135 >  addHash( "thermodynamicIntegrationLambda",       G_THERM_INT_LAMBDA);
136 >  addHash( "thermodynamicIntegrationK",            G_THERM_INT_K);
137  
138    strcpy( mixingRule,"standard");  //default mixing rules to standard.
139    usePBC = 1; //default  periodic boundry conditions to on
# Line 139 | Line 141 | Globals::Globals(){
141    useInitTime = 0; // default to pull init time from the init file
142    useInitXSstate = 0; // default to pull the extended state from the init file
143    orthoBoxTolerance = 1E-6;
144 +  useSolidThermInt = 0; // default solid-state thermodynamic integration to off
145  
146    have_force_field =  0;
147    have_n_components = 0;
# Line 184 | Line 187 | Globals::Globals(){
187    have_minimizer_gtol = 0;
188    have_minimizer_ls_tol = 0;
189    have_minimizer_ls_maxiteration = 0;
190 +  have_thermodynamic_integration_lambda = 0;
191 +  have_thermodynamic_integration_k = 0;
192  
193   }
194  
# Line 1572 | Line 1577 | int Globals::globalAssign( event* the_event ){
1577            strdup( "Global error. seed unrecognized.\n" );
1578          return 0;
1579          break;
1580 +      }
1581 +      break;
1582 +
1583 +    case G_USE_SOLID_THERM_INT:
1584 +      if( the_type == STRING ){
1585 +        
1586 +        if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) useSolidThermInt = 1;
1587 +        else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) useSolidThermInt = 0;
1588 +        else{
1589 +          the_event->err_msg =
1590 +            strdup( "Global error. useSolidThermInt was not \"true\" or \"false\".\n" );
1591 +          return 0;
1592 +        }
1593 +        return 1;
1594        }
1595 +      
1596 +      the_event->err_msg =
1597 +        strdup( "Global error. useSolidThermInt was not \"true\" or \"false\".\n" );
1598 +      return 0;
1599        break;
1600  
1601      case G_THERM_INT_LAMBDA:

Diff Legend

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