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.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   /**
# Line 52 | Line 52
52   #include <cmath>
53   #include "Vector.hpp"
54  
55 < namespace oopse {
55 > namespace OpenMD {
56  
57    /**
58     * @class RectMatrix RectMatrix.hpp "math/RectMatrix.hpp"
# Line 151 | Line 151 | namespace oopse {
151      Vector<Real, Row> getRow(unsigned int row) {
152        Vector<Real, Row> v;
153  
154 <      for (unsigned int i = 0; i < Row; i++)
154 >      for (unsigned int i = 0; i < Col; i++)
155          v[i] = this->data_[row][i];
156  
157        return v;
# Line 164 | Line 164 | namespace oopse {
164       */                
165      void setRow(unsigned int row, const Vector<Real, Row>& v) {
166  
167 <      for (unsigned int i = 0; i < Row; i++)
167 >      for (unsigned int i = 0; i < Col; i++)
168          this->data_[row][i] = v[i];
169      }
170  
# Line 176 | Line 176 | namespace oopse {
176      Vector<Real, Col> getColumn(unsigned int col) {
177        Vector<Real, Col> v;
178  
179 <      for (unsigned int j = 0; j < Col; j++)
179 >      for (unsigned int j = 0; j < Row; j++)
180          v[j] = this->data_[j][col];
181  
182        return v;
# Line 189 | Line 189 | namespace oopse {
189       */                
190      void setColumn(unsigned int col, const Vector<Real, Col>& v){
191  
192 <      for (unsigned int j = 0; j < Col; j++)
192 >      for (unsigned int j = 0; j < Row; j++)
193          this->data_[j][col] = v[j];
194      }        
195  
# Line 389 | Line 389 | namespace oopse {
389  
390        return result;
391      }
392 <        
392 >
393 >    template<class MatrixType>
394 >    void setSubMatrix(unsigned int beginRow, unsigned int beginCol, const MatrixType& m) {
395 >        assert(beginRow + m.getNRow() -1 <= getNRow());
396 >        assert(beginCol + m.getNCol() -1 <= getNCol());
397 >
398 >        for (unsigned int i = 0; i < m.getNRow(); ++i)
399 >            for (unsigned int j = 0; j < m.getNCol(); ++j)
400 >                this->data_[beginRow+i][beginCol+j] = m(i, j);
401 >    }
402 >
403 >    template<class MatrixType>
404 >    void getSubMatrix(unsigned int beginRow, unsigned int beginCol, MatrixType& m) {
405 >        assert(beginRow + m.getNRow() -1 <= getNRow());
406 >        assert(beginCol + m.getNCol() - 1 <= getNCol());
407 >
408 >        for (unsigned int i = 0; i < m.getNRow(); ++i)
409 >            for (unsigned int j = 0; j < m.getNCol(); ++j)
410 >                m(i, j) = this->data_[beginRow+i][beginCol+j];
411 >    }
412 >    
413 >    unsigned int getNRow() const {return Row;}
414 >    unsigned int getNCol() const {return Col;}        
415 >
416    protected:
417      Real data_[Row][Col];
418    };

Comparing trunk/src/math/RectMatrix.hpp (property svn:keywords):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines