ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/math/RectMatrix.hpp
(Generate patch)

Comparing:
trunk/src/math/RectMatrix.hpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/math/RectMatrix.hpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /**
# Line 52 | Line 53
53   #include <cmath>
54   #include "Vector.hpp"
55  
56 < namespace oopse {
56 > namespace OpenMD {
57  
58    /**
59     * @class RectMatrix RectMatrix.hpp "math/RectMatrix.hpp"
# Line 151 | Line 152 | namespace oopse {
152      Vector<Real, Row> getRow(unsigned int row) {
153        Vector<Real, Row> v;
154  
155 <      for (unsigned int i = 0; i < Row; i++)
155 >      for (unsigned int i = 0; i < Col; i++)
156          v[i] = this->data_[row][i];
157  
158        return v;
# Line 164 | Line 165 | namespace oopse {
165       */                
166      void setRow(unsigned int row, const Vector<Real, Row>& v) {
167  
168 <      for (unsigned int i = 0; i < Row; i++)
168 >      for (unsigned int i = 0; i < Col; i++)
169          this->data_[row][i] = v[i];
170      }
171  
# Line 176 | Line 177 | namespace oopse {
177      Vector<Real, Col> getColumn(unsigned int col) {
178        Vector<Real, Col> v;
179  
180 <      for (unsigned int j = 0; j < Col; j++)
180 >      for (unsigned int j = 0; j < Row; j++)
181          v[j] = this->data_[j][col];
182  
183        return v;
# Line 189 | Line 190 | namespace oopse {
190       */                
191      void setColumn(unsigned int col, const Vector<Real, Col>& v){
192  
193 <      for (unsigned int j = 0; j < Col; j++)
193 >      for (unsigned int j = 0; j < Row; j++)
194          this->data_[j][col] = v[j];
195      }        
196  
# Line 389 | Line 390 | namespace oopse {
390  
391        return result;
392      }
393 <        
393 >
394 >    template<class MatrixType>
395 >    void setSubMatrix(unsigned int beginRow, unsigned int beginCol, const MatrixType& m) {
396 >        assert(beginRow + m.getNRow() -1 <= getNRow());
397 >        assert(beginCol + m.getNCol() -1 <= getNCol());
398 >
399 >        for (unsigned int i = 0; i < m.getNRow(); ++i)
400 >            for (unsigned int j = 0; j < m.getNCol(); ++j)
401 >                this->data_[beginRow+i][beginCol+j] = m(i, j);
402 >    }
403 >
404 >    template<class MatrixType>
405 >    void getSubMatrix(unsigned int beginRow, unsigned int beginCol, MatrixType& m) {
406 >        assert(beginRow + m.getNRow() -1 <= getNRow());
407 >        assert(beginCol + m.getNCol() - 1 <= getNCol());
408 >
409 >        for (unsigned int i = 0; i < m.getNRow(); ++i)
410 >            for (unsigned int j = 0; j < m.getNCol(); ++j)
411 >                m(i, j) = this->data_[beginRow+i][beginCol+j];
412 >    }
413 >    
414 >    unsigned int getNRow() const {return Row;}
415 >    unsigned int getNCol() const {return Col;}        
416 >
417    protected:
418      Real data_[Row][Col];
419    };

Comparing:
trunk/src/math/RectMatrix.hpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/math/RectMatrix.hpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines