--- trunk/src/applications/hydrodynamics/ApproximationModel.hpp	2006/03/17 23:20:35	906
+++ trunk/src/applications/hydrodynamics/ApproximationModel.hpp	2010/05/10 17:28:26	1442
@@ -6,19 +6,10 @@
  * redistribute this software in source and binary code form, provided
  * that the following conditions are met:
  *
- * 1. Acknowledgement of the program authors must be made in any
- *    publication of scientific results based in part on use of the
- *    program.  An acceptable form of acknowledgement is citation of
- *    the article in which the program was described (Matthew
- *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
- *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
- *    Parallel Simulation Engine for Molecular Dynamics,"
- *    J. Comput. Chem. 26, pp. 252-271 (2005))
- *
- * 2. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 3. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the
  *    distribution.
@@ -37,6 +28,15 @@
  * arising out of the use of or inability to use software, even if the
  * University of Notre Dame has been advised of the possibility of
  * such damages.
+ *
+ * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
+ * research, please cite the appropriate papers when you publish your
+ * work.  Good starting points are:
+ *                                                                      
+ * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
+ * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [4]  Vardeman & Gezelter, in progress (2009).                        
  */
 #ifndef APPLICATION_HYDRODYNAMICS_APPROXIMATIONMODEL_HPP
 #define APPLICATION_HYDRODYNAMICS_APPROXIMATIONMODEL_HPP
@@ -48,30 +48,25 @@
 #include "primitives/Molecule.hpp"
 #include "utils/any.hpp"
 #include "applications/hydrodynamics/HydrodynamicsModel.hpp"
-namespace oopse {
+namespace OpenMD {
 
-class Shape;
-class ApproximationModel :  public HydrodynamicsModel {
-    public:
-        ApproximationModel(StuntDouble* sd, SimInfo* info);
-
-        virtual bool calcHydroProps(Spheric* spheric, double viscosity, double temperature);
-        virtual bool calcHydroProps(Ellipsoid* ellipsoid, double viscosity, double temperature);
-        virtual bool calcHydroProps(CompositeShape* compositexShape, double viscosity, double temperature);
-
-
-    private:
-        bool internalCalcHydroProps(Shape* shape, double viscosity, double temperature);
-
-        
-        virtual bool createBeads(std::vector<BeadParam>& beads) = 0;
-
-        bool calcHydroPropsAtCR(std::vector<BeadParam>& beads, double viscosity, double temperature, HydroProps& cr);
-        bool calcHydroPropsAtCD(std::vector<BeadParam>& beads, double viscosity, double temperature, HydroProps& cd);
-        std::vector<BeadParam> beads_;
+  class Shape;
+  class ApproximationModel :  public HydrodynamicsModel {
+  public:
+    ApproximationModel(StuntDouble* sd, SimInfo* info);
+    
+    virtual bool calcHydroProps(Shape* shape, RealType viscosity, RealType temperature);
+    virtual void init();
+    virtual void writeBeads(std::ostream& os);
+  private:
+    virtual bool createBeads(std::vector<BeadParam>& beads) = 0;
+    
+    bool calcHydroPropsAtCR(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProp* cr);
+    bool calcHydroPropsAtCD(std::vector<BeadParam>& beads, RealType viscosity, RealType temperature, HydroProp* cd);
+    std::vector<BeadParam> beads_;
 };
+  
 
-
 }
 
 #endif