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

Comparing trunk/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 1846 by gezelter, Thu Jan 31 15:55:47 2013 UTC vs.
Revision 2031 by jmichalk, Fri Oct 31 18:40:40 2014 UTC

# Line 35 | Line 35
35   *                                                                      
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 77 | Line 77
77   #include "applications/staticProps/AngleR.hpp"
78   #include "applications/staticProps/TetrahedralityParam.hpp"
79   #include "applications/staticProps/TetrahedralityParamZ.hpp"
80 + #include "applications/staticProps/TetrahedralityParamXYZ.hpp"
81 + #include "applications/staticProps/RNEMDStats.hpp"
82 + #include "applications/staticProps/NitrileFrequencyMap.hpp"
83 + #include "applications/staticProps/MultipoleSum.hpp"
84 + #include "applications/staticProps/SurfaceDiffusion.hpp"
85 +
86   using namespace OpenMD;
87  
88   int main(int argc, char* argv[]){
# Line 93 | Line 99 | int main(int argc, char* argv[]){
99    std::string dumpFileName = args_info.input_arg;
100    std::string sele1;
101    std::string sele2;
102 +  std::string sele3;
103    
104    // check the first selection argument, or set it to the environment
105    // variable, or failing that, set it to "select all"
# Line 109 | Line 116 | int main(int argc, char* argv[]){
116    }
117    
118    // check the second selection argument, or set it to the environment
119 <  // variable, or failing that, set it to "select all"
119 >  // variable, or failing that, set it to the first selection
120    
121    if (args_info.sele2_given) {
122      sele2 = args_info.sele2_arg;
123    } else {
124 <    char* sele2Env = getenv("SELECTION1");
124 >    char* sele2Env = getenv("SELECTION2");
125      if (sele2Env) {
126        sele2 = sele2Env;            
127      } else {
# Line 124 | Line 131 | int main(int argc, char* argv[]){
131      }
132    }
133  
134 +  // check the third selection argument, which is only set if
135 +  // requested by the user
136 +
137 +  if (args_info.sele3_given) sele3 = args_info.sele3_arg;
138 +
139    bool batchMode;
140    if (args_info.scd_given){
141      if (args_info.sele1_given &&
# Line 179 | Line 191 | int main(int argc, char* argv[]){
191      analyser  = new GofRZ(info, dumpFileName, sele1, sele2, maxLen, zmaxLen,
192                            args_info.nbins_arg, args_info.nbins_z_arg);
193    } else if (args_info.r_theta_given) {
194 <    analyser  = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen,
195 <                              args_info.nbins_arg, args_info.nanglebins_arg);
194 >    if (args_info.sele3_given)
195 >      analyser  = new GofRTheta(info, dumpFileName, sele1, sele2, sele3, maxLen,
196 >                                args_info.nbins_arg, args_info.nanglebins_arg);
197 >    else
198 >      analyser  = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen,
199 >                                args_info.nbins_arg, args_info.nanglebins_arg);
200    } else if (args_info.r_omega_given) {
201 <    analyser  = new GofROmega(info, dumpFileName, sele1, sele2, maxLen,
202 <                              args_info.nbins_arg, args_info.nanglebins_arg);
201 >    if (args_info.sele3_given)
202 >      analyser  = new GofROmega(info, dumpFileName, sele1, sele2, sele3, maxLen,
203 >                                args_info.nbins_arg, args_info.nanglebins_arg);
204 >    else
205 >      analyser  = new GofROmega(info, dumpFileName, sele1, sele2, maxLen,
206 >                                args_info.nbins_arg, args_info.nanglebins_arg);
207 >
208    } else if (args_info.theta_omega_given) {
209 <    analyser  = new GofAngle2(info, dumpFileName, sele1, sele2,
210 <                              args_info.nanglebins_arg);
209 >    if (args_info.sele3_given)
210 >      analyser  = new GofAngle2(info, dumpFileName, sele1, sele2, sele3,
211 >                                args_info.nanglebins_arg);
212 >    else
213 >      analyser  = new GofAngle2(info, dumpFileName, sele1, sele2,
214 >                                args_info.nanglebins_arg);
215    } else if (args_info.gxyz_given) {
216      if (args_info.refsele_given) {
217        analyser= new GofXyz(info, dumpFileName, sele1, sele2,
# Line 240 | Line 265 | int main(int argc, char* argv[]){
265        painCave.isFatal = 1;
266        simError();
267      }
268 <    
268 >  } else if (args_info.multipole_given){
269 >    analyser = new MultipoleSum(info, dumpFileName, sele1,
270 >                                maxLen, args_info.nbins_arg);
271    } else if (args_info.tet_param_given) {
272      if (args_info.rcut_given) {  
273        analyser = new TetrahedralityParam(info, dumpFileName, sele1,
# Line 265 | Line 292 | int main(int argc, char* argv[]){
292        painCave.isFatal = 1;
293        simError();
294      }
295 <  } else if (args_info.bor_given){
295 >  } else if (args_info.tet_param_xyz_given) {
296 >    if (!args_info.rcut_given) {
297 >      sprintf( painCave.errMsg,
298 >               "A cutoff radius (rcut) must be specified when calculating"
299 >               " Tetrahedrality Parameters");
300 >      painCave.severity = OPENMD_ERROR;
301 >      painCave.isFatal = 1;
302 >      simError();
303 >    }
304 >    if (!args_info.voxelSize_given) {
305 >      sprintf( painCave.errMsg,
306 >               "A voxel size must be specified when calculating"
307 >               " volume-resolved Tetrahedrality Parameters");
308 >      painCave.severity = OPENMD_ERROR;
309 >      painCave.isFatal = 1;
310 >      simError();
311 >    }
312 >    if (!args_info.gaussWidth_given) {
313 >      sprintf( painCave.errMsg,
314 >               "A gaussian width must be specified when calculating"
315 >               " volume-resolved Tetrahedrality Parameters");
316 >      painCave.severity = OPENMD_ERROR;
317 >      painCave.isFatal = 1;
318 >      simError();
319 >    }
320 >    analyser = new TetrahedralityParamXYZ(info, dumpFileName, sele1, sele2,
321 >                                          args_info.rcut_arg,
322 >                                          args_info.voxelSize_arg,
323 >                                          args_info.gaussWidth_arg);
324 >  } else if (args_info.ior_given){
325      if (args_info.rcut_given) {
326 <      analyser = new BOPofR(info, dumpFileName, sele1, args_info.rcut_arg,
326 >      analyser = new IcosahedralOfR(info, dumpFileName, sele1,
327 >                                    args_info.rcut_arg,
328 >                                    args_info.nbins_arg, maxLen);
329 >    } else {
330 >      sprintf( painCave.errMsg,
331 >               "A cutoff radius (rcut) must be specified when calculating Bond Order Parameters");
332 >      painCave.severity = OPENMD_ERROR;
333 >      painCave.isFatal = 1;
334 >      simError();
335 >    }
336 >  } else if (args_info.for_given){
337 >    if (args_info.rcut_given) {
338 >      analyser = new FCCOfR(info, dumpFileName, sele1, args_info.rcut_arg,
339                              args_info.nbins_arg, maxLen);
340      } else {
341        sprintf( painCave.errMsg,
# Line 294 | Line 362 | int main(int argc, char* argv[]){
362                                          args_info.molname_arg,
363                                          args_info.begin_arg, args_info.end_arg);
364      } else{
297 –      std::string sele3 = args_info.sele3_arg;
365        analyser  = new SCDOrderParameter(info, dumpFileName,
366                                          sele1, sele2, sele3);
367      }
# Line 305 | Line 372 | int main(int argc, char* argv[]){
372      analyser = new ObjectCount(info, dumpFileName, sele1 );
373    } else if (args_info.slab_density_given) {
374      analyser = new RhoZ(info, dumpFileName, sele1, args_info.nbins_arg);
375 +  } else if (args_info.rnemdz_given) {
376 +    analyser = new RNEMDZ(info, dumpFileName, sele1, args_info.nbins_arg);
377 +  } else if (args_info.rnemdr_given) {
378 +    analyser = new RNEMDR(info, dumpFileName, sele1, args_info.nbins_arg);
379 +  } else if (args_info.rnemdrt_given) {
380 +    analyser = new RNEMDRTheta(info, dumpFileName, sele1,
381 +                               args_info.nbins_arg, args_info.nanglebins_arg);
382 +  } else if (args_info.nitrile_given) {
383 +    analyser = new NitrileFrequencyMap(info, dumpFileName, sele1,
384 +                                       args_info.nbins_arg);
385    } else if (args_info.p_angle_given) {
386 <    analyser = new pAngle(info, dumpFileName, sele1, args_info.nbins_arg);
386 >    if (args_info.sele1_given) {    
387 >      if (args_info.sele2_given)
388 >        analyser  = new pAngle(info, dumpFileName, sele1, sele2,
389 >                               args_info.nbins_arg);
390 >      else
391 >        if (args_info.seleoffset_given) {
392 >          if (args_info.seleoffset2_given) {
393 >            analyser  = new pAngle(info, dumpFileName, sele1,
394 >                                   args_info.seleoffset_arg,
395 >                                   args_info.seleoffset2_arg,
396 >                                   args_info.nbins_arg);
397 >          } else {
398 >            analyser  = new pAngle(info, dumpFileName, sele1,
399 >                                   args_info.seleoffset_arg,
400 >                                   args_info.nbins_arg);
401 >          }
402 >        } else
403 >          analyser  = new pAngle(info, dumpFileName, sele1,
404 >                                 args_info.nbins_arg);
405 >    } else {
406 >      sprintf( painCave.errMsg,
407 >               "At least one selection script (--sele1) must be specified when "
408 >               "calculating P(angle) distributions");
409 >      painCave.severity = OPENMD_ERROR;
410 >      painCave.isFatal = 1;
411 >      simError();
412 >    }
413   #if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
414    }else if (args_info.hxy_given) {
415      analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg,
416                         args_info.nbins_y_arg, args_info.nbins_arg);
417   #endif
418 +  }else if (args_info.surfDiffusion_given){
419 +    analyser = new SurfaceDiffusion(info, dumpFileName, sele1, maxLen);
420    }else if (args_info.rho_r_given) {
421      if (args_info.radius_given){
422        analyser = new RhoR(info, dumpFileName, sele1, maxLen,args_info.nbins_arg,args_info.radius_arg);

Diff Legend

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