ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/integrators/LDForceManager.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/integrators/LDForceManager.cpp (file contents):
Revision 2632 by tim, Thu Mar 16 22:50:48 2006 UTC vs.
Revision 2787 by gezelter, Mon Jun 5 18:24:45 2006 UTC

# Line 42 | Line 42 | namespace oopse {
42   #include "integrators/LDForceManager.hpp"
43   #include "math/CholeskyDecomposition.hpp"
44   #include "utils/OOPSEConstant.hpp"
45 + #include "hydrodynamics/Sphere.hpp"
46 + #include "hydrodynamics/Ellipsoid.hpp"
47 + #include "openbabel/mol.hpp"
48 +
49 + using namespace OpenBabel;
50   namespace oopse {
51  
52    LDForceManager::LDForceManager(SimInfo* info) : ForceManager(info){
53      Globals* simParams = info->getSimParams();
54 <    std::map<std::string, HydroProp> hydroPropMap;
55 <    if (simParams->haveHydroPropFile()) {
56 <        hydroPropMap = parseFrictionFile(simParams->getHydroPropFile());
57 <    } else {
58 <        //error
54 >        
55 >    sphericalBoundaryConditions_ = false;
56 >    if (simParams->getUseSphericalBoundaryConditions()) {
57 >      sphericalBoundaryConditions_ = true;
58 >      if (simParams->haveLangevinBufferRadius()) {
59 >        langevinBufferRadius_ = simParams->getLangevinBufferRadius();
60 >      } else {
61 >        sprintf( painCave.errMsg,
62 >                 "langevinBufferRadius must be specified "
63 >                 "when useSphericalBoundaryConditions is turned on.\n");
64 >        painCave.severity = OOPSE_ERROR;
65 >        painCave.isFatal = 1;
66 >        simError();  
67 >      }
68 >    
69 >      if (simParams->haveFrozenBufferRadius()) {
70 >        frozenBufferRadius_ = simParams->getFrozenBufferRadius();
71 >      } else {
72 >        sprintf( painCave.errMsg,
73 >                 "frozenBufferRadius must be specified "
74 >                 "when useSphericalBoundaryConditions is turned on.\n");
75 >        painCave.severity = OOPSE_ERROR;
76 >        painCave.isFatal = 1;
77 >        simError();  
78 >      }
79 >
80 >      if (frozenBufferRadius_ < langevinBufferRadius_) {
81 >        sprintf( painCave.errMsg,
82 >                 "frozenBufferRadius has been set smaller than the "
83 >                 "langevinBufferRadius.  This is probably an error.\n");
84 >        painCave.severity = OOPSE_WARNING;
85 >        painCave.isFatal = 0;
86 >        simError();  
87 >      }
88      }
89  
90 <    SimInfo::MoleculeIterator i;
91 <    Molecule::IntegrableObjectIterator  j;
90 >    // Build the hydroProp map:
91 >    std::map<std::string, HydroProp*> hydroPropMap;
92 >
93      Molecule* mol;
94      StuntDouble* integrableObject;
95 <    for (mol = info->beginMolecule(i); mol != NULL; mol = info->nextMolecule(i)) {
96 <      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
97 <              integrableObject = mol->nextIntegrableObject(j)) {
98 <            std::map<std::string, HydroProp>::iterator iter = hydroPropMap.find(integrableObject->getType());
99 <            if (iter != hydroPropMap.end()) {
100 <                hydroProps_.push_back(iter->second);
95 >    SimInfo::MoleculeIterator i;
96 >    Molecule::IntegrableObjectIterator  j;              
97 >    bool needHydroPropFile = false;
98 >    
99 >    for (mol = info->beginMolecule(i); mol != NULL;
100 >         mol = info->nextMolecule(i)) {
101 >      for (integrableObject = mol->beginIntegrableObject(j);
102 >           integrableObject != NULL;
103 >           integrableObject = mol->nextIntegrableObject(j)) {
104 >        
105 >        if (integrableObject->isRigidBody()) {
106 >          RigidBody* rb = static_cast<RigidBody*>(integrableObject);
107 >          if (rb->getNumAtoms() > 1) needHydroPropFile = true;
108 >        }
109 >        
110 >      }
111 >    }
112 >        
113 >
114 >    if (needHydroPropFile) {              
115 >      if (simParams->haveHydroPropFile()) {
116 >        hydroPropMap = parseFrictionFile(simParams->getHydroPropFile());
117 >      } else {              
118 >        sprintf( painCave.errMsg,
119 >                 "HydroPropFile must be set to a file name if Langevin\n"
120 >                 "\tDynamics is specified for rigidBodies which contain more\n"
121 >                 "\tthan one atom.  To create a HydroPropFile, run \"Hydro\".\n");
122 >        painCave.severity = OOPSE_ERROR;
123 >        painCave.isFatal = 1;
124 >        simError();  
125 >      }      
126 >
127 >      for (mol = info->beginMolecule(i); mol != NULL;
128 >           mol = info->nextMolecule(i)) {
129 >        for (integrableObject = mol->beginIntegrableObject(j);
130 >             integrableObject != NULL;
131 >             integrableObject = mol->nextIntegrableObject(j)) {
132 >
133 >          std::map<std::string, HydroProp*>::iterator iter = hydroPropMap.find(integrableObject->getType());
134 >          if (iter != hydroPropMap.end()) {
135 >            hydroProps_.push_back(iter->second);
136 >          } else {
137 >            sprintf( painCave.errMsg,
138 >                     "Can not find resistance tensor for atom [%s]\n", integrableObject->getType().c_str());
139 >            painCave.severity = OOPSE_ERROR;
140 >            painCave.isFatal = 1;
141 >            simError();  
142 >          }        
143 >        }
144 >      }
145 >    } else {
146 >      
147 >      std::map<std::string, HydroProp*> hydroPropMap;
148 >      for (mol = info->beginMolecule(i); mol != NULL;
149 >           mol = info->nextMolecule(i)) {
150 >        for (integrableObject = mol->beginIntegrableObject(j);
151 >             integrableObject != NULL;
152 >             integrableObject = mol->nextIntegrableObject(j)) {
153 >          Shape* currShape = NULL;
154 >          if (integrableObject->isDirectionalAtom()) {
155 >            DirectionalAtom* dAtom = static_cast<DirectionalAtom*>(integrableObject);
156 >            AtomType* atomType = dAtom->getAtomType();
157 >            if (atomType->isGayBerne()) {
158 >              DirectionalAtomType* dAtomType = dynamic_cast<DirectionalAtomType*>(atomType);
159 >              
160 >              GenericData* data = dAtomType->getPropertyByName("GayBerne");
161 >              if (data != NULL) {
162 >                GayBerneParamGenericData* gayBerneData = dynamic_cast<GayBerneParamGenericData*>(data);
163 >                
164 >                if (gayBerneData != NULL) {  
165 >                  GayBerneParam gayBerneParam = gayBerneData->getData();
166 >                  currShape = new Ellipsoid(V3Zero,
167 >                                            gayBerneParam.GB_d / 2.0,
168 >                                            gayBerneParam.GB_l / 2.0,
169 >                                            Mat3x3d::identity());
170 >                } else {
171 >                  sprintf( painCave.errMsg,
172 >                           "Can not cast GenericData to GayBerneParam\n");
173 >                  painCave.severity = OOPSE_ERROR;
174 >                  painCave.isFatal = 1;
175 >                  simError();  
176 >                }
177 >              } else {
178 >                sprintf( painCave.errMsg, "Can not find Parameters for GayBerne\n");
179 >                painCave.severity = OOPSE_ERROR;
180 >                painCave.isFatal = 1;
181 >                simError();    
182 >              }
183 >            }
184 >          } else {
185 >            Atom* atom = static_cast<Atom*>(integrableObject);
186 >            AtomType* atomType = atom->getAtomType();
187 >            if (atomType->isLennardJones()){
188 >              GenericData* data = atomType->getPropertyByName("LennardJones");
189 >              if (data != NULL) {
190 >                LJParamGenericData* ljData = dynamic_cast<LJParamGenericData*>(data);
191 >                
192 >                if (ljData != NULL) {
193 >                  LJParam ljParam = ljData->getData();
194 >                  currShape = new Sphere(atom->getPos(), ljParam.sigma/2.0);
195 >                } else {
196 >                  sprintf( painCave.errMsg,
197 >                           "Can not cast GenericData to LJParam\n");
198 >                  painCave.severity = OOPSE_ERROR;
199 >                  painCave.isFatal = 1;
200 >                  simError();          
201 >                }      
202 >              }
203              } else {
204 <                //error
204 >              int obanum = etab.GetAtomicNum((atom->getType()).c_str());
205 >              if (obanum != 0) {
206 >                currShape = new Sphere(atom->getPos(), etab.GetVdwRad(obanum));
207 >              } else {
208 >                sprintf( painCave.errMsg,
209 >                         "Could not find atom type in default element.txt\n");
210 >                painCave.severity = OOPSE_ERROR;
211 >                painCave.isFatal = 1;
212 >                simError();          
213 >              }
214              }
215 <            
216 <           }
215 >          }
216 >          HydroProp* currHydroProp = currShape->getHydroProp(simParams->getViscosity(),simParams->getTargetTemp());
217 >          std::map<std::string, HydroProp*>::iterator iter = hydroPropMap.find(integrableObject->getType());
218 >          if (iter != hydroPropMap.end())
219 >            hydroProps_.push_back(iter->second);
220 >          else {
221 >            currHydroProp->complete();
222 >            hydroPropMap.insert(std::map<std::string, HydroProp*>::value_type(integrableObject->getType(), currHydroProp));
223 >            hydroProps_.push_back(currHydroProp);
224 >          }
225 >        }
226 >      }
227      }
228      variance_ = 2.0 * OOPSEConstant::kb*simParams->getTargetTemp()/simParams->getDt();
229 <  }
230 <  std::map<std::string, HydroProp> LDForceManager::parseFrictionFile(const std::string& filename) {
231 <    std::map<std::string, HydroProp> props;
229 >  }  
230 >
231 >  std::map<std::string, HydroProp*> LDForceManager::parseFrictionFile(const std::string& filename) {
232 >    std::map<std::string, HydroProp*> props;
233      std::ifstream ifs(filename.c_str());
234      if (ifs.is_open()) {
235 <
235 >      
236      }
237 <
237 >    
238      const unsigned int BufferSize = 65535;
239      char buffer[BufferSize];  
240      while (ifs.getline(buffer, BufferSize)) {
241 <        StringTokenizer tokenizer(buffer);
242 <        HydroProp currProp;
86 <        if (tokenizer.countTokens() >= 67) {
87 <            std::string atomName = tokenizer.nextToken();
88 <            currProp.cod[0] = tokenizer.nextTokenAsDouble();
89 <            currProp.cod[1] = tokenizer.nextTokenAsDouble();
90 <            currProp.cod[2] = tokenizer.nextTokenAsDouble();
91 <
92 <            currProp.Ddtt(0,0) = tokenizer.nextTokenAsDouble();
93 <            currProp.Ddtt(0,1) = tokenizer.nextTokenAsDouble();
94 <            currProp.Ddtt(0,2) = tokenizer.nextTokenAsDouble();
95 <            currProp.Ddtt(1,0) = tokenizer.nextTokenAsDouble();
96 <            currProp.Ddtt(1,1) = tokenizer.nextTokenAsDouble();
97 <            currProp.Ddtt(1,2) = tokenizer.nextTokenAsDouble();
98 <            currProp.Ddtt(2,0) = tokenizer.nextTokenAsDouble();
99 <            currProp.Ddtt(2,1) = tokenizer.nextTokenAsDouble();
100 <            currProp.Ddtt(2,2) = tokenizer.nextTokenAsDouble();
101 <
102 <            currProp.Ddtr(0,0) = tokenizer.nextTokenAsDouble();
103 <            currProp.Ddtr(0,1) = tokenizer.nextTokenAsDouble();
104 <            currProp.Ddtr(0,2) = tokenizer.nextTokenAsDouble();
105 <            currProp.Ddtr(1,0) = tokenizer.nextTokenAsDouble();
106 <            currProp.Ddtr(1,1) = tokenizer.nextTokenAsDouble();
107 <            currProp.Ddtr(1,2) = tokenizer.nextTokenAsDouble();
108 <            currProp.Ddtr(2,0) = tokenizer.nextTokenAsDouble();
109 <            currProp.Ddtr(2,1) = tokenizer.nextTokenAsDouble();
110 <            currProp.Ddtr(2,2) = tokenizer.nextTokenAsDouble();
111 <
112 <            currProp.Ddrr(0,0) = tokenizer.nextTokenAsDouble();
113 <            currProp.Ddrr(0,1) = tokenizer.nextTokenAsDouble();
114 <            currProp.Ddrr(0,2) = tokenizer.nextTokenAsDouble();
115 <            currProp.Ddrr(1,0) = tokenizer.nextTokenAsDouble();
116 <            currProp.Ddrr(1,1) = tokenizer.nextTokenAsDouble();
117 <            currProp.Ddrr(1,2) = tokenizer.nextTokenAsDouble();
118 <            currProp.Ddrr(2,0) = tokenizer.nextTokenAsDouble();
119 <            currProp.Ddrr(2,1) = tokenizer.nextTokenAsDouble();
120 <            currProp.Ddrr(2,2) = tokenizer.nextTokenAsDouble();                
121 <
122 <            currProp.Xidtt(0,0) = tokenizer.nextTokenAsDouble();
123 <            currProp.Xidtt(0,1) = tokenizer.nextTokenAsDouble();
124 <            currProp.Xidtt(0,2) = tokenizer.nextTokenAsDouble();
125 <            currProp.Xidtt(1,0) = tokenizer.nextTokenAsDouble();
126 <            currProp.Xidtt(1,1) = tokenizer.nextTokenAsDouble();
127 <            currProp.Xidtt(1,2) = tokenizer.nextTokenAsDouble();
128 <            currProp.Xidtt(2,0) = tokenizer.nextTokenAsDouble();
129 <            currProp.Xidtt(2,1) = tokenizer.nextTokenAsDouble();
130 <            currProp.Xidtt(2,2) = tokenizer.nextTokenAsDouble();
131 <
132 <            currProp.Xidrt(0,0) = tokenizer.nextTokenAsDouble();
133 <            currProp.Xidrt(0,1) = tokenizer.nextTokenAsDouble();
134 <            currProp.Xidrt(0,2) = tokenizer.nextTokenAsDouble();
135 <            currProp.Xidrt(1,0) = tokenizer.nextTokenAsDouble();
136 <            currProp.Xidrt(1,1) = tokenizer.nextTokenAsDouble();
137 <            currProp.Xidrt(1,2) = tokenizer.nextTokenAsDouble();
138 <            currProp.Xidrt(2,0) = tokenizer.nextTokenAsDouble();
139 <            currProp.Xidrt(2,1) = tokenizer.nextTokenAsDouble();
140 <            currProp.Xidrt(2,2) = tokenizer.nextTokenAsDouble();
141 <            
142 <            currProp.Xidtr(0,0) = tokenizer.nextTokenAsDouble();
143 <            currProp.Xidtr(0,1) = tokenizer.nextTokenAsDouble();
144 <            currProp.Xidtr(0,2) = tokenizer.nextTokenAsDouble();
145 <            currProp.Xidtr(1,0) = tokenizer.nextTokenAsDouble();
146 <            currProp.Xidtr(1,1) = tokenizer.nextTokenAsDouble();
147 <            currProp.Xidtr(1,2) = tokenizer.nextTokenAsDouble();
148 <            currProp.Xidtr(2,0) = tokenizer.nextTokenAsDouble();
149 <            currProp.Xidtr(2,1) = tokenizer.nextTokenAsDouble();
150 <            currProp.Xidtr(2,2) = tokenizer.nextTokenAsDouble();
151 <
152 <            currProp.Xidrr(0,0) = tokenizer.nextTokenAsDouble();
153 <            currProp.Xidrr(0,1) = tokenizer.nextTokenAsDouble();
154 <            currProp.Xidrr(0,2) = tokenizer.nextTokenAsDouble();
155 <            currProp.Xidrr(1,0) = tokenizer.nextTokenAsDouble();
156 <            currProp.Xidrr(1,1) = tokenizer.nextTokenAsDouble();
157 <            currProp.Xidrr(1,2) = tokenizer.nextTokenAsDouble();
158 <            currProp.Xidrr(2,0) = tokenizer.nextTokenAsDouble();
159 <            currProp.Xidrr(2,1) = tokenizer.nextTokenAsDouble();
160 <            currProp.Xidrr(2,2) = tokenizer.nextTokenAsDouble();
161 <            props.insert(std::map<std::string, HydroProp>::value_type(atomName, currProp));
162 <        }
241 >      HydroProp* currProp = new HydroProp(buffer);
242 >      props.insert(std::map<std::string, HydroProp*>::value_type(currProp->getName(), currProp));
243      }
244  
245      return props;
246    }
247 <  
247 >  
248    void LDForceManager::postCalculation() {
249      SimInfo::MoleculeIterator i;
250      Molecule::IntegrableObjectIterator  j;
# Line 177 | Line 257 | namespace oopse {
257      Mat3x3d Atrans;
258      Vector3d Tb;
259      Vector3d ji;
260 <    double mass;
260 >    RealType mass;
261      unsigned int index = 0;
262 +    bool doLangevinForces;
263 +    bool freezeMolecule;
264 +    int fdf;
265 +    
266 +    fdf = 0;
267      for (mol = info_->beginMolecule(i); mol != NULL; mol = info_->nextMolecule(i)) {
183 –      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
184 –           integrableObject = mol->nextIntegrableObject(j)) {
268  
269 +      doLangevinForces = true;          
270 +      freezeMolecule = false;
271 +
272 +      if (sphericalBoundaryConditions_) {
273 +        
274 +        Vector3d molPos = mol->getCom();
275 +        RealType molRad = molPos.length();
276 +        
277 +        doLangevinForces = false;
278 +        
279 +        if (molRad > langevinBufferRadius_) {
280 +          doLangevinForces = true;
281 +          freezeMolecule = false;
282 +        }
283 +        if (molRad > frozenBufferRadius_) {
284 +          doLangevinForces = false;
285 +          freezeMolecule = true;
286 +        }
287 +      }
288 +      
289 +      for (integrableObject = mol->beginIntegrableObject(j); integrableObject != NULL;
290 +           integrableObject = mol->nextIntegrableObject(j)) {
291 +          
292 +        if (freezeMolecule)
293 +          fdf += integrableObject->freeze();
294 +        
295 +        if (doLangevinForces) {          
296            vel =integrableObject->getVel();
297            if (integrableObject->isDirectional()){
298 <             //calculate angular velocity in lab frame
299 <             Mat3x3d I = integrableObject->getI();
300 <             Vector3d angMom = integrableObject->getJ();
301 <             Vector3d omega;
302 <
303 <             if (integrableObject->isLinear()) {
304 <                int linearAxis = integrableObject->linearAxis();
305 <                int l = (linearAxis +1 )%3;
306 <                int m = (linearAxis +2 )%3;
307 <                omega[l] = angMom[l] /I(l, l);
308 <                omega[m] = angMom[m] /I(m, m);
309 <                
310 <             } else {
311 <                 omega[0] = angMom[0] /I(0, 0);
312 <                 omega[1] = angMom[1] /I(1, 1);
313 <                 omega[2] = angMom[2] /I(2, 2);
314 <             }
315 <
316 <             //apply friction force and torque at center of diffusion
317 <             A = integrableObject->getA();
318 <             Atrans = A.transpose();
319 <             Vector3d rcd = Atrans * hydroProps_[index].cod;  
320 <             Vector3d vcd = vel + cross(omega, rcd);
321 <             vcd = A* vcd;
322 <             Vector3d frictionForce = -(hydroProps_[index].Xidtt * vcd + hydroProps_[index].Xidrt * omega);
323 <             frictionForce = Atrans*frictionForce;
324 <             integrableObject->addFrc(frictionForce);
325 <             Vector3d frictionTorque = - (hydroProps_[index].Xidtr * vcd + hydroProps_[index].Xidrr * omega);
326 <             frictionTorque = Atrans*frictionTorque;
327 <             integrableObject->addTrq(frictionTorque+ cross(rcd, frictionForce));
328 <            
329 <             //apply random force and torque at center of diffustion
330 <             Vector3d randomForce;
331 <             Vector3d randomTorque;
332 <             genRandomForceAndTorque(randomForce, randomTorque, index, variance_);
333 <             randomForce = Atrans*randomForce;
334 <             randomTorque = Atrans* randomTorque;
335 <             integrableObject->addFrc(randomForce);            
336 <             integrableObject->addTrq(randomTorque + cross(rcd, randomForce ));
337 <            
298 >            //calculate angular velocity in lab frame
299 >            Mat3x3d I = integrableObject->getI();
300 >            Vector3d angMom = integrableObject->getJ();
301 >            Vector3d omega;
302 >            
303 >            if (integrableObject->isLinear()) {
304 >              int linearAxis = integrableObject->linearAxis();
305 >              int l = (linearAxis +1 )%3;
306 >              int m = (linearAxis +2 )%3;
307 >              omega[l] = angMom[l] /I(l, l);
308 >              omega[m] = angMom[m] /I(m, m);
309 >              
310 >            } else {
311 >              omega[0] = angMom[0] /I(0, 0);
312 >              omega[1] = angMom[1] /I(1, 1);
313 >              omega[2] = angMom[2] /I(2, 2);
314 >            }
315 >            
316 >            //apply friction force and torque at center of resistance
317 >            A = integrableObject->getA();
318 >            Atrans = A.transpose();
319 >            Vector3d rcr = Atrans * hydroProps_[index]->getCOR();  
320 >            Vector3d vcdLab = vel + cross(omega, rcr);
321 >            Vector3d vcdBody = A* vcdLab;
322 >            Vector3d frictionForceBody = -(hydroProps_[index]->getXitt() * vcdBody + hydroProps_[index]->getXirt() * omega);
323 >            Vector3d frictionForceLab = Atrans*frictionForceBody;
324 >            integrableObject->addFrc(frictionForceLab);
325 >            Vector3d frictionTorqueBody = - (hydroProps_[index]->getXitr() * vcdBody + hydroProps_[index]->getXirr() * omega);
326 >            Vector3d frictionTorqueLab = Atrans*frictionTorqueBody;
327 >            integrableObject->addTrq(frictionTorqueLab+ cross(rcr, frictionForceLab));
328 >            
329 >            //apply random force and torque at center of resistance
330 >            Vector3d randomForceBody;
331 >            Vector3d randomTorqueBody;
332 >            genRandomForceAndTorque(randomForceBody, randomTorqueBody, index, variance_);
333 >            Vector3d randomForceLab = Atrans*randomForceBody;
334 >            Vector3d randomTorqueLab = Atrans* randomTorqueBody;
335 >            integrableObject->addFrc(randomForceLab);            
336 >            integrableObject->addTrq(randomTorqueLab + cross(rcr, randomForceLab ));            
337 >            
338            } else {
339 <             //spheric atom
340 <             Vector3d frictionForce = -(hydroProps_[index].Xidtt *vel);    
341 <             Vector3d randomForce;
342 <             Vector3d randomTorque;
343 <             genRandomForceAndTorque(randomForce, randomTorque, index, variance_);
344 <
345 <             //randomForce /= OOPSEConstant::energyConvert;
236 <             //randomTorque /= OOPSEConstant::energyConvert;
237 <             integrableObject->addFrc(frictionForce+randomForce);            
339 >            //spherical atom
340 >            Vector3d frictionForce = -(hydroProps_[index]->getXitt() * vel);
341 >            Vector3d randomForce;
342 >            Vector3d randomTorque;
343 >            genRandomForceAndTorque(randomForce, randomTorque, index, variance_);
344 >            
345 >            integrableObject->addFrc(frictionForce+randomForce);            
346            }
347 <
347 >        }
348 >          
349          ++index;
350      
351        }
352      }    
353 <
354 <    ForceManager::postCalculation();
355 <
247 <
248 <
353 >    info_->setFdf(fdf);
354 >    
355 >    ForceManager::postCalculation();  
356    }
357  
358 < void LDForceManager::genRandomForceAndTorque(Vector3d& force, Vector3d& torque, unsigned int index, double variance) {
252 <    /*
253 <    SquareMatrix<double, 6> Dd;
254 <    SquareMatrix<double, 6> S;
255 <    Vector<double, 6> Z;
256 <    Vector<double, 6> generalForce;
257 <    Dd.setSubMatrix(0, 0, hydroProps_[index].Ddtt);
258 <    Dd.setSubMatrix(0, 3, hydroProps_[index].Ddtr.transpose());
259 <    Dd.setSubMatrix(3, 0, hydroProps_[index].Ddtr);
260 <    Dd.setSubMatrix(3, 3, hydroProps_[index].Ddrr);
261 <    CholeskyDecomposition(Dd, S);
262 <    */
358 > void LDForceManager::genRandomForceAndTorque(Vector3d& force, Vector3d& torque, unsigned int index, RealType variance) {
359  
264 –    SquareMatrix<double, 6> Xid;
265 –    SquareMatrix<double, 6> S;
266 –    Vector<double, 6> Z;
267 –    Vector<double, 6> generalForce;
268 –    Xid.setSubMatrix(0, 0, hydroProps_[index].Xidtt);
269 –    Xid.setSubMatrix(0, 3, hydroProps_[index].Xidrt);
270 –    Xid.setSubMatrix(3, 0, hydroProps_[index].Xidtr);
271 –    Xid.setSubMatrix(3, 3, hydroProps_[index].Xidrr);
272 –    CholeskyDecomposition(Xid, S);
360  
361 <    /*
362 <    Xid *= variance;
363 <    Z[0] = randNumGen_.randNorm(0, 1.0);
277 <    Z[1] = randNumGen_.randNorm(0, 1.0);
278 <    Z[2] = randNumGen_.randNorm(0, 1.0);
279 <    Z[3] = randNumGen_.randNorm(0, 1.0);
280 <    Z[4] = randNumGen_.randNorm(0, 1.0);
281 <    Z[5] = randNumGen_.randNorm(0, 1.0);
282 <    */
361 >    Vector<RealType, 6> Z;
362 >    Vector<RealType, 6> generalForce;
363 >
364          
365      Z[0] = randNumGen_.randNorm(0, variance);
366      Z[1] = randNumGen_.randNorm(0, variance);
# Line 289 | Line 370 | void LDForceManager::genRandomForceAndTorque(Vector3d&
370      Z[5] = randNumGen_.randNorm(0, variance);
371      
372  
373 <    generalForce = S*Z;
373 >    generalForce = hydroProps_[index]->getS()*Z;
374      
375      force[0] = generalForce[0];
376      force[1] = generalForce[1];

Diff Legend

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