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 1585 by gezelter, Sun Jun 19 17:51:15 2011 UTC vs.
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 UTC

# Line 36 | Line 36
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).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include <iostream>
44   #include <fstream>
45   #include <string>
46  
46 #include "brains/Register.hpp"
47   #include "brains/SimCreator.hpp"
48   #include "brains/SimInfo.hpp"
49   #include "io/DumpReader.hpp"
# Line 75 | Line 75
75   #endif
76   #include "applications/staticProps/RhoR.hpp"
77   #include "applications/staticProps/AngleR.hpp"
78 #include "applications/staticProps/RhoAngleR.hpp"
78   #include "applications/staticProps/TetrahedralityParam.hpp"
79 <
79 > #include "applications/staticProps/TetrahedralityParamZ.hpp"
80   using namespace OpenMD;
81  
82   int main(int argc, char* argv[]){
83    
85  //register force fields
86  registerForceFields();
84    
85    gengetopt_args_info args_info;
86    
# Line 96 | Line 93 | int main(int argc, char* argv[]){
93    std::string dumpFileName = args_info.input_arg;
94    std::string sele1;
95    std::string sele2;
99  bool userSpecifiedSelect1;
100  bool userSpecifiedSelect2;
96    
97    // check the first selection argument, or set it to the environment
98    // variable, or failing that, set it to "select all"
# Line 273 | Line 268 | int main(int argc, char* argv[]){
268        painCave.isFatal = 1;
269        simError();
270      }
271 +  } else if (args_info.tet_param_z_given) {
272 +    if (args_info.rcut_given) {  
273 +      analyser = new TetrahedralityParamZ(info, dumpFileName, sele1,
274 +                                         args_info.rcut_arg,
275 +                                         args_info.nbins_arg);
276 +    } else {
277 +      sprintf( painCave.errMsg,
278 +               "A cutoff radius (rcut) must be specified when calculating Tetrahedrality Parameters");
279 +      painCave.severity = OPENMD_ERROR;
280 +      painCave.isFatal = 1;
281 +      simError();
282 +    }
283    } else if (args_info.bor_given){
284      if (args_info.rcut_given) {
285        analyser = new BOPofR(info, dumpFileName, sele1, args_info.rcut_arg,
# Line 341 | Line 348 | int main(int argc, char* argv[]){
348    if (args_info.step_given) {
349      analyser->setStep(args_info.step_arg);
350    }
351 <  
351 >
352    analyser->process();
353    
354    delete analyser;    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines