--- trunk/OOPSE/libBASS/Globals.hpp	2003/04/07 14:30:12	465
+++ trunk/OOPSE/libBASS/Globals.hpp	2003/07/31 15:38:08	659
@@ -2,12 +2,15 @@
 #define __GLOBALS_H__
 
 #include <cstdlib>
+#include <vector>
 
 #include "BASS_interface.h"
 #include "Component.hpp"
 #include "LinkedCommand.hpp"
 #include "MakeStamps.hpp"
 
+using namespace std;
+
 class Globals{
   
 public:
@@ -27,6 +30,9 @@ class Globals{ (public)
   int    getNComponents( void )     { return n_components; }
   double getTargetTemp( void )      { return target_temp; }
   double getTargetPressure( void )  { return target_pressure; }
+  double getQmass( void )           { return q_mass; }
+  double getTauThermostat( void )   { return tau_thermostat; }
+  double getTauBarostat( void )     { return tau_barostat; }
   char*  getEnsemble( void )        { return ensemble; }
   double getDt( void )              { return dt; }
   double getRunTime( void )         { return run_time; }
@@ -49,6 +55,8 @@ class Globals{ (public)
   int    getPBC( void )             { return usePBC;}
   int    getUseRF( void )           { return useRF;}
   char*  getMixingRule( void)       { return mixingRule;}
+  double getZConsTime(void)         { return zcons_time;}
+  vector<int> getIndexOfAllZConsMols(void){ return zconsMolIndex;}
   
   short int haveInitialConfig( void ) { return have_initial_config; }
   short int haveFinalConfig( void )   { return have_final_config; }
@@ -65,6 +73,13 @@ class Globals{ (public)
   short int haveEST( void )           { return have_est; }
   short int haveDielectric( void )    { return have_dielectric; }
   short int haveTempSet( void )       { return have_tempSet; }
+  short int haveTargetPressure( void ){ return have_target_pressure; }
+  short int haveQmass( void )         { return have_q_mass; }
+  short int haveTauThermostat( void ) { return have_tau_thermostat;}
+  short int haveTauBarostat( void )   { return have_tau_barostat;}
+  short int haveZConsTime(void)       { return have_zcons_time;}
+  short int haveIndexOfAllZConsMols() { return have_index_of_all_zcons_mols;}
+
   
   /* other accessors */
   Component** getComponents( void ) { return components; }
@@ -104,6 +119,11 @@ class Globals{ (public)
   int tempSet;
   int usePBC;
   int useRF;
+  double q_mass;
+  double tau_thermostat;
+  double tau_barostat;
+  double zcons_time;
+  vector<int> zconsMolIndex;
 
   //required arguments
   short int have_force_field, have_n_components, have_target_temp;
@@ -113,8 +133,9 @@ class Globals{ (public)
   short int have_initial_config, have_final_config, have_n_mol;
   short int have_density, have_box, have_box_x, have_box_y, have_box_z;
   short int have_sample_time, have_status_time, have_ecr, have_dielectric;
-  short int have_tempSet, have_thermal_time, have_est;
-  
+  short int have_tempSet, have_thermal_time, have_est, have_q_mass;
+  short int have_tau_thermostat, have_tau_barostat;
+  short int have_zcons_time, have_index_of_all_zcons_mols;   
 
 };