--- trunk/OOPSE/libBASS/Globals.cpp	2003/08/20 19:11:51	704
+++ trunk/OOPSE/libBASS/Globals.cpp	2003/11/06 22:01:37	855
@@ -1,6 +1,6 @@
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "Globals.hpp"
 #include "simError.h"
@@ -48,13 +48,21 @@
 #define G_TAUBAROSTAT    27
 #define G_ZCONSTIME      28
 #define G_NZCONSTRAINTS  29
-#define G_ZCONSTOL 30
+#define G_ZCONSTOL       30
 #define G_ZCONSFORCEPOLICY 31
-#define G_SEED                        32
+#define G_SEED           32
+#define G_RESETTIME      33
+#define G_USEINITTIME    34
+#define G_USEINIT_XS_STATE 35
+#define G_ORTHOBOXTOLERANCE 36
 
+
 Globals::Globals(){
   
   int i;
+
+  hash_size = 23;
+  hash_shift = 4;
   
   components = NULL;
   
@@ -78,6 +86,7 @@ Globals::Globals(){
   addHash( "boxY",          G_BOXY );
   addHash( "boxZ",          G_BOXZ );
   addHash( "sampleTime",    G_SAMPLETIME );
+  addHash( "resetTime",     G_RESETTIME );
   addHash( "statusTime",    G_STATUSTIME );
   addHash( "electrostaticCutoffRadius",            G_ECR );
   addHash( "dielectric",    G_DIELECTRIC );
@@ -92,9 +101,12 @@ Globals::Globals(){
   addHash( "tauBarostat",                          G_TAUBAROSTAT);
   addHash( "zconsTime",                            G_ZCONSTIME);
   addHash( "nZconstraints",                        G_NZCONSTRAINTS);
-  addHash( "zconsTol",                               G_ZCONSTOL);
-  addHash( "zconsForcePolicy",                    G_ZCONSFORCEPOLICY);
-  addHash( "seed",                                     G_SEED);
+  addHash( "zconsTol",                             G_ZCONSTOL);
+  addHash( "zconsForcePolicy",                     G_ZCONSFORCEPOLICY);
+  addHash( "seed",                                 G_SEED);
+  addHash( "useInitialTime",                       G_USEINITTIME);
+  addHash( "useInitialExtendedSystemState",        G_USEINIT_XS_STATE);
+  addHash( "orthoBoxTolerance",                    G_ORTHOBOXTOLERANCE);
 	
 	
   // define some default values 
@@ -102,7 +114,10 @@ Globals::Globals(){
   strcpy( mixingRule,"standard");  //default mixing rules to standard.
   usePBC = 1; //default  periodic boundry conditions to on
   useRF  = 0;
-  
+  useInitTime = 1; // default to pull init time from the init file
+  useInitXSstate = 1; // default to pull the extended state from the init file
+  orthoBoxTolerance = 1E-6;
+
   have_force_field =  0;
   have_n_components = 0;
   have_target_temp =  0;
@@ -121,6 +136,7 @@ Globals::Globals(){
   have_box_z =          0;
   have_sample_time =    0;
   have_status_time =    0;
+  have_reset_time =     0;
   have_thermal_time =   0;
   have_ecr =            0;
   have_dielectric =     0;
@@ -384,6 +400,35 @@ int Globals::globalAssign( event* the_event ){
       default:
 	the_event->err_msg = 
 	  strdup( "Global error. targetTemp unrecognized.\n" );
+	return 0;
+	break;
+      }
+      break;
+
+    case G_ORTHOBOXTOLERANCE:
+      switch( the_type ){
+	
+      case STRING:
+	the_event->err_msg = 
+	  strdup( "Global error. orthoBoxTolerance is not a double or int.\n" );
+	return 0;
+	break;
+	
+      case DOUBLE:
+	orthoBoxTolerance = the_event->evt.asmt.rhs.dval;
+	have_target_temp = 1;
+	return 1;
+	break;
+	
+      case INT:
+	orthoBoxTolerance = (double)the_event->evt.asmt.rhs.ival;
+	have_target_temp = 1;
+	return 1;
+	break;
+	
+      default:
+	the_event->err_msg = 
+	  strdup( "Global error.orthoBoxTolerance unrecognized.\n" );
 	return 0;
 	break;
       }
@@ -721,8 +766,37 @@ int Globals::globalAssign( event* the_event ){
       default:
 	the_event->err_msg = 
 	  strdup( "Global error. statusTime unrecognized.\n" );
+	return 0;
+	break;
+      }
+      break;
+
+    case G_RESETTIME:
+      switch( the_type ){
+	
+      case STRING:
+	the_event->err_msg = 
+	  strdup( "Global error. resetTime is not a double or int.\n" );
 	return 0;
 	break;
+	
+      case DOUBLE:
+	resetTime = the_event->evt.asmt.rhs.dval;
+	have_reset_time = 1;
+	return 1;
+	break;
+	
+      case INT:
+	resetTime = (double)the_event->evt.asmt.rhs.ival;
+	have_reset_time = 1;
+	return 1;
+	break;
+	
+      default:
+	the_event->err_msg = 
+	  strdup( "Global error. resetTime unrecognized.\n" );
+	return 0;
+	break;
       }
       break;
 
@@ -858,9 +932,47 @@ int Globals::globalAssign( event* the_event ){
       
       the_event->err_msg = 
 	strdup( "Global error. tempSet was not \"true\" or \"false\".\n" );
+      return 0;
+      break;
+
+    case G_USEINITTIME:
+      if( the_type == STRING ){
+	
+	if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) useInitTime = 1;
+	else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) useInitTime = 0;
+	else{
+	  the_event->err_msg = 
+	    strdup( "Global error. useInitTime was not \"true\" or \"false\".\n" );
+	  return 0;
+	}
+	return 1;
+      }
+      
+      the_event->err_msg = 
+	strdup( "Global error. useInitTime was not \"true\" or \"false\".\n" );
       return 0;
       break;
+
+    case G_USEINIT_XS_STATE:
+      if( the_type == STRING ){
+	
+	if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) 
+	  useInitXSstate = 1;
+	else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) 
+	  useInitXSstate = 0;
+	else{
+	  the_event->err_msg = 
+	    strdup( "Global error. useInitExtendedSystemState was not \"true\" or \"false\".\n" );
+	  return 0;
+	}
+	return 1;
+      }
       
+      the_event->err_msg = 
+	strdup( "Global error. useInitExtendedSystemState was not \"true\" or \"false\".\n" );
+      return 0;
+      break;
+      
     case G_USEPBC:
       if( the_type == STRING ){