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: |
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 |
589 |
|
return NULL; |
590 |
|
} |
591 |
|
|
584 |
– |
vector<GenericData*> SimInfo::getProperties(){ |
585 |
– |
|
586 |
– |
vector<GenericData*> result; |
587 |
– |
map<string, GenericData*>::iterator i; |
588 |
– |
|
589 |
– |
for(i = properties.begin(); i != properties.end(); i++) |
590 |
– |
result.push_back((*i).second); |
591 |
– |
|
592 |
– |
return result; |
593 |
– |
} |