ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/dynamicProps/DynamicProps.cpp
(Generate patch)

Comparing trunk/src/applications/dynamicProps/DynamicProps.cpp (file contents):
Revision 1934 by gezelter, Mon Aug 26 14:15:09 2013 UTC vs.
Revision 1937 by gezelter, Tue Oct 29 16:02:58 2013 UTC

# Line 76 | Line 76 | int main(int argc, char* argv[]){
76      exit(1) ;
77    }
78  
79
79    //get the dumpfile name and meta-data file name
80    std::string dumpFileName = args_info.input_arg;
81      
82    std::string sele1;
83    std::string sele2;
84 <
84 >  
85 >  // check the first selection argument, or set it to the environment
86 >  // variable, or failing that, set it to "select all"
87 >  
88    if (args_info.sele1_given) {
89      sele1 = args_info.sele1_arg;
90 <  }else {
90 >  } else {
91      char*  sele1Env= getenv("SELECTION1");
92      if (sele1Env) {
93        sele1 = sele1Env;
94 <    }else {
95 <      sprintf( painCave.errMsg,
94 <               "neither --sele1 option nor $SELECTION1 is set");
95 <      painCave.severity = OPENMD_ERROR;
96 <      painCave.isFatal = 1;
97 <      simError();
94 >    } else {
95 >      sele1 = "select all";
96      }
97    }
98 <    
98 >  
99 >  // check the second selection argument, or set it to the environment
100 >  // variable, or failing that, set it to the first selection
101 >  
102    if (args_info.sele2_given) {
103      sele2 = args_info.sele2_arg;
104    } else {
105      char* sele2Env = getenv("SELECTION2");
106      if (sele2Env) {
107        sele2 = sele2Env;            
108 <    } else {
108 >    } else {
109 >      //If sele2 is not specified, then the default behavior
110 >      //should be what is already intended for sele1
111        sele2 = sele1;
112      }
113    }
# Line 189 | Line 192 | int main(int argc, char* argv[]){
192    }
193  
194  
192
195    if (args_info.output_given) {
196      corrFunc->setOutputName(args_info.output_arg);
197    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines