ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/io/Globals.cpp
(Generate patch)

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 425 by tim, Thu Mar 10 20:28:17 2005 UTC vs.
Revision 539 by tim, Fri May 20 16:01:38 2005 UTC

# Line 116 | Line 116
116   #define G_THERM_INT_DIST_SPRING  54
117   #define G_THERM_INT_THETA_SPRING 55
118   #define G_THERM_INT_OMEGA_SPRING 56
119 + #define G_SURFACETENSION 57
120  
121   Globals::Globals(){
122    initalize();
# Line 190 | Line 191 | void Globals::initalize(){
191    command_table.insert(CommandMapType::value_type("thermIntDistSpringConst", G_THERM_INT_DIST_SPRING));
192    command_table.insert(CommandMapType::value_type("thermIntThetaSpringConst", G_THERM_INT_THETA_SPRING));
193    command_table.insert(CommandMapType::value_type("thermIntOmegaSpringConst", G_THERM_INT_OMEGA_SPRING));
194 +  command_table.insert(CommandMapType::value_type("surfaceTension", G_SURFACETENSION));
195  
196  
197    strcpy( mixingRule,"standard");  //default mixing rules to standard.
# Line 252 | Line 254 | void Globals::initalize(){
254    have_dist_spring_constant =  0;
255    have_theta_spring_constant = 0;
256    have_omega_spring_constant = 0;
257 +  have_surface_tension = 0;
258   }
259  
260   int Globals::newComponent( event* the_event ){
# Line 1249 | Line 1252 | int Globals::globalAssign( event* the_event ){
1252        switch( the_type ){
1253          
1254        case STRING:
1255 <   strcpy(zconsForcePolicy, the_event->evt.asmt.rhs.sval);
1256 <
1257 <   for(int i = 0; zconsForcePolicy[i] != '\0'; i++)
1258 <        {
1259 <      zconsForcePolicy[i] = toupper(zconsForcePolicy[i]);
1260 <   }
1255 >        strcpy(zconsForcePolicy, the_event->evt.asmt.rhs.sval);
1256 >
1257 >        for(int i = 0; zconsForcePolicy[i] != '\0'; i++)
1258 >          {
1259 >            zconsForcePolicy[i] = toupper(zconsForcePolicy[i]);
1260 >          }
1261          have_zcons_force_policy = 1;
1262 <   return 1;
1262 >        return 1;
1263          break;
1264          
1265        case DOUBLE:
# Line 1607 | Line 1610 | int Globals::globalAssign( event* the_event ){
1610        switch( the_type ){
1611          
1612        case STRING:
1613 <   the_event->err_msg =
1613 >        the_event->err_msg =
1614            strdup( "Error in parsing meta-data file!\n\tseed is not a string.\n" );
1615          return 0;
1616 <   return 0;
1616 >        return 0;
1617          break;
1618          
1619        case DOUBLE:
1620 <   have_seed = 1;
1621 <   seed = (int)the_event->evt.asmt.rhs.dval;
1620 >        have_seed = 1;
1621 >        seed = (int)the_event->evt.asmt.rhs.dval;
1622          return 1;
1623          break;
1624          
1625        case INT:
1626 <   have_seed = 1;
1627 <   seed =  the_event->evt.asmt.rhs.ival ;
1626 >        have_seed = 1;
1627 >        seed =  the_event->evt.asmt.rhs.ival ;
1628          return 1;
1629          break;
1630          
# Line 1810 | Line 1813 | int Globals::globalAssign( event* the_event ){
1813        }
1814        break;
1815  
1816 <       case G_THERM_INT_OMEGA_SPRING:
1816 >    case G_THERM_INT_OMEGA_SPRING:
1817        switch( the_type ){
1818          
1819        case STRING:
# Line 1838 | Line 1841 | int Globals::globalAssign( event* the_event ){
1841          break;
1842        }
1843        break;  
1844 +
1845 +    case G_SURFACETENSION:
1846 +        switch( the_type ){
1847 +      
1848 +        case STRING:
1849 +          the_event->err_msg =
1850 +            strdup( "Error in parsing meta-data file!\n\tsurfaceTension is not a double or int.\n" );
1851 +          return 1;
1852 +          break;
1853 +          
1854 +        case DOUBLE:
1855 +          surface_tension= the_event->evt.asmt.rhs.dval;
1856 +          have_surface_tension = 1;
1857 +          return 1;
1858 +          break;
1859 +          
1860 +        case INT:
1861 +          surface_tension = (double)the_event->evt.asmt.rhs.dval;
1862 +          have_surface_tension = 1;
1863 +          return 1;
1864 +          break;
1865 +          
1866 +        default:
1867 +          the_event->err_msg =
1868 +            strdup( "Error in parsing meta-data file!\n\tsurfaceTension unrecognized.\n" );
1869 +          return 0;
1870 +          break;
1871 +        }
1872 +        break;
1873 +        
1874 +
1875 +      
1876        // add more token cases here.      
1877      }
1878    }

Diff Legend

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