# | 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_TARGETSTRESS 57 |
119 | > | #define G_SURFACETENSION 57 |
120 | ||
121 | Globals::Globals(){ | |
122 | initalize(); | |
# | Line 191 | 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("targetStress", G_TARGETSTRESS)); |
194 | > | command_table.insert(CommandMapType::value_type("surfaceTension", G_SURFACETENSION)); |
195 | ||
196 | ||
197 | strcpy( mixingRule,"standard"); //default mixing rules to standard. | |
# | Line 254 | 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_targetStress = 0; |
257 | > | have_surface_tension = 0; |
258 | } | |
259 | ||
260 | int Globals::newComponent( event* the_event ){ | |
# | Line 1842 | Line 1842 | int Globals::globalAssign( event* the_event ){ | |
1842 | } | |
1843 | break; | |
1844 | ||
1845 | < | case G_THERM_INT_THETA_SPRING: |
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\ttargetStress is not a double or int.\n" ); |
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 | < | target_stress= the_event->evt.asmt.rhs.dval; |
1856 | < | have_targetstress = 1; |
1855 | > | surface_tension= the_event->evt.asmt.rhs.dval; |
1856 | > | have_surface_tension = 1; |
1857 | return 1; | |
1858 | break; | |
1859 | ||
1860 | case INT: | |
1861 | < | target_stress = (double)the_event->evt.asmt.rhs.dval; |
1862 | < | have_targetstress = 1; |
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\tttargetStress unrecognized.\n" ); |
1868 | > | strdup( "Error in parsing meta-data file!\n\tsurfaceTension unrecognized.\n" ); |
1869 | return 0; | |
1870 | break; | |
1871 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |