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

Comparing branches/development/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 1762 by plouden, Thu Jun 28 20:17:33 2012 UTC vs.
Revision 1831 by gezelter, Thu Jan 10 14:06:34 2013 UTC

# Line 93 | Line 93 | int main(int argc, char* argv[]){
93    std::string dumpFileName = args_info.input_arg;
94    std::string sele1;
95    std::string sele2;
96 –  bool userSpecifiedSelect1;
97 –  bool userSpecifiedSelect2;
96    
97    // check the first selection argument, or set it to the environment
98    // variable, or failing that, set it to "select all"
# Line 120 | Line 118 | int main(int argc, char* argv[]){
118      if (sele2Env) {
119        sele2 = sele2Env;            
120      } else {
121 <      sele2 = "select all";
121 >      //If sele2 is not specified, then the default behavior
122 >      //should be what is already intended for sele1
123 >      sele2 = sele1;
124 >      //sele2 = "select all";
125      }
126    }
127    
# Line 235 | Line 236 | int main(int argc, char* argv[]){
236        if (args_info.sele2_given)
237          analyser  = new P2OrderParameter(info, dumpFileName, sele1, sele2);
238        else
239 <        analyser  = new P2OrderParameter(info, dumpFileName, sele1);
239 >        if (args_info.seleoffset_given)
240 >          analyser  = new P2OrderParameter(info, dumpFileName, sele1,
241 >                                           args_info.seleoffset_arg);
242 >        else
243 >          analyser  = new P2OrderParameter(info, dumpFileName, sele1);
244      } else {
245        sprintf( painCave.errMsg,
246                 "At least one selection script (--sele1) must be specified when calculating P2 order parameters");

Diff Legend

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