ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/applications/staticProps/StaticProps.cpp
(Generate patch)

Comparing branches/development/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 1635 by gezelter, Thu Sep 15 16:24:03 2011 UTC vs.
Revision 1762 by plouden, Thu Jun 28 20:17:33 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 76 | Line 76
76   #include "applications/staticProps/RhoR.hpp"
77   #include "applications/staticProps/AngleR.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    
84  //register force fields
85  registerForceFields();
84    
85    gengetopt_args_info args_info;
86    
# Line 263 | Line 261 | int main(int argc, char* argv[]){
261    } else if (args_info.tet_param_given) {
262      if (args_info.rcut_given) {  
263        analyser = new TetrahedralityParam(info, dumpFileName, sele1,
264 +                                         args_info.rcut_arg,
265 +                                         args_info.nbins_arg);
266 +    } else {
267 +      sprintf( painCave.errMsg,
268 +               "A cutoff radius (rcut) must be specified when calculating Tetrahedrality Parameters");
269 +      painCave.severity = OPENMD_ERROR;
270 +      painCave.isFatal = 1;
271 +      simError();
272 +    }
273 +  } else if (args_info.tet_param_z_given) {
274 +    if (args_info.rcut_given) {  
275 +      analyser = new TetrahedralityParamZ(info, dumpFileName, sele1,
276                                           args_info.rcut_arg,
277                                           args_info.nbins_arg);
278      } else {
# Line 340 | Line 350 | int main(int argc, char* argv[]){
350    if (args_info.step_given) {
351      analyser->setStep(args_info.step_arg);
352    }
353 <  
353 >
354    analyser->process();
355    
356    delete analyser;    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines