ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/hydrodynamics/Hydro.cpp
(Generate patch)

Comparing trunk/src/applications/hydrodynamics/Hydro.cpp (file contents):
Revision 891 by tim, Wed Feb 22 20:35:16 2006 UTC vs.
Revision 1027 by gezelter, Wed Aug 30 21:13:57 2006 UTC

# Line 47 | Line 47
47   #include "applications/hydrodynamics/HydrodynamicsModel.hpp"
48   #include "applications/hydrodynamics/HydrodynamicsModelCreator.hpp"
49   #include "applications/hydrodynamics/HydrodynamicsModelFactory.hpp"
50 + #include "applications/hydrodynamics/AnalyticalModel.hpp"
51   #include "applications/hydrodynamics/BeadModel.hpp"
52   #include "applications/hydrodynamics/RoughShell.hpp"
53 + #include "applications/hydrodynamics/ShapeBuilder.hpp"
54   #include "brains/Register.hpp"
55   #include "brains/SimCreator.hpp"
56   #include "brains/SimInfo.hpp"
57 <
57 > #include "utils/StringUtils.hpp"
58 > #include "utils/simError.h"
59 > #include "utils/MemoryUtils.hpp"
60   using namespace oopse;
61  
62 < /** Register different hydrodynamics models */
62 > struct SDShape{
63 >    StuntDouble* sd;
64 >    Shape* shape;
65 > };
66   void registerHydrodynamicsModels();
67 + void writeHydroProps(std::ostream& os);
68  
61 bool calcHydrodynamicsProp(const std::string& modelType, Molecule* mol, const DynamicProperty& param, const std::string& prefix,double viscosity);
62
69   int main(int argc, char* argv[]){
70    //register force fields
71    registerForceFields();    
# Line 83 | Line 89 | int main(int argc, char* argv[]){
89      exit(1);
90    }
91    
86  mdFileName = dumpFileName;
87  mdFileName = mdFileName.substr(0, mdFileName.rfind(".")) + ".md";
88
92    if (args_info.output_given){
93      prefix = args_info.output_arg;
94    } else {
95 <    prefix = "hydro";    
95 >    prefix = getPrefix(dumpFileName);    
96    }
97 <
98 <  DynamicProperty param;
96 <  if (args_info.sigma_given) {
97 <    param.insert(DynamicProperty::value_type("Sigma", args_info.sigma_arg));
98 <  }
99 <  
100 <  
97 >  std::string outputFilename = prefix + ".diff";
98 >    
99    //parse md file and set up the system
100    SimCreator creator;
101 <  SimInfo* info = creator.createSim(mdFileName, true);
101 >  SimInfo* info = creator.createSim(dumpFileName, true);
102      
103    SimInfo::MoleculeIterator mi;
104    Molecule* mol;
105 <  Molecule::RigidBodyIterator ri;
106 <  RigidBody* rb;
107 <    //update atoms of rigidbody
108 <  for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
109 <      
110 <      //change the positions of atoms which belong to the rigidbodies
111 <      for (rb = mol->beginRigidBody(ri); rb != NULL; rb = mol->nextRigidBody(ri)) {
112 <        rb->updateAtoms();
113 <      }
105 >  Molecule::IntegrableObjectIterator  ii;
106 >  StuntDouble* integrableObject;
107 >  Mat3x3d identMat;
108 >  identMat(0,0) = 1.0;
109 >  identMat(1,1) = 1.0;
110 >  identMat(2,2) = 1.0;
111 >
112 >  Globals* simParams = info->getSimParams();
113 >  RealType temperature;
114 >  RealType viscosity;
115 >
116 >  if (simParams->haveViscosity()) {
117 >    viscosity = simParams->getViscosity();
118 >  } else {
119 >    sprintf(painCave.errMsg, "viscosity must be set\n");
120 >    painCave.isFatal = 1;
121 >    simError();  
122    }
123 <    
124 <  for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
125 <    calcHydrodynamicsProp(args_info.model_arg, mol, param, prefix, args_info.viscosity_arg);
123 >
124 >  if (simParams->haveTargetTemp()) {
125 >    temperature = simParams->getTargetTemp();
126 >  } else {
127 >    sprintf(painCave.errMsg, "target temperature must be set\n");
128 >    painCave.isFatal = 1;
129 >    simError();  
130    }
131 +
132 +  std::map<std::string, SDShape> uniqueStuntDoubles;
133    
134 <  delete info;
135 <  
136 < }
134 >  for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
135 >      for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
136 >           integrableObject = mol->nextIntegrableObject(ii)) {
137 >          if (uniqueStuntDoubles.find(integrableObject->getType()) ==  uniqueStuntDoubles.end()) {
138  
139 < void registerHydrodynamicsModels() {
140 <    HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<RoughShell>("RoughShell"));
141 <    HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<BeadModel>("BeadModel"));
139 >            integrableObject->setPos(V3Zero);
140 >            integrableObject->setA(identMat);
141 >            if (integrableObject->isRigidBody()) {
142 >                RigidBody* rb = static_cast<RigidBody*>(integrableObject);
143 >                rb->updateAtoms();
144 >            }
145  
146 < }
146 >            SDShape tmp;
147 >            tmp.shape = ShapeBuilder::createShape(integrableObject);
148 >            tmp.sd = integrableObject;    
149 >            uniqueStuntDoubles.insert(std::map<std::string, SDShape>::value_type(integrableObject->getType(), tmp));
150  
151 < bool calcHydrodynamicsProp(const std::string& modelType, Molecule* mol, const DynamicProperty& param, const std::string& prefix,double viscosity) {
152 <    HydrodynamicsModel* hydroModel = HydrodynamicsModelFactory::getInstance()->createHydrodynamicsModel(modelType, mol, param);
153 <    bool ret = false;
135 <    if (hydroModel == NULL) {
136 <        std::cout << "Integrator Factory can not create " << modelType <<std::endl;
137 <    }    
151 >          }
152 >        }
153 >  }
154  
155 <    if (hydroModel->calcHydrodyanmicsProps(viscosity)) {
156 <        ret = true;
157 <        std::stringstream outputDiffTensor;
158 <        outputDiffTensor << prefix << "_" << mol->getType() << ".diff";
159 <        std::ofstream ofs;
160 <        ofs.open(outputDiffTensor.str().c_str());
161 <        hydroModel->writeDiffCenterAndDiffTensor(ofs);
162 <        ofs.close();
155 >
156 >  
157 >  std::ofstream outputDiff(outputFilename.c_str());
158 >  std::map<std::string, SDShape>::iterator si;
159 >  for (si = uniqueStuntDoubles.begin(); si != uniqueStuntDoubles.end(); ++si) {
160 >      HydrodynamicsModel* model;
161 >      Shape* shape = si->second.shape;
162 >      StuntDouble* sd = si->second.sd;;
163 >      if (args_info.model_given) {  
164 >        model = HydrodynamicsModelFactory::getInstance()->createHydrodynamicsModel(args_info.model_arg, sd, info);
165 >      } else if (shape->hasAnalyticalSolution()) {
166 >        model = new AnalyticalModel(sd, info);
167 >      } else {
168 >        model = new BeadModel(sd, info);
169 >      }
170 >
171 >        model->init();
172          
173 +        std::ofstream ofs;
174          std::stringstream outputBeads;
175 <        outputBeads << prefix << "_" << mol->getType() << ".xyz";
176 <        ofs.open(outputBeads.str().c_str());
177 <        hydroModel->writeBeads(ofs);
175 >        outputBeads << prefix << "_" << model->getStuntDoubleName() << ".xyz";
176 >        ofs.open(outputBeads.str().c_str());        
177 >        model->writeBeads(ofs);
178          ofs.close();
153    }
179  
180 <    delete hydroModel;
180 >        //if beads option is turned on, skip the calculation
181 >        if (!args_info.beads_flag) {
182 >          model->calcHydroProps(shape, viscosity, temperature);
183 >          model->writeHydroProps(outputDiff);
184 >        }
185 >        
186 >        delete model;
187 >  }
188  
189 <    return ret;    
189 >
190 >  //MemoryUtils::deletePointers(shapes);
191 >  delete info;
192 >  
193   }
194 +
195 + void registerHydrodynamicsModels() {
196 +    HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<RoughShell>("RoughShell"));
197 +    HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<BeadModel>("BeadModel"));
198 +    HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<AnalyticalModel>("AnalyticalModel"));
199 +
200 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines