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 1991 by gezelter, Wed Apr 23 20:34:17 2014 UTC vs.
Revision 1992 by gezelter, Thu Apr 24 17:30:00 2014 UTC

# Line 267 | Line 267 | int main(int argc, char* argv[]){
267        painCave.isFatal = 1;
268        simError();
269      }
270 <  } else if (args_info.bor_given){
270 >  } else if (args_info.ior_given){
271      if (args_info.rcut_given) {
272 <      analyser = new BOPofR(info, dumpFileName, sele1, args_info.rcut_arg,
272 >      analyser = new IcosahedralOfR(info, dumpFileName, sele1,
273 >                                    args_info.rcut_arg,
274 >                                    args_info.nbins_arg, maxLen);
275 >    } else {
276 >      sprintf( painCave.errMsg,
277 >               "A cutoff radius (rcut) must be specified when calculating Bond Order Parameters");
278 >      painCave.severity = OPENMD_ERROR;
279 >      painCave.isFatal = 1;
280 >      simError();
281 >    }
282 >  } else if (args_info.for_given){
283 >    if (args_info.rcut_given) {
284 >      analyser = new FCCOfR(info, dumpFileName, sele1, args_info.rcut_arg,
285                              args_info.nbins_arg, maxLen);
286      } else {
287        sprintf( painCave.errMsg,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines