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

Comparing trunk/src/applications/staticProps/NanoVolume.cpp (file contents):
Revision 1194 by chuckv, Thu Dec 6 19:52:11 2007 UTC vs.
Revision 1942 by gezelter, Tue Nov 5 18:33:42 2013 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 2006 The University of Notre Dame. All Rights Reserved.
1 > /* Copyright (c) 2006, 2009, 2010 The University of Notre Dame. All Rights Reserved.
2   *
3   * The University of Notre Dame grants you ("Licensee") a
4   * non-exclusive, royalty free, license to use, modify and
5   * redistribute this software in source and binary code form, provided
6   * that the following conditions are met:
7   *
8 < * 1. Acknowledgement of the program authors must be made in any
9 < *    publication of scientific results based in part on use of the
10 < *    program.  An acceptable form of acknowledgement is citation of
11 < *    the article in which the program was described (Matthew
12 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
13 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
14 < *    Parallel Simulation Engine for Molecular Dynamics,"
15 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
16 < *
17 < * 2. Redistributions of source code must retain the above copyright
8 > * 1. Redistributions of source code must retain the above copyright
9   *    notice, this list of conditions and the following disclaimer.
10   *
11 < * 3. Redistributions in binary form must reproduce the above copyright
11 > * 2. Redistributions in binary form must reproduce the above copyright
12   *    notice, this list of conditions and the following disclaimer in the
13   *    documentation and/or other materials provided with the
14   *    distribution.
# Line 37 | Line 28
28   * University of Notre Dame has been advised of the possibility of
29   * such damages.
30   *
31 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
32 + * research, please cite the appropriate papers when you publish your
33 + * work.  Good starting points are:
34 + *                                                                      
35 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
36 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
37 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
38 + * [4] Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
39 + * [4] , Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). *
40   *
41   *  NanoVolume.cpp
42   *
43 *  Purpose: To calculate convexhull, hull volume and radius
44 *  using the CGAL library.
45 *
43   *  Created by Charles F. Vardeman II on 14 Dec 2006.
44   *  @author  Charles F. Vardeman II
45 < *  @version $Id: NanoVolume.cpp,v 1.3 2007-12-06 19:52:11 chuckv Exp $
45 > *  @version $Id$
46   *
47   */
48  
49   #include "applications/staticProps/NanoVolume.hpp"
50 + #if defined(HAVE_QHULL)
51   #include "math/ConvexHull.hpp"
52 + #include "math/AlphaHull.hpp"
53 + #endif
54   #include "utils/simError.h"
55   #include "io/DumpReader.hpp"
56   #include "primitives/Molecule.hpp"
57   #include "utils/NumericConstant.hpp"
58  
59 < using namespace oopse;
59 > using namespace OpenMD;
60  
61   NanoVolume::NanoVolume(SimInfo* info,
62                         const std::string& filename,
63                         const std::string& sele)
64 <  : StaticAnalyser(info, filename), selectionScript_(sele), evaluator_(info), seleMan_(info) {
64 >  : StaticAnalyser(info, filename), selectionScript_(sele), evaluator_(info),
65 >    seleMan_(info) {
66 >
67    setOutputName(getPrefix(filename) + ".avol");
68 +
69 +  osq.open(getOutputFileName().c_str());
70    
71    evaluator_.loadScriptString(sele);
72    if (!evaluator_.isDynamic()) {
73      seleMan_.setSelectionSet(evaluator_.evaluate());
74    }
75    frameCounter_ = 0;
72  totalVolume_ = 0.0;
76   }
77  
78   void NanoVolume::process() {
79 <  
79 > #if defined(HAVE_QHULL)
80    Molecule* mol;
78  Atom* atom;
81    RigidBody* rb;
80  int myIndex;
82    SimInfo::MoleculeIterator mi;
83    Molecule::RigidBodyIterator rbIter;
83  Molecule::AtomIterator ai;
84    StuntDouble* sd;
85    Vector3d vec;
86 <  int i,j;
86 >  int i;
87  
88 <  ConvexHull* hull = new ConvexHull();
89 <
88 >  AlphaHull* thishull = new AlphaHull(2.0);
89 >  //ConvexHull* thishull = new ConvexHull();
90 >  
91    DumpReader reader(info_, dumpFilename_);
92    int nFrames = reader.getNFrames();
93    frameCounter_ = 0;
94  
95 <  pos_.reserve(info_->getNGlobalAtoms());
95 >  theAtoms_.reserve(info_->getNGlobalAtoms());
96  
97    for (int istep = 0; istep < nFrames; istep += step_) {
98      reader.readFrame(istep);
99      frameCounter_++;
100      currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
101 +    RealType time = currentSnapshot_->getTime();
102      
103      // Clear pos vector between each frame.
104 <    pos_.clear();
104 >    theAtoms_.clear();
105      
106      if (evaluator_.isDynamic()) {
107        seleMan_.setSelectionSet(evaluator_.evaluate());
108      }
109      
110 <    // update the positions of atoms which belong to the rigidbodies
110 >    // update the positions of atoms which belong to the rigid bodies
111      
112      for (mol = info_->beginMolecule(mi); mol != NULL;
113           mol = info_->nextMolecule(mi)) {
# Line 118 | Line 120 | void NanoVolume::process() {
120      // outer loop is over the selected StuntDoubles:
121      
122      for (sd = seleMan_.beginSelected(i); sd != NULL;
123 <         sd = seleMan_.nextSelected(i)) {
124 <      
123 <      pos_.push_back(sd->getPos());
124 <      myIndex = sd->getGlobalIndex();
125 <      
123 >         sd = seleMan_.nextSelected(i)) {      
124 >      theAtoms_.push_back(sd);      
125      }
126 +    
127 +    /* variant below for signle atoms, not StuntDoubles:
128 +    for (mol = info_->beginMolecule(mi); mol != NULL;
129 +         mol = info_->nextMolecule(mi)) {
130 +      for (atom = mol->beginAtom(ai); atom != NULL;
131 +           atom = mol->nextAtom(ai)) {
132 +        theAtoms_.push_back(atom);
133 +      }
134 +    }
135 +    */
136 +
137      // Generate convex hull for this frame.
138 <    hull->genHull(pos_);
139 <    totalVolume_ += hull->getVolume();          
130 <  }
131 <  RealType avgVolume = totalVolume_/(RealType) frameCounter_;
132 <  //std::cout.precision(7);
133 <  //std::cout  << avgVolume << std::endl;
138 >    thishull->computeHull(theAtoms_);
139 >    RealType volume = thishull->getVolume();
140  
141 <  std::ofstream osq(getOutputFileName().c_str());
142 <  osq.precision(7);
143 <  if (osq.is_open()){
144 <      osq << avgVolume << std::endl;
139 <
141 >    osq.precision(7);
142 >    if (osq.is_open()){
143 >      osq << time << "\t" << volume << std::endl;      
144 >    }
145    }
146    osq.close();
147  
148 + #else
149 +  sprintf(painCave.errMsg, "NanoVolume: qhull support was not compiled in!\n");
150 +  painCave.isFatal = 1;
151 +  simError();  
152 + #endif
153 +
154   }

Comparing trunk/src/applications/staticProps/NanoVolume.cpp (property svn:keywords):
Revision 1194 by chuckv, Thu Dec 6 19:52:11 2007 UTC vs.
Revision 1942 by gezelter, Tue Nov 5 18:33:42 2013 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines