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 892 by tim, Thu Feb 23 23:16:43 2006 UTC vs.
Revision 945 by gezelter, Tue Apr 25 02:09:01 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  
61 – bool calcHydrodynamicsProp(const std::string& modelType, StuntDouble* sd, const DynamicProperty& param, std::ostream& os,  const std::string& prefix);
62 –
68   int main(int argc, char* argv[]){
69    //register force fields
70    registerForceFields();    
# Line 89 | Line 94 | int main(int argc, char* argv[]){
94    if (args_info.output_given){
95      prefix = args_info.output_arg;
96    } else {
97 <    prefix = "hydro";    
97 >    prefix = getPrefix(mdFileName);    
98    }
99    std::string outputFilename = prefix + ".diff";
100 <
96 <  DynamicProperty param;
97 <  param.insert(DynamicProperty::value_type("Viscosity", args_info.viscosity_arg));
98 <  param.insert(DynamicProperty::value_type("Temperature", args_info.temperature_arg));
99 <  
100 <  if (args_info.sigma_given) {
101 <    param.insert(DynamicProperty::value_type("Sigma", args_info.sigma_arg));
102 <  }
103 <  
104 <  
100 >    
101    //parse md file and set up the system
102    SimCreator creator;
103    SimInfo* info = creator.createSim(mdFileName, true);
# Line 114 | Line 110 | int main(int argc, char* argv[]){
110    identMat(0,0) = 1.0;
111    identMat(1,1) = 1.0;
112    identMat(2,2) = 1.0;
113 <  
113 >
114 >  Globals* simParams = info->getSimParams();
115 >  double temperature;
116 >  double viscosity;
117 >
118 >  if (simParams->haveViscosity()) {
119 >    viscosity = simParams->getViscosity();
120 >  } else {
121 >    sprintf(painCave.errMsg, "viscosity must be set\n");
122 >    painCave.isFatal = 1;
123 >    simError();  
124 >  }
125 >
126 >  if (simParams->haveTargetTemp()) {
127 >    temperature = simParams->getTargetTemp();
128 >  } else {
129 >    sprintf(painCave.errMsg, "target temperature must be set\n");
130 >    painCave.isFatal = 1;
131 >    simError();  
132 >  }
133  
134 <  std::map<std::string, StuntDouble*> uniqueStuntDoubles;
134 >  std::map<std::string, SDShape> uniqueStuntDoubles;
135    
136    for (mol = info->beginMolecule(mi); mol != NULL; mol = info->nextMolecule(mi)) {
137        for (integrableObject = mol->beginIntegrableObject(ii); integrableObject != NULL;
138             integrableObject = mol->nextIntegrableObject(ii)) {
139            if (uniqueStuntDoubles.find(integrableObject->getType()) ==  uniqueStuntDoubles.end()) {
140 <            uniqueStuntDoubles.insert(std::map<std::string, StuntDouble*>::value_type(integrableObject->getType(), integrableObject));
140 >
141              integrableObject->setPos(V3Zero);
142              integrableObject->setA(identMat);
143              if (integrableObject->isRigidBody()) {
144                  RigidBody* rb = static_cast<RigidBody*>(integrableObject);
145                  rb->updateAtoms();
146              }
147 +
148 +            SDShape tmp;
149 +            tmp.shape = ShapeBuilder::createShape(integrableObject);
150 +            tmp.sd = integrableObject;    
151 +            uniqueStuntDoubles.insert(std::map<std::string, SDShape>::value_type(integrableObject->getType(), tmp));
152 +
153            }
154          }
155    }
156  
157 <  std::map<std::string, StuntDouble*>::iterator iter;
157 >
158 >  
159    std::ofstream outputDiff(outputFilename.c_str());
160 <  for (iter = uniqueStuntDoubles.begin(); iter != uniqueStuntDoubles.end(); ++iter) {
161 <    calcHydrodynamicsProp(args_info.model_arg, iter->second, param, outputDiff, prefix);
160 >  std::map<std::string, SDShape>::iterator si;
161 >  for (si = uniqueStuntDoubles.begin(); si != uniqueStuntDoubles.end(); ++si) {
162 >      HydrodynamicsModel* model;
163 >      Shape* shape = si->second.shape;
164 >      StuntDouble* sd = si->second.sd;;
165 >      if (args_info.model_given) {  
166 >        model = HydrodynamicsModelFactory::getInstance()->createHydrodynamicsModel(args_info.model_arg, sd, info);
167 >      } else if (shape->hasAnalyticalSolution()) {
168 >        model = new AnalyticalModel(sd, info);
169 >      } else {
170 >        model = new BeadModel(sd, info);
171 >      }
172 >
173 >        model->init();
174 >        
175 >        std::ofstream ofs;
176 >        std::stringstream outputBeads;
177 >        outputBeads << prefix << "_" << model->getStuntDoubleName() << ".xyz";
178 >        ofs.open(outputBeads.str().c_str());        
179 >        model->writeBeads(ofs);
180 >        ofs.close();
181 >
182 >        //if beads option is turned on, skip the calculation
183 >        if (!args_info.beads_flag) {
184 >            shape->calcHydroProps(model, viscosity, temperature);
185 >            model->writeHydroProps(outputDiff);
186 >        }
187 >
188 >        delete model;
189    }
190 <  
190 >
191 >
192 >  //MemoryUtils::deletePointers(shapes);
193    delete info;
194    
195   }
# Line 146 | Line 197 | void registerHydrodynamicsModels() {
197   void registerHydrodynamicsModels() {
198      HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<RoughShell>("RoughShell"));
199      HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<BeadModel>("BeadModel"));
200 +    HydrodynamicsModelFactory::getInstance()->registerHydrodynamicsModel(new HydrodynamicsModelBuilder<AnalyticalModel>("AnalyticalModel"));
201  
202   }
203  
152 – bool calcHydrodynamicsProp(const std::string& modelType, StuntDouble* sd, const DynamicProperty& param, std::ostream& os, const std::string& prefix) {
153 –    HydrodynamicsModel* hydroModel = HydrodynamicsModelFactory::getInstance()->createHydrodynamicsModel(modelType, sd, param);
154 –    bool ret = false;
155 –    if (hydroModel == NULL) {
156 –        std::cout << "Integrator Factory can not create " << modelType <<std::endl;
157 –    }    
158 –
159 –    if (hydroModel->calcHydrodyanmicsProps()) {
160 –        ret = true;        
161 –        hydroModel->writeDiffCenterAndDiffTensor(os);
162 –
163 –        std::ofstream ofs;
164 –        std::stringstream outputBeads;
165 –        outputBeads << prefix << "_" << sd->getType() << ".xyz";
166 –        ofs.open(outputBeads.str().c_str());
167 –        hydroModel->writeBeads(ofs);
168 –        ofs.close();
169 –    }
170 –
171 –    delete hydroModel;
172 –
173 –    return ret;    
174 – }

Diff Legend

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