--- trunk/src/math/SquareMatrix.hpp	2006/03/17 23:20:35	906
+++ trunk/src/math/SquareMatrix.hpp	2009/11/25 20:02:06	1390
@@ -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).                        
  */
  
 /**
@@ -49,8 +49,9 @@
 #define MATH_SQUAREMATRIX_HPP 
 
 #include "math/RectMatrix.hpp"
+#include "utils/NumericConstant.hpp"
 
-namespace oopse {
+namespace OpenMD {
 
   /**
    * @class SquareMatrix SquareMatrix.hpp "math/SquareMatrix.hpp"
@@ -138,7 +139,7 @@ namespace oopse {
     bool isSymmetric() const {
       for (unsigned int i = 0; i < Dim - 1; i++)
 	for (unsigned int j = i; j < Dim; j++)
-	  if (fabs(this->data_[i][j] - this->data_[j][i]) > oopse::epsilon) 
+	  if (fabs(this->data_[i][j] - this->data_[j][i]) > epsilon) 
 	    return false;
                         
       return true;
@@ -157,7 +158,7 @@ namespace oopse {
     bool isDiagonal() const {
       for (unsigned int i = 0; i < Dim ; i++)
 	for (unsigned int j = 0; j < Dim; j++)
-	  if (i !=j && fabs(this->data_[i][j]) > oopse::epsilon) 
+	  if (i !=j && fabs(this->data_[i][j]) > epsilon) 
 	    return false;
                         
       return true;
@@ -169,7 +170,7 @@ namespace oopse {
 	return false;
                 
       for (unsigned int i = 0; i < Dim ; i++)
-	if (fabs(this->data_[i][i] - 1) > oopse::epsilon)
+	if (fabs(this->data_[i][i] - 1) > epsilon)
 	  return false;
                     
       return true;
@@ -371,7 +372,7 @@ namespace oopse {
 	  numPos++;
 	}
       }
-      //    if ( numPos < ceil(double(n)/double(2.0)) )
+      //    if ( numPos < ceil(RealType(n)/RealType(2.0)) )
       if ( numPos < ceil_half_n) {
 	for (i=0; i<n; i++) {
 	  v(i, j) *= -1.0;
@@ -387,7 +388,7 @@ namespace oopse {
   }
 
 
-  typedef SquareMatrix<double, 6> Mat6x6d;
+  typedef SquareMatrix<RealType, 6> Mat6x6d;
 }
 #endif //MATH_SQUAREMATRIX_HPP