| 153 |
|
double sampleTime = info->sampleTime; |
| 154 |
|
double statusTime = info->statusTime; |
| 155 |
|
double thermalTime = info->thermalTime; |
| 156 |
+ |
double resetTime = info->resetTime; |
| 157 |
|
|
| 158 |
+ |
|
| 159 |
|
double currSample; |
| 160 |
|
double currThermal; |
| 161 |
|
double currStatus; |
| 162 |
< |
|
| 162 |
> |
double currReset; |
| 163 |
> |
|
| 164 |
|
int calcPot, calcStress; |
| 165 |
|
int isError; |
| 166 |
|
|
| 177 |
|
// initialize the forces before the first step |
| 178 |
|
|
| 179 |
|
calcForce(1, 1); |
| 180 |
< |
// myFF->doForces(1,1); |
| 178 |
< |
|
| 180 |
> |
|
| 181 |
|
if (info->setTemp){ |
| 182 |
|
thermalize(); |
| 183 |
|
} |
| 184 |
|
|
| 183 |
– |
calcPot = 0; |
| 184 |
– |
calcStress = 0; |
| 185 |
– |
currSample = sampleTime; |
| 186 |
– |
currThermal = thermalTime; |
| 187 |
– |
currStatus = statusTime; |
| 188 |
– |
|
| 185 |
|
calcPot = 0; |
| 186 |
|
calcStress = 0; |
| 187 |
|
currSample = sampleTime + info->getTime(); |
| 188 |
|
currThermal = thermalTime+ info->getTime(); |
| 189 |
|
currStatus = statusTime + info->getTime(); |
| 190 |
< |
>>>>>>> 1.18 |
| 190 |
> |
currReset = resetTime + info->getTime(); |
| 191 |
|
|
| 192 |
|
dumpOut->writeDump(info->getTime()); |
| 193 |
|
statOut->writeStat(info->getTime()); |
| 228 |
|
currStatus += statusTime; |
| 229 |
|
} |
| 230 |
|
|
| 231 |
+ |
if (info->resetIntegrator){ |
| 232 |
+ |
if (info->getTime() >= currReset){ |
| 233 |
+ |
this->resetIntegrator(); |
| 234 |
+ |
currReset += resetTime; |
| 235 |
+ |
} |
| 236 |
+ |
} |
| 237 |
+ |
|
| 238 |
|
#ifdef IS_MPI |
| 239 |
|
strcpy(checkPointMsg, "successfully took a time step."); |
| 240 |
|
MPIcheckPoint(); |
