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

Comparing trunk/OOPSE-4/src/integrators/Integrator.cpp (file contents):
Revision 1930 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 2879 by chrisfen, Thu Jun 22 15:21:01 2006 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 43 | Line 43 | Integrator::Integrator(SimInfo* info)
43   #include "integrators/Integrator.hpp"
44   #include "utils/simError.h"
45   namespace oopse {
46 < Integrator::Integrator(SimInfo* info)
47 <    : info_(info), forceMan_(NULL) , needPotential(false), needStress(false), velocitizer_(NULL),
48 <      needVelocityScaling(false), dumpWriter(NULL), statWriter(NULL), thermo(info),
46 >  Integrator::Integrator(SimInfo* info)
47 >    : info_(info), forceMan_(NULL) , needPotential(false), needStress(false),
48 >      needReset(false), velocitizer_(NULL), needVelocityScaling(false),
49 >      dumpWriter(NULL), statWriter(NULL), thermo(info),
50        currentSnapshot_(info->getSnapshotManager()->getCurrentSnapshot()) {
51  
52 <    Globals* simParams = info->getSimParams();
52 >      simParams = info->getSimParams();
53  
54 <    if (simParams->haveDt()) {
54 >      if (simParams->haveDt()) {
55          dt = simParams->getDt();
56 <    } else {
57 <            sprintf(painCave.errMsg,
58 <                    "Integrator Error: dt is not set\n");
59 <            painCave.isFatal = 1;
60 <            simError();
61 <    }
56 >      } else {
57 >        sprintf(painCave.errMsg,
58 >                "Integrator Error: dt is not set\n");
59 >        painCave.isFatal = 1;
60 >        simError();
61 >      }
62      
63 <    if (simParams->haveRunTime()) {
63 >      if (simParams->haveRunTime()) {
64          runTime = simParams->getRunTime();
65 <    } else {
66 <
67 <    }
68 <    // set the status, sample, and thermal kick times
69 <    if (simParams->haveSampleTime()){
65 >      } else {
66 >        sprintf(painCave.errMsg,
67 >                "Integrator Error: runTime is not set\n");
68 >        painCave.isFatal = 1;
69 >        simError();
70 >      }
71 >      // set the status, sample, and thermal kick times
72 >      if (simParams->haveSampleTime()){
73          sampleTime = simParams->getSampleTime();
74          statusTime = sampleTime;
75 <    } else{
75 >      } else{
76          sampleTime = simParams->getRunTime();
77          statusTime = sampleTime;
78 <    }
78 >      }
79  
80 <    if (simParams->haveStatusTime()){
80 >      if (simParams->haveStatusTime()){
81          statusTime = simParams->getStatusTime();
82 <    }
82 >      }
83  
84 <    if (simParams->haveThermalTime()){
84 >      if (simParams->haveThermalTime()){
85          thermalTime = simParams->getThermalTime();
86 <    } else {
86 >      } else {
87          thermalTime = simParams->getRunTime();
88 <    }
88 >      }
89  
90 <    if (!simParams->getUseInitTime()) {
90 >      if (!simParams->getUseInitalTime()) {
91          currentSnapshot_->setTime(0.0);
92 <    }
92 >      }
93 >
94 >      if (simParams->haveResetTime()) {
95 >        needReset = true;
96 >        resetTime = simParams->getResetTime();
97 >      }
98 >      
99 >      // Create a default ForceManager: If the subclass wants to use
100 >      // a different ForceManager, use setForceManager
101 >      forceMan_ = new ForceManager(info);
102      
103 <    //create a default a ForceManager
104 <    //if the subclass want to using different ForceManager, use setForceManager
92 <    forceMan_ = new ForceManager(info);
93 <    
94 <    // check for the temperature set flag (velocity scaling)      
95 <    if (simParams->haveTempSet()) {
103 >      // check for the temperature set flag (velocity scaling)      
104 >      if (simParams->haveTempSet()) {
105          needVelocityScaling = simParams->getTempSet();
106  
107          if (simParams->haveTargetTemp()) {
108 <            targetScalingTemp = simParams->getTargetTemp();
108 >          targetScalingTemp = simParams->getTargetTemp();
109          }
110          else {
111 <            sprintf(painCave.errMsg,
112 <                    "Integrator Error: Target Temperature is not set\n");
113 <            painCave.isFatal = 1;
114 <            simError();
111 >          sprintf(painCave.errMsg,
112 >                  "Integrator Error: Target Temperature is not set\n");
113 >          painCave.isFatal = 1;
114 >          simError();
115  
116          }
117 <    }
117 >      }
118      
119 <    //create a default a velocitizer
120 <    //if the subclass want to using different velocitizer, use setVelocitizer
121 <    velocitizer_ = new Velocitizer(info);
119 >      // Create a default a velocitizer: If the subclass wants to use
120 >      // a different velocitizer, use setVelocitizer
121 >      velocitizer_ = new Velocitizer(info);
122      
123 < }
123 >    }
124  
125 < Integrator::~Integrator(){
125 >  Integrator::~Integrator(){
126      delete forceMan_;
127      delete velocitizer_;
128      
129      delete dumpWriter;
130      delete statWriter;
131 < }
131 >  }
132  
133  
134   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines