ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/trunk/src/applications/hydrodynamics/HydrodynamicsModel.cpp

Comparing trunk/src/applications/hydrodynamics/HydrodynamicsModel.cpp (file contents):
Revision 904 by tim, Thu Mar 16 22:50:48 2006 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 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, 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	+	#include "applications/hydrodynamics/HydrodynamicsModel.hpp"
43	+	#include "hydrodynamics/Shape.hpp"
44	+	#include "hydrodynamics/Sphere.hpp"
45	+	#include "hydrodynamics/Ellipsoid.hpp"
46	+	#include "applications/hydrodynamics/CompositeShape.hpp"
47
48	<	#include "applications/hydrodynamics/HydrodynamicsModel.hpp"
49	<	#include "math/LU.hpp"
50	<	#include "math/DynamicRectMatrix.hpp"
51	<	#include "math/SquareMatrix3.hpp"
52	<	#include "utils/OOPSEConstant.hpp"
53	<	namespace oopse {
54	<	/**
49	<	* Reference:
50	<	* Beatriz Carrasco and Jose Gracia de la Torre, Hydrodynamic Properties of Rigid Particles:
51	<	* Comparison of Different Modeling and Computational Procedures.
52	<	* Biophysical Journal, 75(6), 3044, 1999
53	<	*/
48	>	namespace OpenMD {
49	>
50	>	bool HydrodynamicsModel::calcHydroProps(Shape* shape, RealType viscosity, RealType temperature) {
51	>	return false;
52	>	}
53	>
54	>	void HydrodynamicsModel::writeHydroProps(std::ostream& os) {
55
56	<	HydrodynamicsModel::HydrodynamicsModel(StuntDouble* sd, const DynamicProperty& extraParams) : sd_(sd){
57	<	DynamicProperty::const_iterator iter;
57	<
58	<	iter = extraParams.find("Viscosity");
59	<	if (iter != extraParams.end()) {
60	<	boost::any param = iter->second;
61	<	viscosity_ = boost::any_cast<double>(param);
62	<	}else {
63	<	std::cout << "HydrodynamicsModel Error\n" ;
64	<	}
65	<
66	<	iter = extraParams.find("Temperature");
67	<	if (iter != extraParams.end()) {
68	<	boost::any param = iter->second;
69	<	temperature_ = boost::any_cast<double>(param);
70	<	}else {
71	<	std::cout << "HydrodynamicsModel Error\n" ;
72	<	}
73	<	}
74	<
75	<	bool HydrodynamicsModel::calcHydrodyanmicsProps() {
76	<	if (!createBeads(beads_)) {
77	<	std::cout << "can not create beads" << std::endl;
78	<	return false;
79	<	}
80	<
81	<	//calcResistanceTensor();
82	<	calcDiffusionTensor();
83	<	return true;
84	<	}
85	<
86	<	void HydrodynamicsModel::calcResistanceTensor() {
87	<	}
88	<
89	<	void HydrodynamicsModel::calcDiffusionTensor() {
90	<	int nbeads = beads_.size();
91	<	DynamicRectMatrix<double> B(3*nbeads, 3*nbeads);
92	<	DynamicRectMatrix<double> C(3*nbeads, 3*nbeads);
93	<	Mat3x3d I;
94	<	I(0, 0) = 1.0;
95	<	I(1, 1) = 1.0;
96	<	I(2, 2) = 1.0;
56	>	Vector3d center;
57	>	Mat6x6d Xi, D;
58
59	<	for (std::size_t i = 0; i < nbeads; ++i) {
60	<	for (std::size_t j = 0; j < nbeads; ++j) {
61	<	Mat3x3d Tij;
101	<	if (i != j ) {
102	<	Vector3d Rij = beads_[i].pos - beads_[j].pos;
103	<	double rij = Rij.length();
104	<	double rij2 = rij * rij;
105	<	double sumSigma2OverRij2 = ((beads_[i].radius*beads_[i].radius) + (beads_[i].radius*beads_[i].radius)) / rij2;
106	<	Mat3x3d tmpMat;
107	<	tmpMat = outProduct(Rij, Rij) / rij2;
108	<	double constant = 8.0 * NumericConstant::PI * viscosity_ * rij;
109	<	Tij = ((1.0 + sumSigma2OverRij2/3.0) * I + (1.0 - sumSigma2OverRij2) * tmpMat ) / constant;
110	<	}else {
111	<	double constant = 1.0 / (6.0 * NumericConstant::PI * viscosity_ * beads_[i].radius);
112	<	Tij(0, 0) = constant;
113	<	Tij(1, 1) = constant;
114	<	Tij(2, 2) = constant;
115	<	}
116	<	B.setSubMatrix(i*3, j*3, Tij);
117	<	}
118	<	}
59	>	os << sd_->getType() << "\t";
60	>
61	>	//center of resistance
62
63	<	//invert B Matrix
121	<	invertMatrix(B, C);
63	>	center = cr_->getCOR();
64
65	<	//prepare U Matrix relative to arbitrary origin O(0.0, 0.0, 0.0)
124	<	std::vector<Mat3x3d> U;
125	<	for (int i = 0; i < nbeads; ++i) {
126	<	Mat3x3d currU;
127	<	currU.setupSkewMat(beads_[i].pos);
128	<	U.push_back(currU);
129	<	}
65	>	os << center[0] <<  "\t" << center[1] <<  "\t" << center[2] <<  "\t";
66
67	<	//calculate Xi matrix at arbitrary origin O
68	<	Mat3x3d Xitt;
133	<	Mat3x3d Xirr;
134	<	Mat3x3d Xitr;
67	>	//resistance tensor at center of resistance
68	>	//translation
69
70	<	//calculate the total volume
70	>	Xi = cr_->getXi();
71
72	<	double volume = 0.0;
73	<	for (std::vector<BeadParam>::iterator iter = beads_.begin(); iter != beads_.end(); ++iter) {
74	<	volume += 4.0/3.0 * NumericConstant::PI * pow((*iter).radius,3);
141	<	}
142	<
143	<	for (std::size_t i = 0; i < nbeads; ++i) {
144	<	for (std::size_t j = 0; j < nbeads; ++j) {
145	<	Mat3x3d Cij;
146	<	C.getSubMatrix(i*3, j*3, Cij);
147	<
148	<	Xitt += Cij;
149	<	Xitr += U[i] * Cij;
150	<	Xirr += -U[i] * Cij * U[j] + (6 * viscosity_ * volume) * I;
151	<	}
152	<	}
153	<
154	<	const double convertConstant = 6.023; //convert poise.angstrom to amu/fs
155	<	Xitt *= convertConstant;
156	<	Xitr *= convertConstant;
157	<	Xirr *= convertConstant;
158	<
159	<	double kt = OOPSEConstant::kB * temperature_;
160	<
161	<	Mat3x3d Dott; //translational diffusion tensor at arbitrary origin O
162	<	Mat3x3d Dorr; //rotational diffusion tensor at arbitrary origin O
163	<	Mat3x3d Dotr; //translation-rotation couplingl diffusion tensor at arbitrary origin O
164	<
165	<	const static Mat3x3d zeroMat(0.0);
72	>	os << Xi(0, 0) <<  "\t" << Xi(0, 1) <<  "\t" << Xi(0, 2) <<  "\t"
73	>	<< Xi(1, 0) <<  "\t" << Xi(1, 1) <<  "\t" << Xi(1, 2) <<  "\t"
74	>	<< Xi(2, 0) <<  "\t" << Xi(2, 1) <<  "\t" << Xi(2, 2) <<  "\t";
75
76	<	Mat3x3d XittInv(0.0);
77	<	XittInv = Xitt.inverse();
76	>	//rotation-translation
77	>	os << Xi(0, 3) <<  "\t" << Xi(0, 4) <<  "\t" << Xi(0, 5) <<  "\t"
78	>	<< Xi(1, 3) <<  "\t" << Xi(1, 4) <<  "\t" << Xi(1, 5) <<  "\t"
79	>	<< Xi(2, 3) <<  "\t" << Xi(2, 4) <<  "\t" << Xi(2, 5) <<  "\t";
80
81	<	Mat3x3d XirrInv;
82	<	XirrInv = Xirr.inverse();
83	<
84	<	Mat3x3d tmp;
174	<	Mat3x3d tmpInv;
175	<	tmp = Xitt - Xitr.transpose() * XirrInv * Xitr;
176	<	tmpInv = tmp.inverse();
177	<
178	<	Dott = tmpInv;
179	<	Dotr = -XirrInv * Xitr * tmpInv;
81	>	//translation-rotation
82	>	os << Xi(3, 0) <<  "\t" << Xi(3, 1) <<  "\t" << Xi(3, 2) <<  "\t"
83	>	<< Xi(4, 0) <<  "\t" << Xi(4, 1) <<  "\t" << Xi(4, 2) <<  "\t"
84	>	<< Xi(5, 0) <<  "\t" << Xi(5, 1) <<  "\t" << Xi(5, 2) <<  "\t";
85
86	<	tmp = Xirr - Xitr * XittInv * Xitr.transpose();
87	<	tmpInv = tmp.inverse();
86	>	//rotation
87	>	os << Xi(3, 3) <<  "\t" << Xi(3, 4) <<  "\t" << Xi(3, 5) <<  "\t"
88	>	<< Xi(4, 3) <<  "\t" << Xi(4, 4) <<  "\t" << Xi(4, 5) <<  "\t"
89	>	<< Xi(5, 3) <<  "\t" << Xi(5, 4) <<  "\t" << Xi(5, 5) <<  "\t";
90
91	<	Dorr = tmpInv;
91	>
92	>	//diffusion tensor at center of resistance
93	>	//translation
94
95	<	//calculate center of diffusion
187	<	tmp(0, 0) = Dorr(1, 1) + Dorr(2, 2);
188	<	tmp(0, 1) = - Dorr(0, 1);
189	<	tmp(0, 2) = -Dorr(0, 2);
190	<	tmp(1, 0) = -Dorr(0, 1);
191	<	tmp(1, 1) = Dorr(0, 0)  + Dorr(2, 2);
192	<	tmp(1, 2) = -Dorr(1, 2);
193	<	tmp(2, 0) = -Dorr(0, 2);
194	<	tmp(2, 1) = -Dorr(1, 2);
195	<	tmp(2, 2) = Dorr(1, 1) + Dorr(0, 0);
95	>	D = cr_->getD();
96
97	<	Vector3d tmpVec;
98	<	tmpVec[0] = Dotr(1, 2) - Dotr(2, 1);
99	<	tmpVec[1] = Dotr(2, 0) - Dotr(0, 2);
200	<	tmpVec[2] = Dotr(0, 1) - Dotr(1, 0);
201	<
202	<	tmpInv = tmp.inverse();
97	>	os << D(0, 0) <<  "\t" << D(0, 1) <<  "\t" << D(0, 2) <<  "\t"
98	>	<< D(1, 0) <<  "\t" << D(1, 1) <<  "\t" << D(1, 2) <<  "\t"
99	>	<< D(2, 0) <<  "\t" << D(2, 1) <<  "\t" << D(2, 2) <<  "\t";
100
101	<	Vector3d rod = tmpInv * tmpVec;
102	<
103	<	//calculate Diffusion Tensor at center of diffusion
104	<	Mat3x3d Uod;
208	<	Uod.setupSkewMat(rod);
101	>	//rotation-translation
102	>	os << D(0, 3) <<  "\t" << D(0, 4) <<  "\t" << D(0, 5) <<  "\t"
103	>	<< D(1, 3) <<  "\t" << D(1, 4) <<  "\t" << D(1, 5) <<  "\t"
104	>	<< D(2, 3) <<  "\t" << D(2, 4) <<  "\t" << D(2, 5) <<  "\t";
105
106	<	Mat3x3d Ddtt; //translational diffusion tensor at diffusion center
107	<	Mat3x3d Ddtr; //rotational diffusion tensor at diffusion center
108	<	Mat3x3d Ddrr; //translation-rotation couplingl diffusion tensor at diffusion tensor
106	>	//translation-rotation
107	>	os << D(3, 0) <<  "\t" << D(3, 1) <<  "\t" << D(3, 2) <<  "\t"
108	>	<< D(4, 0) <<  "\t" << D(4, 1) <<  "\t" << D(4, 2) <<  "\t"
109	>	<< D(5, 0) <<  "\t" << D(5, 1) <<  "\t" << D(5, 2) <<  "\t";
110
111	<	Ddtt = Dott - Uod * Dorr * Uod + Dotr.transpose() * Uod - Uod * Dotr;
112	<	Ddrr = Dorr;
113	<	Ddtr = Dotr + Dorr * Uod;
111	>	//rotation
112	>	os << D(3, 3) <<  "\t" << D(3, 4) <<  "\t" << D(3, 5) <<  "\t"
113	>	<< D(4, 3) <<  "\t" << D(4, 4) <<  "\t" << D(4, 5) <<  "\t"
114	>	<< D(5, 3) <<  "\t" << D(5, 4) <<  "\t" << D(5, 5) <<  "\t";
115	>
116	>	//---------------------------------------------------------------------
117	>
118	>	//center of diffusion
119
120	<	SquareMatrix<double, 6> Dd;
219	<	Dd.setSubMatrix(0, 0, Ddtt);
220	<	Dd.setSubMatrix(0, 3, Ddtr.transpose());
221	<	Dd.setSubMatrix(3, 0, Ddtr);
222	<	Dd.setSubMatrix(3, 3, Ddrr);
223	<	SquareMatrix<double, 6> Xid;
224	<	Ddtt *= kt;
225	<	Ddtr *=kt;
226	<	Ddrr *= kt;
227	<	invertMatrix(Dd, Xid);
120	>	center = cd_->getCOR();
121
122	<
230	<
231	<	//Xidtt in units of kcal*fs*mol^-1*Ang^-2
232	<	//Xid /= OOPSEConstant::energyConvert;
233	<	Xid *= OOPSEConstant::kb * temperature_;
234	<	props_.diffCenter = rod;
235	<	props_.Ddtt = Ddtt;
236	<	props_.Ddtr = Ddtr;
237	<	props_.Ddrr = Ddrr;
238	<	Xid.getSubMatrix(0, 0, props_.Xidtt);
239	<	Xid.getSubMatrix(0, 3, props_.Xidrt);
240	<	Xid.getSubMatrix(3, 0, props_.Xidtr);
241	<	Xid.getSubMatrix(3, 3, props_.Xidrr);
242	<
243	<
244	<	std::cout << "viscosity = " << viscosity_ << std::endl;
245	<	std::cout << "temperature = " << temperature_ << std::endl;
246	<	std::cout << "center of diffusion :" << std::endl;
247	<	std::cout << rod << std::endl;
248	<	std::cout << "diffusion tensor at center of diffusion " << std::endl;
249	<	std::cout << "translation(A^2/fs) :" << std::endl;
250	<	std::cout << Ddtt << std::endl;
251	<	std::cout << "translation-rotation(A^3/fs):" << std::endl;
252	<	std::cout << Ddtr << std::endl;
253	<	std::cout << "rotation(A^4/fs):" << std::endl;
254	<	std::cout << Ddrr << std::endl;
255	<
256	<	std::cout << "resistance tensor at center of diffusion " << std::endl;
257	<	std::cout << "translation(kcal*fs*mol^-1*Ang^-2) :" << std::endl;
258	<	std::cout << props_.Xidtt << std::endl;
259	<	std::cout << "rotation-translation (kcal*fs*mol^-1*Ang^-3):" << std::endl;
260	<	std::cout << props_.Xidrt << std::endl;
261	<	std::cout << "translation-rotation(kcal*fs*mol^-1*Ang^-3):" << std::endl;
262	<	std::cout << props_.Xidtr << std::endl;
263	<	std::cout << "rotation(kcal*fs*mol^-1*Ang^-4):" << std::endl;
264	<	std::cout << props_.Xidrr << std::endl;
122	>	os << center[0] <<  "\t" << center[1] <<  "\t" << center[2] <<  "\t";
123
124	<
125	<	}
124	>	//resistance tensor at center of diffusion
125	>	//translation
126
127	<	void HydrodynamicsModel::writeBeads(std::ostream& os) {
270	<	std::vector<BeadParam>::iterator iter;
271	<	os << beads_.size() << std::endl;
272	<	os << "Generated by Hydro" << std::endl;
273	<	for (iter = beads_.begin(); iter != beads_.end(); ++iter) {
274	<	os << iter->atomName << "\t" << iter->pos[0] << "\t" << iter->pos[1] << "\t" << iter->pos[2] << std::endl;
275	<	}
127	>	Xi = cd_->getXi();
128
129	<	}
130	<
131	<	void HydrodynamicsModel::writeDiffCenterAndDiffTensor(std::ostream& os) {
280	<
281	<	os << sd_->getType() << "\t";
282	<	os << props_.diffCenter[0] << "\t" << props_.diffCenter[1] << "\t" << props_.diffCenter[2] << "\t";
283	<
284	<	os << props_.Ddtt(0, 0) << "\t" << props_.Ddtt(0, 1) << "\t" << props_.Ddtt(0, 2) << "\t"
285	<	<< props_.Ddtt(1, 0) << "\t" << props_.Ddtt(1, 1) << "\t" << props_.Ddtt(1, 2) << "\t"
286	<	<< props_.Ddtt(2, 0) << "\t" << props_.Ddtt(2, 1) << "\t" << props_.Ddtt(2, 2) << "\t";
129	>	os << Xi(0, 0) <<  "\t" << Xi(0, 1) <<  "\t" << Xi(0, 2) <<  "\t"
130	>	<< Xi(1, 0) <<  "\t" << Xi(1, 1) <<  "\t" << Xi(1, 2) <<  "\t"
131	>	<< Xi(2, 0) <<  "\t" << Xi(2, 1) <<  "\t" << Xi(2, 2) <<  "\t";
132
133	<	os << props_.Ddtr(0, 0) << "\t" << props_.Ddtr(0, 1) << "\t" << props_.Ddtr(0, 2) << "\t"
134	<	<< props_.Ddtr(1, 0) << "\t" << props_.Ddtr(1, 1) << "\t" << props_.Ddtr(1, 2) << "\t"
135	<	<< props_.Ddtr(2, 0) << "\t" << props_.Ddtr(2, 1) << "\t" << props_.Ddtr(2, 2) << "\t";
133	>	//rotation-translation
134	>	os << Xi(0, 3) <<  "\t" << Xi(0, 4) <<  "\t" << Xi(0, 5) <<  "\t"
135	>	<< Xi(1, 3) <<  "\t" << Xi(1, 4) <<  "\t" << Xi(1, 5) <<  "\t"
136	>	<< Xi(2, 3) <<  "\t" << Xi(2, 4) <<  "\t" << Xi(2, 5) <<  "\t";
137	>
138	>	//translation-rotation
139	>	os << Xi(3, 0) <<  "\t" << Xi(3, 1) <<  "\t" << Xi(3, 2) <<  "\t"
140	>	<< Xi(4, 0) <<  "\t" << Xi(4, 1) <<  "\t" << Xi(4, 2) <<  "\t"
141	>	<< Xi(5, 0) <<  "\t" << Xi(5, 1) <<  "\t" << Xi(5, 2) <<  "\t";
142	>
143	>	//rotation
144	>	os << Xi(3, 3) <<  "\t" << Xi(3, 4) <<  "\t" << Xi(3, 5) <<  "\t"
145	>	<< Xi(4, 3) <<  "\t" << Xi(4, 4) <<  "\t" << Xi(4, 5) <<  "\t"
146	>	<< Xi(5, 3) <<  "\t" << Xi(5, 4) <<  "\t" << Xi(5, 5) <<  "\t";
147	>
148	>
149	>	//diffusion tensor at center of diffusion
150	>	//translation
151
152	<	os << props_.Ddrr(0, 0) << "\t" << props_.Ddrr(0, 1) << "\t" << props_.Ddrr(0, 2) << "\t"
293	<	<< props_.Ddrr(1, 0) << "\t" << props_.Ddrr(1, 1) << "\t" << props_.Ddrr(1, 2) << "\t"
294	<	<< props_.Ddrr(2, 0) << "\t" << props_.Ddrr(2, 1) << "\t" << props_.Ddrr(2, 2) <<"\t";
152	>	D = cd_->getD();
153
154	<	os << props_.Xidtt(0, 0) << "\t" << props_.Xidtt(0, 1) << "\t" << props_.Xidtt(0, 2) << "\t"
155	<	<< props_.Xidtt(1, 0) << "\t" << props_.Xidtt(1, 1) << "\t" << props_.Xidtt(1, 2) << "\t"
156	<	<< props_.Xidtt(2, 0) << "\t" << props_.Xidtt(2, 1) << "\t" << props_.Xidtt(2, 2) << "\t";
299	<
300	<	os << props_.Xidrt(0, 0) << "\t" << props_.Xidrt(0, 1) << "\t" << props_.Xidrt(0, 2) << "\t"
301	<	<< props_.Xidrt(1, 0) << "\t" << props_.Xidrt(1, 1) << "\t" << props_.Xidrt(1, 2) << "\t"
302	<	<< props_.Xidrt(2, 0) << "\t" << props_.Xidrt(2, 1) << "\t" << props_.Xidrt(2, 2) << "\t";
154	>	os << D(0, 0) <<  "\t" << D(0, 1) <<  "\t" << D(0, 2) <<  "\t"
155	>	<< D(1, 0) <<  "\t" << D(1, 1) <<  "\t" << D(1, 2) <<  "\t"
156	>	<< D(2, 0) <<  "\t" << D(2, 1) <<  "\t" << D(2, 2) <<  "\t";
157
158	<	os << props_.Xidtr(0, 0) << "\t" << props_.Xidtr(0, 1) << "\t" << props_.Xidtr(0, 2) << "\t"
159	<	<< props_.Xidtr(1, 0) << "\t" << props_.Xidtr(1, 1) << "\t" << props_.Xidtr(1, 2) << "\t"
160	<	<< props_.Xidtr(2, 0) << "\t" << props_.Xidtr(2, 1) << "\t" << props_.Xidtr(2, 2) << "\t";
161	<
308	<	os << props_.Xidrr(0, 0) << "\t" << props_.Xidrr(0, 1) << "\t" << props_.Xidrr(0, 2) << "\t"
309	<	<< props_.Xidrr(1, 0) << "\t" << props_.Xidrr(1, 1) << "\t" << props_.Xidrr(1, 2) << "\t"
310	<	<< props_.Xidrr(2, 0) << "\t" << props_.Xidrr(2, 1) << "\t" << props_.Xidrr(2, 2) << std::endl;
158	>	//rotation-translation
159	>	os << D(0, 3) <<  "\t" << D(0, 4) <<  "\t" << D(0, 5) <<  "\t"
160	>	<< D(1, 3) <<  "\t" << D(1, 4) <<  "\t" << D(1, 5) <<  "\t"
161	>	<< D(2, 3) <<  "\t" << D(2, 4) <<  "\t" << D(2, 5) <<  "\t";
162
163	+	//translation-rotation
164	+	os << D(3, 0) <<  "\t" << D(3, 1) <<  "\t" << D(3, 2) <<  "\t"
165	+	<< D(4, 0) <<  "\t" << D(4, 1) <<  "\t" << D(4, 2) <<  "\t"
166	+	<< D(5, 0) <<  "\t" << D(5, 1) <<  "\t" << D(5, 2) <<  "\t";
167	+
168	+	//rotation
169	+	os << D(3, 3) <<  "\t" << D(3, 4) <<  "\t" << D(3, 5) <<  "\t"
170	+	<< D(4, 3) <<  "\t" << D(4, 4) <<  "\t" << D(4, 5) <<  "\t"
171	+	<< D(5, 3) <<  "\t" << D(5, 4) <<  "\t" << D(5, 5) <<  "\n";
172	+
173	+	}
174	+
175		}
313	–
314	–	}

Comparing trunk/src/applications/hydrodynamics/HydrodynamicsModel.cpp (property svn:keywords):
Revision 904 by tim, Thu Mar 16 22:50:48 2006 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

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

Diff Legend

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