ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/hydrodynamics/HydrodynamicsModel.hpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/hydrodynamics/HydrodynamicsModel.hpp (file contents):
Revision 2596 by tim, Wed Feb 22 20:35:16 2006 UTC vs.
Revision 2597 by tim, Thu Feb 23 23:16:43 2006 UTC

# Line 46 | Line 46
46   #include "math/SquareMatrix3.hpp"
47   #include "math/DynamicRectMatrix.hpp"
48   #include "primitives/Molecule.hpp"
49 < #include "applications/hydrodynamics/MoleculeShape.hpp"
49 > #include "applications/hydrodynamics/StuntDoubleShape.hpp"
50   #include "utils/any.hpp"
51   namespace oopse {
52   struct HydrodynamicProps {
# Line 66 | Line 66 | class HydrodynamicsModel {
66  
67   class HydrodynamicsModel {
68      public:
69 <        HydrodynamicsModel(Molecule* mol, const DynamicProperty& extraParams) : mol_(mol) {}
70 <        bool calcHydrodyanmicsProps(double eta);
69 >        HydrodynamicsModel(StuntDouble* sd, const DynamicProperty& extraParams);
70 >        bool calcHydrodyanmicsProps();
71  
72          Vector3d getDiffCenter();
73          Mat3x3d getTransDiff();
# Line 76 | Line 76 | class HydrodynamicsModel {
76          void writeBeads(std::ostream& os);
77          void writeDiffCenterAndDiffTensor(std::ostream& os);
78      protected:
79 <        Molecule* mol_;
79 >        StuntDouble* sd_;
80      private:
81          virtual bool createBeads(std::vector<BeadParam>& beads) = 0;
82  
83  
84          HydrodynamicProps props_;
85          std::vector<BeadParam> beads_;
86 +        double viscosity_;
87 +        double temperature_;
88          
89   };
90  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines