ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/hydrodynamics/HydroProp.cpp
Revision: 1875
Committed: Fri May 17 14:41:42 2013 UTC (11 years, 11 months ago) by gezelter
File size: 5575 byte(s)
Log Message:
Fixed a bunch of stylistic and performance issues discovered via cppcheck.

File Contents

# Content
1 /*
2 * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 *
4 * The University of Notre Dame grants you ("Licensee") a
5 * non-exclusive, royalty free, license to use, modify and
6 * redistribute this software in source and binary code form, provided
7 * that the following conditions are met:
8 *
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
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.
16 *
17 * This software is provided "AS IS," without a warranty of any
18 * kind. All express or implied conditions, representations and
19 * warranties, including any implied warranty of merchantability,
20 * fitness for a particular purpose or non-infringement, are hereby
21 * excluded. The University of Notre Dame and its licensors shall not
22 * be liable for any damages suffered by licensee as a result of
23 * using, modifying or distributing the software or its
24 * derivatives. In no event will the University of Notre Dame or its
25 * licensors be liable for any lost revenue, profit or data, or for
26 * direct, indirect, special, consequential, incidental or punitive
27 * damages, however caused and regardless of the theory of liability,
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, 234107 (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 #include "hydrodynamics/HydroProp.hpp"
44 #include "utils/StringTokenizer.hpp"
45 #include "math/CholeskyDecomposition.hpp"
46
47 namespace OpenMD {
48
49 HydroProp::HydroProp() : hasCOR(false), hasXi(false) {
50 }
51
52 HydroProp::HydroProp(Vector3d cor, Mat6x6d Xi, Mat6x6d D) : cor_(cor),
53 Xi_(Xi), D_(D),
54 hasCOR(true),
55 hasXi(true) {
56 }
57
58 HydroProp::HydroProp(const std::string &frictionLine) : hasCOR(false),
59 hasXi(false) {
60
61 StringTokenizer tokenizer(frictionLine);
62 if (tokenizer.countTokens() >= 40) {
63 name_ = tokenizer.nextToken();
64 cor_[0] = tokenizer.nextTokenAsDouble();
65 cor_[1] = tokenizer.nextTokenAsDouble();
66 cor_[2] = tokenizer.nextTokenAsDouble();
67
68 hasCOR = true;
69
70 Xitt_(0,0) = tokenizer.nextTokenAsDouble();
71 Xitt_(0,1) = tokenizer.nextTokenAsDouble();
72 Xitt_(0,2) = tokenizer.nextTokenAsDouble();
73 Xitt_(1,0) = tokenizer.nextTokenAsDouble();
74 Xitt_(1,1) = tokenizer.nextTokenAsDouble();
75 Xitt_(1,2) = tokenizer.nextTokenAsDouble();
76 Xitt_(2,0) = tokenizer.nextTokenAsDouble();
77 Xitt_(2,1) = tokenizer.nextTokenAsDouble();
78 Xitt_(2,2) = tokenizer.nextTokenAsDouble();
79
80 Xirt_(0,0) = tokenizer.nextTokenAsDouble();
81 Xirt_(0,1) = tokenizer.nextTokenAsDouble();
82 Xirt_(0,2) = tokenizer.nextTokenAsDouble();
83 Xirt_(1,0) = tokenizer.nextTokenAsDouble();
84 Xirt_(1,1) = tokenizer.nextTokenAsDouble();
85 Xirt_(1,2) = tokenizer.nextTokenAsDouble();
86 Xirt_(2,0) = tokenizer.nextTokenAsDouble();
87 Xirt_(2,1) = tokenizer.nextTokenAsDouble();
88 Xirt_(2,2) = tokenizer.nextTokenAsDouble();
89
90 Xitr_(0,0) = tokenizer.nextTokenAsDouble();
91 Xitr_(0,1) = tokenizer.nextTokenAsDouble();
92 Xitr_(0,2) = tokenizer.nextTokenAsDouble();
93 Xitr_(1,0) = tokenizer.nextTokenAsDouble();
94 Xitr_(1,1) = tokenizer.nextTokenAsDouble();
95 Xitr_(1,2) = tokenizer.nextTokenAsDouble();
96 Xitr_(2,0) = tokenizer.nextTokenAsDouble();
97 Xitr_(2,1) = tokenizer.nextTokenAsDouble();
98 Xitr_(2,2) = tokenizer.nextTokenAsDouble();
99
100 Xirr_(0,0) = tokenizer.nextTokenAsDouble();
101 Xirr_(0,1) = tokenizer.nextTokenAsDouble();
102 Xirr_(0,2) = tokenizer.nextTokenAsDouble();
103 Xirr_(1,0) = tokenizer.nextTokenAsDouble();
104 Xirr_(1,1) = tokenizer.nextTokenAsDouble();
105 Xirr_(1,2) = tokenizer.nextTokenAsDouble();
106 Xirr_(2,0) = tokenizer.nextTokenAsDouble();
107 Xirr_(2,1) = tokenizer.nextTokenAsDouble();
108 Xirr_(2,2) = tokenizer.nextTokenAsDouble();
109
110 Xi_.setSubMatrix(0, 0, Xitt_);
111 Xi_.setSubMatrix(0, 3, Xirt_);
112 Xi_.setSubMatrix(3, 0, Xitr_);
113 Xi_.setSubMatrix(3, 3, Xirr_);
114
115 hasXi = true;
116
117 CholeskyDecomposition(Xi_, S_);
118
119 }
120 }
121
122 void HydroProp::complete() {
123
124 if (hasXi) {
125 for (int i1 = 0; i1 < 3; i1++) {
126 for (int j1 = 0; j1 < 3; j1++) {
127 Xitt_(i1,j1) = Xi_(i1,j1);
128 Xirt_(i1,j1) = Xi_(i1,j1+3);
129 Xitr_(i1,j1) = Xi_(i1+3,j1);
130 Xirr_(i1,j1) = Xi_(i1+3,j1+3);
131 }
132 }
133 CholeskyDecomposition(Xi_, S_);
134 }
135 }
136
137 }
138

Properties

Name Value
svn:keywords Author Id Revision Date