| 322 |
|
int SimInfo::getNDF(){ |
| 323 |
|
int ndf_local; |
| 324 |
|
|
| 325 |
+ |
ndf_local = 0; |
| 326 |
+ |
|
| 327 |
|
for(int i = 0; i < integrableObjects.size(); i++){ |
| 328 |
|
ndf_local += 3; |
| 329 |
< |
if (integrableObjects[i]->isDirectional()) |
| 330 |
< |
ndf_local += 3; |
| 329 |
> |
if (integrableObjects[i]->isDirectional()) { |
| 330 |
> |
if (integrableObjects[i]->isLinear()) |
| 331 |
> |
ndf_local += 2; |
| 332 |
> |
else |
| 333 |
> |
ndf_local += 3; |
| 334 |
> |
} |
| 335 |
|
} |
| 336 |
|
|
| 337 |
|
// n_constraints is local, so subtract them on each processor: |
| 356 |
|
int ndfRaw_local; |
| 357 |
|
|
| 358 |
|
// Raw degrees of freedom that we have to set |
| 359 |
+ |
ndfRaw_local = 0; |
| 360 |
|
|
| 361 |
|
for(int i = 0; i < integrableObjects.size(); i++){ |
| 362 |
|
ndfRaw_local += 3; |
| 363 |
< |
if (integrableObjects[i]->isDirectional()) |
| 364 |
< |
ndfRaw_local += 3; |
| 363 |
> |
if (integrableObjects[i]->isDirectional()) { |
| 364 |
> |
if (integrableObjects[i]->isLinear()) |
| 365 |
> |
ndfRaw_local += 2; |
| 366 |
> |
else |
| 367 |
> |
ndfRaw_local += 3; |
| 368 |
> |
} |
| 369 |
|
} |
| 370 |
|
|
| 371 |
|
#ifdef IS_MPI |
| 510 |
|
"\tCurrent Value of LJrcut = %G at time %G\n " |
| 511 |
|
"\tThis is larger than half of at least one of the\n" |
| 512 |
|
"\tperiodic box vectors. Right now, the Box matrix is:\n" |
| 513 |
< |
"\n, %G" |
| 513 |
> |
"\n" |
| 514 |
|
"\t[ %G %G %G ]\n" |
| 515 |
|
"\t[ %G %G %G ]\n" |
| 516 |
|
"\t[ %G %G %G ]\n", |
| 517 |
< |
rCut, currentTime, maxCutoff, |
| 517 |
> |
rCut, currentTime, |
| 518 |
|
Hmat[0][0], Hmat[0][1], Hmat[0][2], |
| 519 |
|
Hmat[1][0], Hmat[1][1], Hmat[1][2], |
| 520 |
|
Hmat[2][0], Hmat[2][1], Hmat[2][2]); |
| 589 |
|
return NULL; |
| 590 |
|
} |
| 591 |
|
|
| 581 |
– |
vector<GenericData*> SimInfo::getProperties(){ |
| 582 |
– |
|
| 583 |
– |
vector<GenericData*> result; |
| 584 |
– |
map<string, GenericData*>::iterator i; |
| 585 |
– |
|
| 586 |
– |
for(i = properties.begin(); i != properties.end(); i++) |
| 587 |
– |
result.push_back((*i).second); |
| 588 |
– |
|
| 589 |
– |
return result; |
| 590 |
– |
} |
