[ViewVC] Diff of: OpenMD/branches/development/src/hydrodynamics/HydroProp.cpp

Comparing branches/development/src/hydrodynamics/HydroProp.cpp (file contents):
Revision 1850 by gezelter, Wed Feb 20 15:39:39 2013 UTC vs.
Revision 1875 by gezelter, Fri May 17 14:41:42 2013 UTC

#	Line 46 \| Line 46 \| namespace OpenMD {
46
47		namespace OpenMD {
48
49	<	HydroProp::HydroProp(){
50	<	hasCOR = false;
51	<	hasXi = false;
49	>	HydroProp::HydroProp() : hasCOR(false), hasXi(false) {
50		}
51
52	<	HydroProp::HydroProp(Vector3d cor, Mat6x6d Xi, Mat6x6d D) : cor_(cor), Xi_(Xi), D_(D){
53	<	hasCOR = true;
54	<	hasXi = true;
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) {
58	>	HydroProp::HydroProp(const std::string &frictionLine) : hasCOR(false),
59	>	hasXi(false) {
60
61		StringTokenizer tokenizer(frictionLine);
62		if (tokenizer.countTokens() >= 40) {
#	Line 65 \| Line 65 \| namespace OpenMD {
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();
#	Line 110 \| Line 112 \| namespace OpenMD {
112		Xi_.setSubMatrix(3, 0, Xitr_);
113		Xi_.setSubMatrix(3, 3, Xirr_);
114
115	+	hasXi = true;
116	+
117		CholeskyDecomposition(Xi_, S_);
118
119		}

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines