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

Comparing trunk/OOPSE-4/src/integrators/SMIPDForceManager.cpp (file contents):
Revision 3504 by gezelter, Wed May 13 22:27:29 2009 UTC vs.
Revision 3550 by gezelter, Wed Oct 21 02:49:43 2009 UTC

# Line 1 | Line 1
1   /*
2 < * Copyright (c) 2008 The University of Notre Dame. All Rights Reserved.
2 > * Copyright (c) 2008, 2009 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
# Line 41 | Line 41
41   #include <fstream>
42   #include <iostream>
43   #include "integrators/SMIPDForceManager.hpp"
44 #include "math/CholeskyDecomposition.hpp"
44   #include "utils/OOPSEConstant.hpp"
45   #include "math/ConvexHull.hpp"
46   #include "math/Triangle.hpp"
# Line 63 | Line 62 | namespace oopse {
62      if (!simParams->haveTargetTemp()) {
63        sprintf(painCave.errMsg,
64                "SMIPDynamics error: You can't use the SMIPD integrator\n"
65 <              "   without a targetTemp!\n");      
65 >              "\twithout a targetTemp (K)!\n");      
66        painCave.isFatal = 1;
67        painCave.severity = OOPSE_ERROR;
68        simError();
# Line 74 | Line 73 | namespace oopse {
73      if (!simParams->haveTargetPressure()) {
74        sprintf(painCave.errMsg,
75                "SMIPDynamics error: You can't use the SMIPD integrator\n"
76 <              "   without a targetPressure!\n");      
76 >              "\twithout a targetPressure (atm)!\n");      
77        painCave.isFatal = 1;
78        simError();
79      } else {
# Line 86 | Line 85 | namespace oopse {
85      if (simParams->getUsePeriodicBoundaryConditions()) {
86        sprintf(painCave.errMsg,
87                "SMIPDynamics error: You can't use the SMIPD integrator\n"
88 <              "   with periodic boundary conditions!\n");    
88 >              "\twith periodic boundary conditions!\n");    
89        painCave.isFatal = 1;
90        simError();
91      }
92      
93 <    if (!simParams->haveViscosity()) {
93 >    if (!simParams->haveThermalConductivity()) {
94        sprintf(painCave.errMsg,
95                "SMIPDynamics error: You can't use the SMIPD integrator\n"
96 <              "   without a viscosity!\n");
96 >              "\twithout a thermalConductivity (W m^-1 K^-1)!\n");
97        painCave.isFatal = 1;
98        painCave.severity = OOPSE_ERROR;
99        simError();
100      }else{
101 <      viscosity_ = simParams->getViscosity();
101 >      thermalConductivity_ = simParams->getThermalConductivity() *
102 >        OOPSEConstant::thermalConductivityConvert;
103      }
104 +
105 +    if (!simParams->haveThermalLength()) {
106 +      sprintf(painCave.errMsg,
107 +              "SMIPDynamics error: You can't use the SMIPD integrator\n"
108 +              "\twithout a thermalLength (Angstroms)!\n");
109 +      painCave.isFatal = 1;
110 +      painCave.severity = OOPSE_ERROR;
111 +      simError();
112 +    }else{
113 +      thermalLength_ = simParams->getThermalLength();
114 +    }
115      
116      dt_ = simParams->getDt();
117    
# Line 134 | Line 145 | namespace oopse {
145  
146      // Get total area and number of surface stunt doubles
147      RealType area = surfaceMesh_->getArea();
137    int nSurfaceSDs = surfaceMesh_->getNs();
148      std::vector<Triangle> sMesh = surfaceMesh_->getMesh();
149      int nTriangles = sMesh.size();
150  
151      // Generate all of the necessary random forces
152 <    std::vector<Vector3d>  randNums = genTriangleForces(nTriangles, variance_);
152 >    std::vector<RealType>  randNums = genTriangleForces(nTriangles, variance_);
153  
154      // Loop over the mesh faces and apply external pressure to each
155      // of the faces
# Line 147 | Line 157 | namespace oopse {
157      std::vector<StuntDouble*>::iterator vertex;
158      int thisFacet = 0;
159      for (face = sMesh.begin(); face != sMesh.end(); ++face){
150    
160        Triangle thisTriangle = *face;
161        std::vector<StuntDouble*> vertexSDs = thisTriangle.getVertices();
162        RealType thisArea = thisTriangle.getArea();
# Line 155 | Line 164 | namespace oopse {
164        unitNormal.normalize();
165        Vector3d centroid = thisTriangle.getCentroid();
166        Vector3d facetVel = thisTriangle.getFacetVelocity();
167 +      RealType thisMass = thisTriangle.getFacetMass();
168  
169 <      Mat3x3d hydroTensor = thisTriangle.computeHydrodynamicTensor(viscosity_);
169 >      // gamma is the drag coefficient normal to the face of the triangle      
170 >      RealType gamma = thermalConductivity_ * thisMass * thisArea
171 >        / (2.0 * thermalLength_ * OOPSEConstant::kB);
172  
173 <      hydroTensor *= OOPSEConstant::viscoConvert;
174 <      Mat3x3d S;
175 <      CholeskyDecomposition(hydroTensor, S);
173 >      RealType extPressure = - (targetPressure_ * thisArea) /
174 >        OOPSEConstant::energyConvert;
175 >      RealType randomForce = randNums[thisFacet++] * sqrt(gamma);
176 >      RealType dragForce = -gamma * dot(facetVel, unitNormal);
177  
178 <      Vector3d extPressure = -unitNormal*(targetPressure_ * thisArea)/OOPSEConstant::energyConvert;      
179 <      Vector3d randomForce = S * randNums[thisFacet++];
180 <      Vector3d dragForce = -hydroTensor * facetVel;
181 <
169 <      Vector3d langevinForce = (extPressure + randomForce + dragForce);
170 <
171 <      // Apply triangle force to stuntdouble vertices
178 >      Vector3d langevinForce = (extPressure + randomForce + dragForce) *
179 >        unitNormal;
180 >      
181 >      // Apply triangle force to stuntdouble vertices
182        for (vertex = vertexSDs.begin(); vertex != vertexSDs.end(); ++vertex){
183 <        if ((*vertex) != NULL){
183 >        if ((*vertex) != NULL){
184            Vector3d vertexForce = langevinForce / 3.0;
185            (*vertex)->addFrc(vertexForce);          
176          if ((*vertex)->isDirectional()){          
177            Vector3d vertexPos = (*vertex)->getPos();
178            Vector3d vertexCentroidVector = vertexPos - centroid;
179            (*vertex)->addTrq(cross(vertexCentroidVector,vertexForce));
180          }
186          }  
187        }
188      }
189 <        
189 >    
190      veloMunge->removeComDrift();
191      veloMunge->removeAngularDrift();
192 <
192 >    
193      Snapshot* currSnapshot = info_->getSnapshotManager()->getCurrentSnapshot();
194      currSnapshot->setVolume(surfaceMesh_->getVolume());    
195      ForceManager::postCalculation(needStress);  
196    }
192
197    
198 <  std::vector<Vector3d> SMIPDForceManager::genTriangleForces(int nTriangles,
198 >  
199 >  std::vector<RealType> SMIPDForceManager::genTriangleForces(int nTriangles,
200                                                               RealType variance)
201    {
202      
203      // zero fill the random vector before starting:
204 <    std::vector<Vector3d> gaussRand;
204 >    std::vector<RealType> gaussRand;
205      gaussRand.resize(nTriangles);
206 <    std::fill(gaussRand.begin(), gaussRand.end(), V3Zero);
206 >    std::fill(gaussRand.begin(), gaussRand.end(), 0.0);
207      
208   #ifdef IS_MPI
209      if (worldRank == 0) {
210   #endif
206      RealType rx, ry, rz;
211        for (int i = 0; i < nTriangles; i++) {
212 <        rx = randNumGen_.randNorm(0.0, variance);
209 <        ry = randNumGen_.randNorm(0.0, variance);
210 <        rz = randNumGen_.randNorm(0.0, variance);
211 <        gaussRand[i][0] = rx;
212 <        gaussRand[i][1] = ry;
213 <        gaussRand[i][2] = rz;
212 >        gaussRand[i] = randNumGen_.randNorm(0.0, variance);
213        }
214   #ifdef IS_MPI
215      }
# Line 220 | Line 219 | namespace oopse {
219      
220   #ifdef IS_MPI
221      if (worldRank == 0) {
222 <      MPI_Bcast(&gaussRand[0], nTriangles*3 , MPI_REALTYPE, 0, MPI_COMM_WORLD);
222 >      MPI::COMM_WORLD.Bcast(&gaussRand[0], nTriangles, MPI::REALTYPE, 0);
223      } else {
224 <      MPI_Bcast(&gaussRand[0], nTriangles*3, MPI_REALTYPE, 0, MPI_COMM_WORLD);
224 >      MPI::COMM_WORLD.Bcast(&gaussRand[0], nTriangles, MPI::REALTYPE, 0);
225      }
226   #endif
227      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines