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 745 by mmeineke, Thu Sep 4 21:48:07 2003 UTC vs.
Revision 828 by gezelter, Tue Oct 28 16:03:06 2003 UTC

# Line 1 | Line 1
1 < #include <cstdlib>
2 < #include <cstdio>
3 < #include <cstring>
1 > #include <stdlib.h>
2 > #include <stdio.h>
3 > #include <string.h>
4  
5   #include "Globals.hpp"
6   #include "simError.h"
# Line 52 | Line 52
52   #define G_ZCONSFORCEPOLICY 31
53   #define G_SEED           32
54   #define G_RESETTIME      33
55 + #define G_USEINITTIME    34
56  
57   Globals::Globals(){
58    
59    int i;
60 +
61 +  hash_size = 23;
62 +  hash_shift = 4;
63    
64    components = NULL;
65    
# Line 97 | Line 101 | Globals::Globals(){
101    addHash( "zconsTol",                             G_ZCONSTOL);
102    addHash( "zconsForcePolicy",                     G_ZCONSFORCEPOLICY);
103    addHash( "seed",                                 G_SEED);
104 +  addHash( "useInitTime",                          G_USEINITTIME),
105          
106          
107    // define some default values
# Line 104 | Line 109 | Globals::Globals(){
109    strcpy( mixingRule,"standard");  //default mixing rules to standard.
110    usePBC = 1; //default  periodic boundry conditions to on
111    useRF  = 0;
112 +  useInitTime = 1; // default to pull init time from the init file
113    
114    have_force_field =  0;
115    have_n_components = 0;
# Line 890 | Line 896 | int Globals::globalAssign( event* the_event ){
896        
897        the_event->err_msg =
898          strdup( "Global error. tempSet was not \"true\" or \"false\".\n" );
899 +      return 0;
900 +      break;
901 +
902 +    case G_USEINITTIME:
903 +      if( the_type == STRING ){
904 +        
905 +        if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) useInitTime = 1;
906 +        else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) useInitTime = 0;
907 +        else{
908 +          the_event->err_msg =
909 +            strdup( "Global error. useInitTime was not \"true\" or \"false\".\n" );
910 +          return 0;
911 +        }
912 +        return 1;
913 +      }
914 +      
915 +      the_event->err_msg =
916 +        strdup( "Global error. useInitTime was not \"true\" or \"false\".\n" );
917        return 0;
918        break;
919        

Diff Legend

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