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 1997 by gezelter, Wed Apr 30 18:50:45 2014 UTC vs.
Revision 1998 by gezelter, Fri May 30 19:48:35 2014 UTC

# Line 79 | Line 79
79   #include "applications/staticProps/TetrahedralityParamZ.hpp"
80   #include "applications/staticProps/RNEMDStats.hpp"
81   #include "applications/staticProps/NitrileFrequencyMap.hpp"
82 + #include "applications/staticProps/MultipoleSum.hpp"
83  
84   using namespace OpenMD;
85  
# Line 239 | Line 240 | int main(int argc, char* argv[]){
240      } else {
241        sprintf( painCave.errMsg,
242                 "A cutoff radius (rcut) must be specified when calculating Bond Order Parameters");
243 +      painCave.severity = OPENMD_ERROR;
244 +      painCave.isFatal = 1;
245 +      simError();
246 +    }
247 +  } else if (args_info.multipole_given){
248 +    if (args_info.rcut_given) {
249 +      analyser = new MultipoleSum(info, dumpFileName, sele1,
250 +                                        args_info.rcut_arg);
251 +    } else {
252 +      sprintf( painCave.errMsg,
253 +               "A cutoff radius (rcut) must be specified when calculating Multipole Sums");
254        painCave.severity = OPENMD_ERROR;
255        painCave.isFatal = 1;
256        simError();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines