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 2125 by gezelter, Tue Mar 15 14:21:31 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 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)
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),
49        currentSnapshot_(info->getSnapshotManager()->getCurrentSnapshot()) {
50  
51 <    simParams = info->getSimParams();
51 >      simParams = info->getSimParams();
52  
53 <    if (simParams->haveDt()) {
53 >      if (simParams->haveDt()) {
54          dt = simParams->getDt();
55 <    } else {
56 <            sprintf(painCave.errMsg,
57 <                    "Integrator Error: dt is not set\n");
58 <            painCave.isFatal = 1;
59 <            simError();
60 <    }
55 >      } else {
56 >        sprintf(painCave.errMsg,
57 >                "Integrator Error: dt is not set\n");
58 >        painCave.isFatal = 1;
59 >        simError();
60 >      }
61      
62 <    if (simParams->haveRunTime()) {
62 >      if (simParams->haveRunTime()) {
63          runTime = simParams->getRunTime();
64 <    } else {
65 <            sprintf(painCave.errMsg,
66 <                    "Integrator Error: runTime is not set\n");
67 <            painCave.isFatal = 1;
68 <            simError();
69 <    }
70 <    // set the status, sample, and thermal kick times
71 <    if (simParams->haveSampleTime()){
64 >      } else {
65 >        sprintf(painCave.errMsg,
66 >                "Integrator Error: runTime is not set\n");
67 >        painCave.isFatal = 1;
68 >        simError();
69 >      }
70 >      // set the status, sample, and thermal kick times
71 >      if (simParams->haveSampleTime()){
72          sampleTime = simParams->getSampleTime();
73          statusTime = sampleTime;
74 <    } else{
74 >      } else{
75          sampleTime = simParams->getRunTime();
76          statusTime = sampleTime;
77 <    }
77 >      }
78  
79 <    if (simParams->haveStatusTime()){
79 >      if (simParams->haveStatusTime()){
80          statusTime = simParams->getStatusTime();
81 <    }
81 >      }
82  
83 <    if (simParams->haveThermalTime()){
83 >      if (simParams->haveThermalTime()){
84          thermalTime = simParams->getThermalTime();
85 <    } else {
85 >      } else {
86          thermalTime = simParams->getRunTime();
87 <    }
87 >      }
88  
89 <    if (!simParams->getUseInitTime()) {
89 >      if (!simParams->getUseInitTime()) {
90          currentSnapshot_->setTime(0.0);
91 <    }
91 >      }
92      
93 <    //create a default ForceManager
94 <    //if the subclass wants to use a different ForceManager, use setForceManager
95 <    forceMan_ = new ForceManager(info);
93 >      //create a default ForceManager
94 >      //if the subclass wants to use a different ForceManager, use setForceManager
95 >      forceMan_ = new ForceManager(info);
96      
97 <    //set the force manager for thermodynamic integration if specified
98 <    if (simParams->getUseSolidThermInt() || simParams->getUseLiquidThermInt()){
99 <      ThermoIntegrationForceManager* thermoForce_
100 <      = new ThermoIntegrationForceManager(info);
101 <      setForceManager(thermoForce_);
102 <    }
97 >      //set the force manager for thermodynamic integration if specified
98 >      if (simParams->getUseSolidThermInt() || simParams->getUseLiquidThermInt()){
99 >        ThermoIntegrationForceManager* thermoForce_
100 >          = new ThermoIntegrationForceManager(info);
101 >        setForceManager(thermoForce_);
102 >      }
103      
104 <    // check for the temperature set flag (velocity scaling)      
105 <    if (simParams->haveTempSet()) {
104 >      // check for the temperature set flag (velocity scaling)      
105 >      if (simParams->haveTempSet()) {
106          needVelocityScaling = simParams->getTempSet();
107  
108          if (simParams->haveTargetTemp()) {
109 <            targetScalingTemp = simParams->getTargetTemp();
109 >          targetScalingTemp = simParams->getTargetTemp();
110          }
111          else {
112 <            sprintf(painCave.errMsg,
113 <                    "Integrator Error: Target Temperature is not set\n");
114 <            painCave.isFatal = 1;
115 <            simError();
112 >          sprintf(painCave.errMsg,
113 >                  "Integrator Error: Target Temperature is not set\n");
114 >          painCave.isFatal = 1;
115 >          simError();
116  
117          }
118 <    }
118 >      }
119      
120 <    //create a default a velocitizer
121 <    //if the subclass want to using different velocitizer, use setVelocitizer
122 <    velocitizer_ = new Velocitizer(info);
120 >      //create a default a velocitizer
121 >      //if the subclass want to using different velocitizer, use setVelocitizer
122 >      velocitizer_ = new Velocitizer(info);
123      
124 < }
124 >    }
125  
126 < Integrator::~Integrator(){
126 >  Integrator::~Integrator(){
127      delete forceMan_;
128      delete velocitizer_;
129      
130      delete dumpWriter;
131      delete statWriter;
132 < }
132 >  }
133  
134  
135   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines