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

Comparing branches/development/src/brains/Thermo.cpp (file contents):
Revision 1764 by gezelter, Tue Jul 3 18:32:27 2012 UTC vs.
Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

# Line 54 | Line 54
54   #include "types/FixedChargeAdapter.hpp"
55   #include "types/FluctuatingChargeAdapter.hpp"
56   #include "types/MultipoleAdapter.hpp"
57 + #ifdef HAVE_QHULL
58   #include "math/ConvexHull.hpp"
59   #include "math/AlphaHull.hpp"
60 + #endif
61  
62   using namespace std;
63   namespace OpenMD {
# Line 864 | Line 866 | namespace OpenMD {
866  
867    RealType Thermo::getHullVolume(){
868      Snapshot* snap = info_->getSnapshotManager()->getCurrentSnapshot();
869 <    
869 >
870 > #ifdef HAVE_QHULL    
871      if (!snap->hasHullVolume) {
869
872        Hull* surfaceMesh_;
873  
874        Globals* simParams = info_->getSimParams();
# Line 902 | Line 904 | namespace OpenMD {
904        snap->setHullVolume(surfaceMesh_->getVolume());
905      }
906      return snap->getHullVolume();
907 <  }  
907 > #else
908 >    return 0.0;
909 > #endif
910 >  }
911   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines