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 1937 by gezelter, Tue Oct 29 16:02:58 2013 UTC vs.
Revision 1991 by gezelter, Wed Apr 23 20:34:17 2014 UTC

# Line 311 | Line 311 | int main(int argc, char* argv[]){
311      analyser = new RNEMDZ(info, dumpFileName, sele1, args_info.nbins_arg);
312    } else if (args_info.rnemdr_given) {
313      analyser = new RNEMDR(info, dumpFileName, sele1, args_info.nbins_arg);
314 +  } else if (args_info.rnemdrt_given) {
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 >          if (args_info.seleoffset2_given) {
325 >            analyser  = new pAngle(info, dumpFileName, sele1,
326 >                                   args_info.seleoffset_arg,
327 >                                   args_info.seleoffset2_arg,
328 >                                   args_info.nbins_arg);
329 >          } else {
330 >            analyser  = new pAngle(info, dumpFileName, sele1,
331 >                                   args_info.seleoffset_arg,
332 >                                   args_info.nbins_arg);
333 >          }
334 >        } else
335 >          analyser  = new pAngle(info, dumpFileName, sele1,
336 >                                 args_info.nbins_arg);
337 >    } else {
338 >      sprintf( painCave.errMsg,
339 >               "At least one selection script (--sele1) must be specified when "
340 >               "calculating P(angle) distributions");
341 >      painCave.severity = OPENMD_ERROR;
342 >      painCave.isFatal = 1;
343 >      simError();
344 >    }
345   #if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
346    }else if (args_info.hxy_given) {
347      analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines