ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/staticProps/StaticProps.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 2984 by gezelter, Wed Aug 30 21:04:04 2006 UTC vs.
Revision 3007 by gezelter, Tue Sep 19 21:14:11 2006 UTC

# Line 56 | Line 56
56   #include "applications/staticProps/GofAngle2.hpp"
57   #include "applications/staticProps/GofXyz.hpp"
58   #include "applications/staticProps/P2OrderParameter.hpp"
59 + #include "applications/staticProps/BondOrderParameter.hpp"
60   #include "applications/staticProps/RippleOP.hpp"
61   #include "applications/staticProps/SCDOrderParameter.hpp"
62   #include "applications/staticProps/DensityPlot.hpp"
# Line 78 | Line 79 | int main(int argc, char* argv[]){
79      exit(1) ;
80    }
81  
82 <
82 <  //get the dumpfile name and meta-data file name
82 >  //get the dumpfile name
83    std::string dumpFileName = args_info.input_arg;
84 –
85 –    
84    std::string sele1;
85    std::string sele2;
86 +  bool userSpecifiedSelect1;
87 +  bool userSpecifiedSelect2;
88  
89 +  // check the first selection argument, or set it to the environment
90 +  // variable, or failing that, set it to "select all"
91 +
92    if (args_info.sele1_given) {
93      sele1 = args_info.sele1_arg;
94 <  }else {
94 >  } else {
95      char*  sele1Env= getenv("OOPSE_SELE1");
96      if (sele1Env) {
97        sele1 = sele1Env;
98 <    }else if (!args_info.scd_given) {
99 <      sprintf( painCave.errMsg,
97 <               "neither --sele1 option nor $OOPSE_SELE1 is set");
98 <      painCave.severity = OOPSE_ERROR;
99 <      painCave.isFatal = 1;
100 <      simError();
98 >    } else {
99 >      sele1 = "select all";
100      }
101    }
102 <    
102 >
103 >  // check the second selection argument, or set it to the environment
104 >  // variable, or failing that, set it to "select all"
105 >  
106    if (args_info.sele2_given) {
107      sele2 = args_info.sele2_arg;
108 <  }else {
108 >  } else {
109      char* sele2Env = getenv("OOPSE_SELE2");
110      if (sele2Env) {
111        sele2 = sele2Env;            
112 <    } else if (args_info.density_given) {
112 >    } else {
113        sele2 = "select all";
112 –    } else if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given)  {
113 –      sprintf( painCave.errMsg,
114 –               "neither --sele2 option nor $OOPSE_SELE2 is set");
115 –      painCave.severity = OOPSE_ERROR;
116 –      painCave.isFatal = 1;
117 –      simError();        
114      }
115    }
116  
117 +
118 +  // Problems if sele1 wasn't specified, but
119 + // if (!args_info.scd_given) {
120 + //       sprintf( painCave.errMsg,
121 + //                "neither --sele1 option nor $OOPSE_SELE1 is set");
122 + //       painCave.severity = OOPSE_ERROR;
123 + //       painCave.isFatal = 1;
124 + //       simError();
125 + //     }
126 + //   }
127 +
128 +  // Problems if sele1 wasn't specified
129 +
130 + //     if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given)  {
131 + //       sprintf( painCave.errMsg,
132 + //                "neither --sele2 option nor $OOPSE_SELE2 is set");
133 + //       painCave.severity = OOPSE_ERROR;
134 + //       painCave.isFatal = 1;
135 + //       simError();        
136 + //     }
137 + //   }
138 +
139    bool batchMode;
140    if (args_info.scd_given){
141      if (args_info.sele1_given && args_info.sele2_given && args_info.sele3_given) {
142 <        batchMode = false;
142 >      batchMode = false;
143      } else if (args_info.molname_given && args_info.begin_given && args_info.end_given) {
144 <        if (args_info.begin_arg < 0 || args_info.end_arg < 0 || args_info.begin_arg > args_info.end_arg-2) {
127 <            sprintf( painCave.errMsg,
128 <                     "below conditions are not satisfied:\n"
129 <                     "0 <= begin && 0<= end && begin <= end-2\n");
130 <            painCave.severity = OOPSE_ERROR;
131 <            painCave.isFatal = 1;
132 <            simError();                    
133 <        }
134 <        batchMode = true;        
135 <    } else{
144 >      if (args_info.begin_arg < 0 || args_info.end_arg < 0 || args_info.begin_arg > args_info.end_arg-2) {
145          sprintf( painCave.errMsg,
146 <                 "either --sele1, --sele2, --sele3 are specified,"
147 <                 " or --molname, --begin, --end are specified\n");
146 >                 "below conditions are not satisfied:\n"
147 >                 "0 <= begin && 0<= end && begin <= end-2\n");
148          painCave.severity = OOPSE_ERROR;
149          painCave.isFatal = 1;
150 <        simError();        
150 >        simError();                    
151 >      }
152 >      batchMode = true;        
153 >    } else{
154 >      sprintf( painCave.errMsg,
155 >               "either --sele1, --sele2, --sele3 are specified,"
156 >               " or --molname, --begin, --end are specified\n");
157 >      painCave.severity = OOPSE_ERROR;
158 >      painCave.isFatal = 1;
159 >      simError();        
160      
161      }
162    }
# Line 175 | Line 193 | int main(int argc, char* argv[]){
193        simError();  
194      }
195    } else if (args_info.p2_given) {
196 <      analyser  = new P2OrderParameter(info, dumpFileName, sele1, sele2);
197 <  }    else if (args_info.rp2_given){
198 <      analyser = new RippleOP(info, dumpFileName, sele1, sele2);
199 < }else if (args_info.scd_given) {
200 <      if (batchMode) {
201 <          analyser  = new SCDOrderParameter(info, dumpFileName, args_info.molname_arg,
202 <            args_info.begin_arg, args_info.end_arg);
203 <      } else{
204 <          std::string sele3 = args_info.sele3_arg;
205 <          analyser  = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3);
206 <      }
196 >    analyser  = new P2OrderParameter(info, dumpFileName, sele1, sele2);
197 >  } else if (args_info.rp2_given){
198 >    analyser = new RippleOP(info, dumpFileName, sele1, sele2);
199 >  } else if (args_info.bo_given){
200 >    if (args_info.rcut_given && args_info.LegendreL_given) {
201 >      analyser = new BondOrderParameter(info, dumpFileName, sele1,
202 >                                        args_info.rcut_arg,
203 >                                        args_info.LegendreL_arg);
204 >    } else {
205 >      sprintf( painCave.errMsg,
206 >               "Both the cutoff radius (rcut) and LegendreL must be specified when calculating Bond Order Parameters");
207 >      painCave.severity = OOPSE_ERROR;
208 >      painCave.isFatal = 1;
209 >      simError();
210 >    }
211 >  } else if (args_info.scd_given) {
212 >    if (batchMode) {
213 >      analyser  = new SCDOrderParameter(info, dumpFileName, args_info.molname_arg,
214 >                                        args_info.begin_arg, args_info.end_arg);
215 >    } else{
216 >      std::string sele3 = args_info.sele3_arg;
217 >      analyser  = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3);
218 >    }
219    }else if (args_info.density_given) {
220 <      analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg);  
220 >    analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg);  
221    } else if (args_info.slab_density_given) {
222 <      Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat();
223 <      analyser = new RhoZ(info, dumpFileName, sele1, hmat(2, 2), args_info.nrbins_arg);
222 >    Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat();
223 >    analyser = new RhoZ(info, dumpFileName, sele1, hmat(2, 2), args_info.nrbins_arg);
224   #if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
225    }else if (args_info.hxy_given) {
226      analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg, args_info.nbins_y_arg, args_info.nrbins_arg);
227   #endif
228    }
229 <    
229 >  
230    if (args_info.output_given) {
231      analyser->setOutputName(args_info.output_arg);
232    }

Diff Legend

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