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 1978 by gezelter, Thu Dec 5 18:19:26 2013 UTC vs.
Revision 1979 by gezelter, Sat Apr 5 20:56:01 2014 UTC

# Line 315 | Line 315 | int main(int argc, char* argv[]){
315      analyser = new RNEMDRTheta(info, dumpFileName, sele1,
316                                 args_info.nbins_arg, args_info.nanglebins_arg);
317    } else if (args_info.p_angle_given) {
318 <    analyser = new pAngle(info, dumpFileName, sele1, args_info.nbins_arg);
318 >    if (args_info.sele1_given) {    
319 >      if (args_info.sele2_given)
320 >        analyser  = new pAngle(info, dumpFileName, sele1, sele2,
321 >                               args_info.nbins_arg);
322 >      else
323 >        if (args_info.seleoffset_given)
324 >          analyser  = new pAngle(info, dumpFileName, sele1,
325 >                                 args_info.seleoffset_arg, args_info.nbins_arg);
326 >        else
327 >          analyser  = new pAngle(info, dumpFileName, sele1,
328 >                                 args_info.nbins_arg);
329 >    } else {
330 >      sprintf( painCave.errMsg,
331 >               "At least one selection script (--sele1) must be specified when "
332 >               "calculating P(angle) distributions");
333 >      painCave.severity = OPENMD_ERROR;
334 >      painCave.isFatal = 1;
335 >      simError();
336 >    }
337   #if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
338    }else if (args_info.hxy_given) {
339      analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines