--- trunk/OOPSE/libBASS/Globals.cpp	2003/04/07 21:42:19	474
+++ trunk/OOPSE/libBASS/Globals.cpp	2003/04/08 21:35:49	481
@@ -25,27 +25,28 @@
 #define G_RUNTIME     6
 
 //optional parameters
-#define G_INITIALCONFIG 7
-#define G_FINALCONFIG   8
-#define G_NMOL          9
-#define G_DENSITY       10
-#define G_BOX           11
-#define G_BOXX          12
-#define G_BOXY          13
-#define G_BOXZ          14
-#define G_SAMPLETIME    15
-#define G_STATUSTIME    16
-#define G_ECR           17
-#define G_DIELECTRIC    18
-#define G_TEMPSET       19
-#define G_THERMALTIME   20
-#define G_USEPBC        21
-#define G_MIXINGRULE    22
-#define G_EST           23
-#define G_USERF         24
+#define G_INITIALCONFIG   7
+#define G_FINALCONFIG     8
+#define G_NMOL            9
+#define G_DENSITY        10
+#define G_BOX            11
+#define G_BOXX           12
+#define G_BOXY           13
+#define G_BOXZ           14
+#define G_SAMPLETIME     15
+#define G_STATUSTIME     16
+#define G_ECR            17
+#define G_DIELECTRIC     18
+#define G_TEMPSET        19
+#define G_THERMALTIME    20
+#define G_USEPBC         21
+#define G_MIXINGRULE     22
+#define G_EST            23
+#define G_USERF          24
 #define G_TARGETPRESSURE 25
-#define G_QMASS         26
-#define G_TAURELAX      27
+#define G_QMASS          26
+#define G_TAUTHERMOSTAT  27
+#define G_TAUBAROSTAT    28
 
 
 Globals::Globals(){
@@ -85,7 +86,8 @@ Globals::Globals(){
   addHash( "useReactionField",                     G_USERF );
   addHash( "targetPressure",                       G_TARGETPRESSURE);
   addHash( "qMass",                                G_QMASS);
-  addHash( "tauRelax",                             G_TAURELAX);
+  addHash( "tauThermostat",                        G_TAUTHERMOSTAT);
+  addHash( "tauBarostat",                          G_TAUBAROSTAT);
   
   // define some default values 
 
@@ -118,7 +120,8 @@ Globals::Globals(){
   have_est =            0;
   have_target_pressure =0;
   have_q_mass =         0;
-  have_tau_relax =      0;
+  have_tau_thermostat = 0;
+  have_tau_barostat =   0;
  }
 
 Globals::~Globals(){
@@ -853,32 +856,61 @@ int Globals::globalAssign( event* the_event ){
       }
       break;
 
-    case G_TAURELAX:
+    case G_TAUTHERMOSTAT:
       switch( the_type ){
 	
       case STRING:
 	the_event->err_msg = 
-	  strdup( "Global error. tauRelax is not a double or int.\n" );
+	  strdup( "Global error. tauThermostat is not a double or int.\n" );
 	return 0;
 	break;
 	
       case DOUBLE:
-	tau_relax = the_event->evt.asmt.rhs.dval;
-	have_tau_relax = 1;
+	tau_thermostat = the_event->evt.asmt.rhs.dval;
+	have_tau_thermostat = 1;
 	return 1;
 	break;
 	
       case INT:
-	tau_relax = (double)the_event->evt.asmt.rhs.ival;
-	have_tau_relax = 1;
+	tau_thermostat = (double)the_event->evt.asmt.rhs.ival;
+	have_tau_thermostat = 1;
 	return 1;
 	break;
 	
       default:
 	the_event->err_msg = 
-	  strdup( "Global error. tauRelax unrecognized.\n" );
+	  strdup( "Global error. tauThermostat unrecognized.\n" );
+	return 0;
+	break;
+      }
+      break;
+
+    case G_TAUBAROSTAT:
+      switch( the_type ){
+	
+      case STRING:
+	the_event->err_msg = 
+	  strdup( "Global error. tauBarostat is not a double or int.\n" );
 	return 0;
 	break;
+	
+      case DOUBLE:
+	tau_barostat = the_event->evt.asmt.rhs.dval;
+	have_tau_barostat = 1;
+	return 1;
+	break;
+	
+      case INT:
+	tau_barostat = (double)the_event->evt.asmt.rhs.ival;
+	have_tau_barostat = 1;
+	return 1;
+	break;
+	
+      default:
+	the_event->err_msg = 
+	  strdup( "Global error. tauBarostat unrecognized.\n" );
+	return 0;
+	break;
       }
       break;