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 394 by gezelter, Mon Mar 24 21:55:34 2003 UTC vs.
Revision 465 by gezelter, Mon Apr 7 14:30:12 2003 UTC

# Line 43 | Line 43
43   #define G_MIXINGRULE    22
44   #define G_EST           23
45   #define G_USERF         24
46 + #define G_TARGETPRESSURE 25
47  
48  
49   Globals::Globals(){
# Line 80 | Line 81 | Globals::Globals(){
81    addHash( "usePeriodicBoundaryConditions",        G_USEPBC);
82    addHash( "electrostaticSkinThickness",           G_EST );
83    addHash( "useReactionField",                     G_USERF );
84 +  addHash( "targetPressure",                       G_TARGETPRESSURE);
85    
86    // define some default values
87  
# Line 110 | Line 112 | Globals::Globals(){
112    have_dielectric =     0;
113    have_tempSet =        0;
114    have_est =            0;
115 +  have_target_pressure =0;
116   }
117  
118   Globals::~Globals(){
# Line 734 | Line 737 | int Globals::globalAssign( event* the_event ){
737      case G_TEMPSET:
738        if( the_type == STRING ){
739          
740 <        if( !strcmp( "true", the_event->evt.asmt.rhs.sval )) tempSet = 1;
741 <        else if( !strcmp( "false", the_event->evt.asmt.rhs.sval )) tempSet = 0;
740 >        if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) tempSet = 1;
741 >        else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) tempSet = 0;
742          else{
743            the_event->err_msg =
744              strdup( "Global error. tempSet was not \"true\" or \"false\".\n" );
# Line 753 | Line 756 | int Globals::globalAssign( event* the_event ){
756      case G_USEPBC:
757        if( the_type == STRING ){
758          
759 <        if( !strcmp( "true", the_event->evt.asmt.rhs.sval )) usePBC = 1;
760 <        else if( !strcmp( "false", the_event->evt.asmt.rhs.sval )) usePBC = 0;
759 >        if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) usePBC = 1;
760 >        else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) usePBC = 0;
761          else{
762            the_event->err_msg =
763              strdup( "Global error. usePeriodicBoundaryConditions was not \"true\" or \"false\".\n" );
# Line 771 | Line 774 | int Globals::globalAssign( event* the_event ){
774      case G_USERF:
775        if( the_type == STRING ){
776          
777 <        if( !strcmp( "true", the_event->evt.asmt.rhs.sval )) useRF = 1;
778 <        else if( !strcmp( "false", the_event->evt.asmt.rhs.sval )) useRF = 0;
777 >        if( !strcasecmp( "true", the_event->evt.asmt.rhs.sval )) useRF = 1;
778 >        else if( !strcasecmp( "false", the_event->evt.asmt.rhs.sval )) useRF = 0;
779          else{
780            the_event->err_msg =
781              strdup( "Global error. useReactionField was not \"true\" or \"false\".\n" );
# Line 786 | Line 789 | int Globals::globalAssign( event* the_event ){
789        return 0;
790        break;
791  
792 +    case G_TARGETPRESSURE:
793 +      switch( the_type ){
794 +        
795 +      case STRING:
796 +        the_event->err_msg =
797 +          strdup( "Global error. targetPressure is not a double or int.\n" );
798 +        return 0;
799 +        break;
800 +        
801 +      case DOUBLE:
802 +        target_pressure = the_event->evt.asmt.rhs.dval;
803 +        have_target_pressure = 1;
804 +        return 1;
805 +        break;
806 +        
807 +      case INT:
808 +        target_pressure = (double)the_event->evt.asmt.rhs.ival;
809 +        have_target_pressure = 1;
810 +        return 1;
811 +        break;
812 +        
813 +      default:
814 +        the_event->err_msg =
815 +          strdup( "Global error. targetPressure unrecognized.\n" );
816 +        return 0;
817 +        break;
818 +      }
819 +      break;
820  
821      }
822    }

Diff Legend

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